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

order lines can be received directly from the new table

Browse Source
This commit is contained in:
Oliver 2021-12-03 21:07:09 +11:00
parent 6d90ded27f
commit acfafe22c5
2 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -988,7 +988,7 @@ function loadPurchaseOrderLineItemTable(table, options={}) {
field: 'buttons', field: 'buttons',
title: '', title: '',
formatter: function(value, row, index, field) { formatter: function(value, row, index, field) {
var html = `<div class='btn-group'>`; var html = `<div class='btn-group' role='group'>`;
var pk = row.pk; var pk = row.pk;

51
InvenTree/templates/js/translated/part.js
View File

@ -733,7 +733,7 @@ function loadPartPurchaseOrderTable(table, part_id, options={}) {
filters[key] = options.params[key]; filters[key] = options.params[key];
} }
setupFilterList('partpurchaseorders', $(table)); setupFilterList('purchaseorderlineitem', $(table), '#filter-list-partpurchaseorders');
$(table).inventreeTable({ $(table).inventreeTable({
url: '{% url "api-po-line-list" %}', url: '{% url "api-po-line-list" %}',
@ -741,9 +741,34 @@ function loadPartPurchaseOrderTable(table, part_id, options={}) {
name: 'partpurchaseorders', name: 'partpurchaseorders',
original: options.params, original: options.params,
showColumns: true, showColumns: true,
uniqueId: 'pk',
formatNoMatches: function() { formatNoMatches: function() {
return '{% trans "No purchase orders found" %}'; return '{% trans "No purchase orders found" %}';
}, },
onPostBody: function() {
$(table).find('.button-line-receive').click(function() {
var pk = $(this).attr('pk');
var line_item = $(table).bootstrapTable('getRowByUniqueId', pk);
if (!line_item) {
console.log('WARNING: getRowByUniqueId returned null');
return;
}
receivePurchaseOrderItems(
line_item.order,
[
line_item,
],
{
success: function() {
$(table).bootstrapTable('refresh');
}
}
);
})
},
columns: [ columns: [
{ {
field: 'order', field: 'order',
@ -758,7 +783,7 @@ function loadPartPurchaseOrderTable(table, part_id, options={}) {
var ref = global_settings.PURCHASEORDER_REFERENCE_PREFIX + order.reference; var ref = global_settings.PURCHASEORDER_REFERENCE_PREFIX + order.reference;
var html = renderLink(ref, `/order/po/${order.pk}/`); var html = renderLink(ref, `/order/purchase-order/${order.pk}/`);
html += purchaseOrderStatusDisplay( html += purchaseOrderStatusDisplay(
order.status, order.status,
@ -825,6 +850,7 @@ function loadPartPurchaseOrderTable(table, part_id, options={}) {
{ {
field: 'purchase_price', field: 'purchase_price',
title: '{% trans "Price" %}', title: '{% trans "Price" %}',
switchable: true,
formatter: function(value, row) { formatter: function(value, row) {
var formatter = new Intl.NumberFormat( var formatter = new Intl.NumberFormat(
'en-US', 'en-US',
@ -836,8 +862,27 @@ function loadPartPurchaseOrderTable(table, part_id, options={}) {
return formatter.format(row.purchase_price); return formatter.format(row.purchase_price);
} }
},
{
field: 'actions',
title: '',
formatter: function(value, row) {
if (row.received >= row.quantity) {
// Already recevied
return `<span class='badge bg-success rounded-pill'>{% trans "Received" %}</span>`;
} else {
var html = `<div class='btn-group' role='group'>`;
var pk = row.pk;
html += makeIconButton('fa-sign-in-alt', 'button-line-receive', pk, '{% trans "Receive line item" %}');
html += `</div>`;
return html;
}
}
} }
] ],
}); });
} }