Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'inventree/master'

Browse Source
This commit is contained in:
Oliver Walters 2020-11-27 15:33:46 +11:00
commit 8fd4137981
12 changed files with 116 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
InvenTree/InvenTree/forms.py
View File

@ -28,6 +28,7 @@ class HelperForm(forms.ModelForm):
self.helper = FormHelper()
self.helper.form_tag = False
self.helper.form_show_errors = True
"""
Create a default 'layout' for this form.
@ -43,11 +44,6 @@ class HelperForm(forms.ModelForm):
valid = super(HelperForm, self).is_valid()
# Check for errors from model validation
# If none, disable crispy form errors
if not self.errors:
self.helper.form_show_errors = False
return valid
def rebuild_layout(self):

17
InvenTree/company/templates/company/supplier_part_create.html Normal file
View File

@ -0,0 +1,17 @@
{% extends "modal_form.html" %}
{% load i18n %}
{% block pre_form_content %}
{{ block.super }}
{% if part %}
<div class='alert alert-block alert-info'>
{% include "hover_image.html" with image=part.image %}
{{ part.full_name}}
<br>
<i>{{ part.description }}</i>
</div>
{% endif %}
{% endblock %}

23
InvenTree/company/views.py
View File

@ -291,7 +291,7 @@ class SupplierPartCreate(AjaxCreateView):
model = SupplierPart
form_class = EditSupplierPartForm
ajax_template_name = 'modal_form.html'
ajax_template_name = 'company/supplier_part_create.html'
ajax_form_title = _('Create new Supplier Part')
context_object_name = 'part'
role_required = 'purchase_order.add'
@ -304,6 +304,27 @@ class SupplierPartCreate(AjaxCreateView):
# TODO - What validation steps can be performed on the single_pricing field?
pass
def get_context_data(self):
"""
Supply context data to the form
"""
ctx = super().get_context_data()
# Add 'part' object
form = self.get_form()
part = form['part'].value()
try:
part = Part.objects.get(pk=part)
except (ValueError, Part.DoesNotExist):
part = None
ctx['part'] = part
return ctx
def save(self, form):
"""
If single_pricing is defined, add a price break for quantity=1

8
InvenTree/order/templates/order/order_wizard/select_parts.html
View File

@ -11,11 +11,11 @@
{% if parts|length > 0 %}
<div class='alert alert-info alert-block' role='alert'>
{% trans "Select suppliers." %}
{% trans "Select suppliers" %}
</div>
{% else %}
<div class='alert alert-warning alert-block' role='alert'>
{% trans "No purchaseable parts selected." %}
{% trans "No purchaseable parts selected" %}
</div>
{% endif %}
@ -39,8 +39,8 @@
{{ part.full_name }} <small><i>{{ part.description }}</i></small>
</td>
<td>
<button class='btn btn-default btn-create' onClick='newSupplierPartFromOrderWizard()' id='new_supplier_part_{{ part.id }}' title='Create new supplier part for {{ part }}' type='button'>
<span part-id='{{ part.id }}' class='fas fa-plus-circle'></span>
<button class='btn btn-default btn-create' onClick='newSupplierPartFromOrderWizard()' id='new_supplier_part_{{ part.id }}' part='{{ part.pk }}' title='{% trans "Create new supplier part" $}' type='button'>
<span part='{{ part.pk }}' class='fas fa-plus-circle'></span>
</button>
</td>
<td>

4
InvenTree/part/serializers.py
View File

@ -336,7 +336,7 @@ class PartStarSerializer(InvenTreeModelSerializer):
class BomItemSerializer(InvenTreeModelSerializer):
""" Serializer for BomItem object """
price_range = serializers.CharField(read_only=True)
# price_range = serializers.CharField(read_only=True)
quantity = serializers.FloatField()
@ -387,7 +387,7 @@ class BomItemSerializer(InvenTreeModelSerializer):
'sub_part_detail',
'quantity',
'reference',
'price_range',
# 'price_range',
'optional',
'overage',
'note',

2
InvenTree/part/templates/part/bom_upload/select_fields.html
View File

@ -59,7 +59,7 @@
{% endfor %}
</select>
{% if col.duplicate %}
<p class='help-inline'>Duplicate column selection</p>
<p class='help-inline'>{% trans "Duplicate column selection" %}</p>
{% endif %}
</td>
{% endfor %}

2
InvenTree/part/templates/part/bom_upload/select_parts.html
View File

@ -63,7 +63,7 @@
<option value=''>--- {% trans "Select Part" %} ---</option>
{% for part in row.part_options %}
<option value='{{ part.id }}' {% if part.id == row.part.id %} selected='selected' {% elif part.id == row.part_match.id %} selected='selected' {% endif %}>
{{ part }} - {{ part.available_stock }}
{{ part }}
</option>
{% endfor %}
</select>

34
InvenTree/templates/js/bom.js
View File

@ -140,6 +140,12 @@ function loadBomTable(table, options) {
});
}
// Set the parent ID of the multi-level table.
// We prepend this with the literal string value 'top-level-',
// because otherwise the unfortunate situation where BomItem.pk == BomItem.part.pk
// AND THIS BREAKS EVERYTHING
var parent_id = `top-level-${options.parent_id}`;
// Part column
cols.push(
{
@ -197,11 +203,11 @@ function loadBomTable(table, options) {
text = parseFloat(text);
if (row.optional) {
text += " ({% trans "Optional" %})";
text += ' ({% trans "Optional" %})';
}
if (row.overage) {
text += "<small> (+" + row.overage + ") </small>";
text += `<small> (${row.overage}) </small>`;
}
return text;
@ -228,6 +234,12 @@ function loadBomTable(table, options) {
}
});
/*
// TODO - Re-introduce the pricing column at a later stage,
// once the pricing has been "fixed"
// O.W. 2020-11-24
cols.push(
{
field: 'price_range',
@ -241,6 +253,7 @@ function loadBomTable(table, options) {
}
}
});
*/
}
// Part notes
@ -327,9 +340,8 @@ function loadBomTable(table, options) {
table.inventreeTable({
treeEnable: !options.editable,
rootParentId: options.parent_id,
rootParentId: parent_id,
idField: 'pk',
//uniqueId: 'pk',
parentIdField: 'parentId',
treeShowField: 'sub_part',
showColumns: true,
@ -338,12 +350,18 @@ function loadBomTable(table, options) {
search: true,
rowStyle: function(row, index) {
if (row.validated) {
return {classes: 'rowvalid'};
return {
classes: 'rowvalid'
};
} else {
return {classes: 'rowinvalid'};
return {
classes: 'rowinvalid'
};
}
},
formatNoMatches: function() { return '{% trans "No BOM items found" %}'; },
formatNoMatches: function() {
return '{% trans "No BOM items found" %}';
},
clickToSelect: true,
queryParams: filters,
original: params,
@ -376,7 +394,7 @@ function loadBomTable(table, options) {
}
// Set the parent ID of the top-level rows
row.parentId = options.parent_id;
row.parentId = parent_id;
table.bootstrapTable('updateRow', idx, row, true);

18
InvenTree/templates/js/build.js
View File

@ -243,6 +243,22 @@ function loadBuildOutputAllocationTable(buildInfo, output, options={}) {
});
});
// Callback for 'buy' button
$(table).find('.button-buy').click(function() {
var pk = $(this).attr('pk');
var idx = $(this).closest('tr').attr('data-index');
var row = $(table).bootstrapTable('getData')[idx];
launchModalForm('{% url "order-parts" %}', {
data: {
parts: [
pk,
]
}
});
});
// Callback for 'build' button
$(table).find('.button-build').click(function() {
var pk = $(this).attr('pk');
@ -563,7 +579,7 @@ function loadBuildOutputAllocationTable(buildInfo, output, options={}) {
}
if (row.sub_part_detail.purchaseable) {
html += makeIconButton('fa-shopping-cart icon-blue', 'button-buy', row.sub_part, '{% trans "Order stock" %}', {disabled: true});
html += makeIconButton('fa-shopping-cart icon-blue', 'button-buy', row.sub_part, '{% trans "Order stock" %}');
}
html += makeIconButton('fa-sign-in-alt icon-green', 'button-add', row.sub_part, '{% trans "Allocate stock" %}');

17
InvenTree/templates/js/order.js
View File

@ -21,9 +21,16 @@ function newSupplierPartFromOrderWizard(e) {
e = e || window.event;
var src = e.target || e.srcElement;
var src = e.srcElement || e.target;
var part = $(src).attr('part-id');
var part = $(src).attr('part');
console.log('part: ' + part);
if (!part) {
part = $(src).closest('button').attr('part');
console.log('parent: ' + part);
}
launchModalForm("/supplier-part/new/", {
modal: '#modal-form-secondary',
@ -125,7 +132,7 @@ function loadPurchaseOrderTable(table, options) {
name: 'purchaseorder',
groupBy: false,
original: options.params,
formatNoMatches: function() { return "{% trans "No purchase orders found" %}"; },
formatNoMatches: function() { return '{% trans "No purchase orders found" %}'; },
columns: [
{
field: 'pk',
@ -208,7 +215,7 @@ function loadSalesOrderTable(table, options) {
name: 'salesorder',
groupBy: false,
original: options.params,
formatNoMatches: function() { return "{% trans "No sales orders found" %}"; },
formatNoMatches: function() { return '{% trans "No sales orders found" %}'; },
columns: [
{
field: 'pk',
@ -265,7 +272,7 @@ function loadSalesOrderTable(table, options) {
{
sortable: true,
field: 'shipment_date',
title: "{% trans "Shipment Date" %}",
title: '{% trans "Shipment Date" %}',
},
{
sortable: true,

16
InvenTree/templates/modal_form.html
View File

@ -1,3 +1,5 @@
{% load i18n %}
<div>
{% if form.pre_form_info %}
<div class='alert alert-info alert-block' role='alert'>
@ -9,18 +11,6 @@
{{ form.pre_form_warning }}
</div>
{% endif %}
{% block non_field_error %}
{% if form.non_field_errors %}
<div class='alert alert-danger alert-block' role='alert'>
<b>Error Submitting Form:</b>
<ul>
{% for error in form.non_field_errors %}
{{ error }}
{% endfor %}
</ul>
</div>
{% endif %}
{% endblock %}
</div>
{% block pre_form_content %}
@ -41,4 +31,4 @@
{% endblock %}
{% block post_form_content %}
{% endblock %}
{% endblock %}

10
tasks.py
View File

@ -102,6 +102,16 @@ def install(c):
print("Config file 'config.yaml' does not exist - copying from template.")
copyfile(CONFIG_TEMPLATE_FILE, CONFIG_FILE)
@task
def shell(c):
"""
Open a python shell with access to the InvenTree database models.
"""
manage(c, 'shell', pty=True)
@task
def superuser(c):
"""