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

Fix callbacks for adding new supplier part and/or purchase order "inline"

Browse Source
This commit is contained in:
Oliver Walters 2022-05-03 11:42:13 +10:00
parent 40c9885b87
commit 4732efb330
4 changed files with 44 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/company/api.py
View File

@ -312,7 +312,7 @@ class SupplierPartList(generics.ListCreateAPIView):
try:
params = self.request.query_params
kwargs['part_detail'] = str2bool(params.get('part_detail', None))
kwargs['supplier_detail'] = str2bool(params.get('supplier_detail', None))
kwargs['supplier_detail'] = str2bool(params.get('supplier_detail', True))
kwargs['manufacturer_detail'] = str2bool(params.get('manufacturer_detail', None))
kwargs['pretty'] = str2bool(params.get('pretty', None))
except AttributeError:

8
InvenTree/templates/js/translated/company.js
View File

@ -115,10 +115,6 @@ function supplierPartFields() {
return {
part: {},
supplier: {},
SKU: {
icon: 'fa-hashtag',
},
manufacturer_part: {
filters: {
part_detail: true,
@ -126,6 +122,10 @@ function supplierPartFields() {
},
auto_fill: true,
},
supplier: {},
SKU: {
icon: 'fa-hashtag',
},
description: {},
link: {
icon: 'fa-link',

4
InvenTree/templates/js/translated/model_renderers.js
View File

@ -394,7 +394,9 @@ function renderSupplierPart(name, data, parameters={}, options={}) {
html += select2Thumbnail(part_image);
}
html += ` <span><b>${data.supplier_detail.name}</b> - ${data.SKU}</span>`;
if (data.supplier_detail) {
html += ` <span><b>${data.supplier_detail.name}</b> - ${data.SKU}</span>`;
}
if (data.part_detail) {
html += ` - <i>${data.part_detail.full_name}</i>`;

82
InvenTree/templates/js/translated/order.js
View File

@ -260,8 +260,8 @@ function createPurchaseOrder(options={}) {
}
}
},
supplier_reference: {},
description: {},
supplier_reference: {},
target_date: {
icon: 'fa-calendar-alt',
},
@ -670,61 +670,51 @@ function orderParts(parts_list, options={}) {
auto_fill: false,
filters: {
status: {{ PurchaseOrderStatus.PENDING }},
},
adjustFilters: function(query, opts) {
// Whenever we open the drop-down to select an order,
// ensure we are only displaying orders which match the selected supplier part
var supplier_part_pk = getFormFieldValue(`supplier_part_${part.pk}`, opts);
inventreeGet(
`/api/company/part/${supplier_part_pk}/`,
{},
{
async: false,
success: function(data) {
query.supplier = data.supplier;
}
}
);
return query;
supplier_detail: true,
},
noResults: function(query) {
return '{% trans "No matching purchase orders" %}';
}
}, null, opts);
});
// Add callback for "remove row" button
$(opts.modal).find('.button-row-remove').click(function() {
var pk = $(this).attr('pk');
// Add callback for "remove row" button
$(opts.modal).find('.button-row-remove').click(function() {
var pk = $(this).attr('pk');
$(opts.modal).find(`#order_row_${pk}`).remove();
$(opts.modal).find(`#order_row_${pk}`).remove();
});
// Add callback for "new supplier part" button
$(opts.modal).find('.button-row-new-sp').click(function() {
var pk = $(this).attr('pk');
// Launch dialog to create new supplier part
createSupplierPart({
part: pk,
onSuccess: function(response) {
setRelatedFieldData(
`supplier_part_${pk}`,
response,
opts
);
}
});
});
// Add callback for "new supplier part" button
$(opts.modal).find('.button-row-new-sp').click(function() {
var pk = $(this).attr('pk');
// Add callback for "new purchase order" button
$(opts.modal).find('.button-row-new-po').click(function() {
var pk = $(this).attr('pk');
// Launch dialog to create new supplier part
createSupplierPart({
part: pk,
onSuccess: function(response) {
// TODO
}
});
});
// Add callback for "new purchase order" button
$(opts.modal).find('.button-row-new-po').click(function() {
var pk = $(this).attr('pk');
// Launch dialog to create new purchase order
createPurchaseOrder({
onSuccess: function(response) {
// TODO
}
});
// Launch dialog to create new purchase order
createPurchaseOrder({
onSuccess: function(response) {
setRelatedFieldData(
`purchase_order_${pk}`,
response,
opts
);
}
});
});
}