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

Sales order status update (#4542)

Browse Source 
* Add extra status code "IN PROGRESS" for sales order

* Add method to 'issue' a SalesOrder

* Updates to salesorder template

* Add API endpoint and serializer for issuing a SalesOrder

* javascript for issuing order

* Cleanup buttons for SalesOrderLineItem table

* Bug fixes
This commit is contained in:
Oliver
2023-03-31 00:12:07 +11:00
committed by GitHub
parent d0bf4cb81a
commit f4f7803e96
10 changed files with 166 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -362,10 +362,16 @@ function renderSalesOrder(data, parameters={}) {
image = data.customer_detail.thumbnail || data.customer_detail.image || blankImage();
}
let text = data.reference;
if (data.customer_detail) {
text += ` - ${data.customer_detail.name}`;
}
return renderModel(
{
image: image,
text: `${data.reference} - ${data.customer_detail.name}`,
text: text,
textSecondary: shortenString(data.description),
url: data.url || `/order/sales-order/${data.pk}/`,
},

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

@ -27,6 +27,7 @@
createSalesOrderShipment,
editSalesOrder,
exportOrder,
issueSalesOrder,
loadSalesOrderAllocationTable,
loadSalesOrderLineItemTable,
loadSalesOrderShipmentTable,
@ -456,6 +457,28 @@ function completeSalesOrder(order_id, options={}) {
}
/*
* Launches sa modal form to mark a SalesOrder as "issued"
*/
function issueSalesOrder(order_id, options={}) {
let html = `
<div class='alert alert-block alert-info'>
{% trans "Issue this Sales Order?" %}
</div>`;
constructForm(`{% url "api-so-list" %}${order_id}/issue/`, {
method: 'POST',
title: '{% trans "Issue Sales Order" %}',
confirm: true,
preFormContent: html,
onSuccess: function(response) {
handleFormSuccess(response, options);
}
});
}
/*
* Launches a modal form to mark a SalesOrder as "cancelled"
*/
@ -1597,10 +1620,6 @@ function loadSalesOrderLineItemTable(table, options={}) {
options.table = table;
if (!options.pending && !global_settings.SALESORDER_EDIT_COMPLETED_ORDERS) {
options.allow_edit = false;
}
options.params = options.params || {};
if (!options.order) {
@ -1632,14 +1651,7 @@ function loadSalesOrderLineItemTable(table, options={}) {
}
);
// Is the order pending?
var pending = options.pending;
// Has the order shipped?
var shipped = options.status == {{ SalesOrderStatus.SHIPPED }};
// Show detail view if the PurchaseOrder is PENDING or SHIPPED
var show_detail = pending || shipped;
var show_detail = true;
// Add callbacks for expand / collapse buttons
$('#sales-lines-expand').click(function() {
@ -1750,7 +1762,7 @@ function loadSalesOrderLineItemTable(table, options={}) {
}
];
if (pending) {
if (options.open) {
columns.push(
{
field: 'stock',
@ -1843,25 +1855,22 @@ function loadSalesOrderLineItemTable(table, options={}) {
title: '{% trans "Notes" %}',
});
if (pending) {
columns.push({
field: 'buttons',
switchable: false,
formatter: function(value, row, index, field) {
columns.push({
field: 'buttons',
switchable: false,
formatter: function(value, row, index, field) {
let pk = row.pk;
let buttons = '';
let buttons = '';
var pk = row.pk;
if (row.part) {
var part = row.part_detail;
// Construct a set of buttons to display
if (row.part && row.part_detail) {
let part = row.part_detail;
if (options.allow_edit && !row.shipped) {
if (part.trackable) {
buttons += makeIconButton('fa-hashtag icon-green', 'button-add-by-sn', pk, '{% trans "Allocate serial numbers" %}');
}
buttons += makeIconButton('fa-sign-in-alt icon-green', 'button-add', pk, '{% trans "Allocate stock" %}');
if (part.purchaseable) {
buttons += makeIconButton('fa-shopping-cart', 'button-buy', row.part, '{% trans "Purchase stock" %}');
}
@ -1869,13 +1878,17 @@ function loadSalesOrderLineItemTable(table, options={}) {
if (part.assembly) {
buttons += makeIconButton('fa-tools', 'button-build', row.part, '{% trans "Build stock" %}');
}
buttons += makeIconButton('fa-dollar-sign icon-green', 'button-price', pk, '{% trans "Calculate price" %}');
}
}
buttons += makeIconButton('fa-dollar-sign icon-green', 'button-price', pk, '{% trans "Calculate price" %}');
if (options.allow_edit) {
buttons += makeCopyButton('button-duplicate', pk, '{% trans "Duplicate line item" %}');
buttons += makeEditButton('button-edit', pk, '{% trans "Edit line item" %}');
}
if (options.allow_delete) {
var delete_disabled = false;
var title = '{% trans "Delete line item" %}';
@ -1890,11 +1903,11 @@ function loadSalesOrderLineItemTable(table, options={}) {
// Prevent deletion of the line item if items have been allocated or shipped!
buttons += makeDeleteButton('button-delete', pk, title, {disabled: delete_disabled});
return wrapButtons(buttons);
}
});
}
return wrapButtons(buttons);
}
});
function reloadTable() {
$(table).bootstrapTable('refresh');
@ -1954,7 +1967,7 @@ function loadSalesOrderLineItemTable(table, options={}) {
{
success: function(response) {
constructForm(`{% url "api-so-line-list" %}${options.order}/allocate-serials/`, {
constructForm(`{% url "api-so-list" %}${options.order}/allocate-serials/`, {
method: 'POST',
title: '{% trans "Allocate Serial Numbers" %}',
fields: {
@ -2088,7 +2101,7 @@ function loadSalesOrderLineItemTable(table, options={}) {
detailViewByClick: false,
buttons: constructExpandCollapseButtons(table),
detailFilter: function(index, row) {
if (pending) {
if (options.open) {
// Order is pending
return row.allocated > 0;
} else {
@ -2096,7 +2109,7 @@ function loadSalesOrderLineItemTable(table, options={}) {
}
},
detailFormatter: function(index, row, element) {
if (pending) {
if (options.open) {
return showAllocationSubTable(index, row, element, options);
} else {
return showFulfilledSubTable(index, row, element, options);