diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html index ace9ae77c3..35ac42e090 100644 --- a/InvenTree/order/templates/order/purchase_order_detail.html +++ b/InvenTree/order/templates/order/purchase_order_detail.html @@ -48,7 +48,7 @@

{% trans "Extra Lines" %}

{% include "spacer.html" %}
- {% if roles.purchase_order.change and order.status == PurchaseOrderStatus.PENDING %} + {% if roles.purchase_order.change %} diff --git a/InvenTree/order/templates/order/sales_order_detail.html b/InvenTree/order/templates/order/sales_order_detail.html index 40b3fa5cab..c00ccca34e 100644 --- a/InvenTree/order/templates/order/sales_order_detail.html +++ b/InvenTree/order/templates/order/sales_order_detail.html @@ -42,7 +42,7 @@

{% trans "Extra Lines" %}

{% include "spacer.html" %}
- {% if roles.sales_order.change and order.is_pending %} + {% if roles.sales_order.change %} diff --git a/InvenTree/templates/js/translated/order.js b/InvenTree/templates/js/translated/order.js index c52585dfe1..ebc4a918e5 100644 --- a/InvenTree/templates/js/translated/order.js +++ b/InvenTree/templates/js/translated/order.js @@ -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 = `
`; + var html = `
`; - 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 += `
`; + html += `
`; - 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 = `
`; + var html = `
`; - 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 += `
`; + html += `
`; - return html; - } - }); - } + return html; + } + }); function reloadTable() { $(table).bootstrapTable('refresh'); diff --git a/docker.dev.env b/docker.dev.env index ac91f59769..c19df355cd 100644 --- a/docker.dev.env +++ b/docker.dev.env @@ -15,4 +15,4 @@ INVENTREE_DB_USER=pguser INVENTREE_DB_PASSWORD=pgpassword # Enable plugins? -INVENTREE_PLUGINS_ENABLED=True +INVENTREE_PLUGINS_ENABLED=False