inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-19 05:25:42 +00:00
Code Activity

Allow shipment numbers to be non-unique for different sales orders

Browse Source 
- must be unique for a given sales order
This commit is contained in:
Oliver
2021-11-30 00:42:30 +11:00
parent f3f3030b37
commit 3f9b280e17
6 changed files with 100 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,16 +75,56 @@ function completeShipment(shipment_id) {
// Open a dialog to create a new sales order shipment
function createSalesOrderShipment(options={}) {
constructForm('{% url "api-so-shipment-list" %}', {
method: 'POST',
fields: salesOrderShipmentFields(options),
title: '{% trans "Create New Shipment" %}',
onSuccess: function(data) {
if (options.onSuccess) {
options.onSuccess(data);
// Work out the next shipment number for the given order
inventreeGet(
'{% url "api-so-shipment-list" %}',
{
order: options.order,
},
{
success: function(results) {
// "predict" the next reference number
var ref = results.length + 1;
var found = false;
while (!found) {
var no_match = true;
for (var ii = 0; ii < results.length; ii++) {
if (ref.toString() == results[ii].reference.toString()) {
no_match = false;
break;
}
}
if (no_match) {
break;
} else {
ref++;
}
}
var fields = salesOrderShipmentFields(options);
fields.reference.value = ref;
fields.reference.prefix = global_settings.SALESORDER_REFERENCE_PREFIX + options.reference;
constructForm('{% url "api-so-shipment-list" %}', {
method: 'POST',
fields: fields,
title: '{% trans "Create New Shipment" %}',
onSuccess: function(data) {
if (options.onSuccess) {
options.onSuccess(data);
}
}
});
}
}
});
);
}
@ -1271,15 +1311,20 @@ function loadSalesOrderShipmentTable(table, options={}) {
title: '{% trans "Shipment" %}',
switchable: false,
},
{
field: 'status',
title: '{% trans "Status" %}',
},
{
field: 'shipment_date',
title: '{% trans "Shipment Date" %}',
visible: options.shipped,
switchable: false,
formatter: function(value, row) {
if (value) {
return value;
} else {
return '{% trans "Not shipped" %}';
}
}
},
{
field: 'tracking_number',
title: '{% trans "Tracking" %}',
},
{
field: 'notes',
@ -1711,7 +1756,7 @@ function loadSalesOrderAllocationTable(table, options={}) {
field: 'quantity',
title: '{% trans "Quantity" %}',
sortable: true,
}
},
]
});
}