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

Allow editing of extra line items in order table (#3888)

Browse Source 
* Allow editing of extra line items in order table

* Allow addition of extra line items even if order is not "pending"

* Allow addition and editing of extra line items for sales orders

* javascript linting
This commit is contained in:
Oliver
2022-11-02 07:32:14 +11:00
committed by GitHub
parent db45b6f9dc
commit c7a2def353
4 changed files with 29 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2473,9 +2473,6 @@ function loadPurchaseOrderExtraLineTable(table, options={}) {
setupFilterList('purchaseorderextraline', $(table), filter_target);
// Is the order pending?
var pending = options.status == {{ SalesOrderStatus.PENDING }};
// Table columns to display
var columns = [
{
@ -2555,26 +2552,24 @@ function loadPurchaseOrderExtraLineTable(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) {
var html = `<div class='btn-group float-right' role='group'>`;
var html = `<div class='btn-group float-right' role='group'>`;
var pk = row.pk;
var pk = row.pk;
html += makeIconButton('fa-clone', 'button-duplicate', pk, '{% trans "Duplicate line" %}');
html += makeIconButton('fa-edit icon-blue', 'button-edit', pk, '{% trans "Edit line" %}');
html += makeIconButton('fa-trash-alt icon-red', 'button-delete', pk, '{% trans "Delete line" %}', );
html += makeIconButton('fa-clone', 'button-duplicate', pk, '{% trans "Duplicate line" %}');
html += makeIconButton('fa-edit icon-blue', 'button-edit', pk, '{% trans "Edit line" %}');
html += makeIconButton('fa-trash-alt icon-red', 'button-delete', pk, '{% trans "Delete line" %}', );
html += `</div>`;
html += `</div>`;
return html;
}
});
}
return html;
}
});
function reloadTable() {
$(table).bootstrapTable('refresh');
@ -4320,9 +4315,6 @@ function loadSalesOrderExtraLineTable(table, options={}) {
setupFilterList('salesorderextraline', $(table), filter_target);
// Is the order pending?
var pending = options.status == {{ SalesOrderStatus.PENDING }};
// Table columns to display
var columns = [
{
@ -4402,26 +4394,24 @@ function loadSalesOrderExtraLineTable(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) {
var html = `<div class='btn-group float-right' role='group'>`;
var html = `<div class='btn-group float-right' role='group'>`;
var pk = row.pk;
var pk = row.pk;
html += makeIconButton('fa-clone', 'button-duplicate', pk, '{% trans "Duplicate line" %}');
html += makeIconButton('fa-edit icon-blue', 'button-edit', pk, '{% trans "Edit line" %}');
html += makeIconButton('fa-trash-alt icon-red', 'button-delete', pk, '{% trans "Delete line" %}', );
html += makeIconButton('fa-clone', 'button-duplicate', pk, '{% trans "Duplicate line" %}');
html += makeIconButton('fa-edit icon-blue', 'button-edit', pk, '{% trans "Edit line" %}');
html += makeIconButton('fa-trash-alt icon-red', 'button-delete', pk, '{% trans "Delete line" %}', );
html += `</div>`;
html += `</div>`;
return html;
}
});
}
return html;
}
});
function reloadTable() {
$(table).bootstrapTable('refresh');