inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-02 05:26:45 +00:00
Code

Sales order fix backport (#4879)

Browse Source 
* Bump version to 0.11.2

* Fix for sales order tables (#4753)

- Allow line items to be allocated after partial shipment
- Fixes https://github.com/inventree/InvenTree/issues/4734
This commit is contained in:
Oliver 2023-05-24 00:38:00 +10:00 committed by GitHub
parent 9f6d860554
commit 53e442f555
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1056,9 +1056,8 @@ function allocateStockToSalesOrder(order_id, line_items, options={}) {
var table_entries = ''; var table_entries = '';
for (var idx = 0; idx < line_items.length; idx++ ) { for (var idx = 0; idx < line_items.length; idx++ ) {
var line_item = line_items[idx]; let line_item = line_items[idx];
let remaining = Math.max(0, line_item.quantity - line_item.allocated);
var remaining = 0;
table_entries += renderLineItemRow(line_item, remaining); table_entries += renderLineItemRow(line_item, remaining);
} }
@ -1225,7 +1224,7 @@ function allocateStockToSalesOrder(order_id, line_items, options={}) {
var available = Math.max((data.quantity || 0) - (data.allocated || 0), 0); var available = Math.max((data.quantity || 0) - (data.allocated || 0), 0);
// Remaining quantity to be allocated? // Remaining quantity to be allocated?
var remaining = Math.max(line_item.quantity - line_item.shipped - line_item.allocated, 0); var remaining = Math.max(line_item.quantity - line_item.allocated, 0);
// Maximum amount that we need // Maximum amount that we need
var desired = Math.min(available, remaining); var desired = Math.min(available, remaining);
@ -1892,7 +1891,7 @@ function loadSalesOrderLineItemTable(table, options={}) {
if (row.part && row.part_detail) { if (row.part && row.part_detail) {
let part = row.part_detail; let part = row.part_detail;
if (options.allow_edit && !row.shipped) { if (options.allow_edit && (row.shipped < row.quantity)) {
if (part.trackable) { if (part.trackable) {
buttons += makeIconButton('fa-hashtag icon-green', 'button-add-by-sn', pk, '{% trans "Allocate serial numbers" %}'); buttons += makeIconButton('fa-hashtag icon-green', 'button-add-by-sn', pk, '{% trans "Allocate serial numbers" %}');
} }