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

Shipment delivery date (#4825)

Browse Source 
* Add delivery date setting to Shipment model

* Add delivery_date to serializer

* Correct test for is_delivered

* Add relevant fields to API and forms

* Add test

* Increment API version

* Move migration file because of conflict
This commit is contained in:
miggland
2023-05-16 13:28:09 +02:00
committed by GitHub
parent 397419f365
commit 98d87c84e3
8 changed files with 119 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
InvenTree/templates/js/translated/sales_order.js
View File

@ -209,6 +209,9 @@ function salesOrderShipmentFields(options={}) {
},
link: {
icon: 'fa-link',
},
delivery_date: {
icon: 'fa-calendar-check',
}
};
@ -298,7 +301,11 @@ function completeSalesOrderShipment(shipment_id, options={}) {
link: {
value: shipment.link,
icon: 'fa-link',
}
},
delivery_date: {
value: shipment.delivery_date,
icon: 'fa-calendar-check',
},
},
preFormContent: html,
confirm: true,
@ -979,6 +986,18 @@ function loadSalesOrderShipmentTable(table, options={}) {
}
}
},
{
field: 'delivery_date',
title: '{% trans "Delivery Date" %}',
sortable: true,
formatter: function(value, row) {
if (value) {
return renderDate(value);
} else {
return '<em>{% trans "Unknown" %}</em>';
}
}
},
{
field: 'tracking_number',
title: '{% trans "Tracking" %}',