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 editing updates (#3902)

Browse Source 
* Add extra setting to guard whether purchase order items can be edited "after the fact"

* Improvements for "extra" purchase order line table

* Similar changes for sales order table

* Improvements for image download helper

(cherry picked from commit 43b0d3ca55)
This commit is contained in:
Oliver 2022-11-07 13:56:50 +11:00 committed by GitHub
parent 494a016dad
commit 1691f45578
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 81 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
InvenTree/InvenTree/tests.py
View File

@ -275,8 +275,10 @@ class TestHelpers(TestCase):
we will simply try multiple times
"""
tries = 0
with self.assertRaises(expected_error):
while retries > 0:
while tries < retries:
try:
helpers.download_image_from_url(url, timeout=timeout)
@ -285,9 +287,11 @@ class TestHelpers(TestCase):
if type(exc) is expected_error:
# Re-throw this error
raise exc
else:
print("Unexpected error:", type(exc), exc)
time.sleep(30)
retries -= 1
tries += 1
time.sleep(10 * tries)
# Attempt to download an image which throws a 404
dl_helper("https://httpstat.us/404", requests.exceptions.HTTPError, timeout=10)
@ -295,9 +299,6 @@ class TestHelpers(TestCase):
# Attempt to download, but timeout
dl_helper("https://httpstat.us/200?sleep=5000", requests.exceptions.ReadTimeout, timeout=1)
# Attempt to download, but not a valid image
dl_helper("https://httpstat.us/200", TypeError, timeout=10)
large_img = "https://github.com/inventree/InvenTree/raw/master/InvenTree/InvenTree/static/img/paper_splash_large.jpg"
InvenTreeSetting.set_setting('INVENTREE_DOWNLOAD_IMAGE_MAX_SIZE', 1, change_user=None)

14
InvenTree/common/models.py
View File

@ -1259,6 +1259,13 @@ class InvenTreeSetting(BaseInvenTreeSetting):
'validator': bool,
},
'SALESORDER_EDIT_COMPLETED_ORDERS': {
'name': _('Edit Completed Sales Orders'),
'description': _('Allow editing of sales orders after they have been shipped or completed'),
'default': False,
'validator': bool,
},
'PURCHASEORDER_REFERENCE_PATTERN': {
'name': _('Purchase Order Reference Pattern'),
'description': _('Required pattern for generating Purchase Order reference field'),
@ -1266,6 +1273,13 @@ class InvenTreeSetting(BaseInvenTreeSetting):
'validator': order.validators.validate_purchase_order_reference_pattern,
},
'PURCHASEORDER_EDIT_COMPLETED_ORDERS': {
'name': _('Edit Completed Purchase Orders'),
'description': _('Allow editing of purchase orders after they have been shipped or completed'),
'default': False,
'validator': bool,
},
# login / SSO
'LOGIN_ENABLE_PWD_FORGOT': {
'name': _('Enable password forgot'),

17
InvenTree/order/templates/order/purchase_order_detail.html
View File

@ -5,11 +5,13 @@
{% load i18n %}
{% load static %}
{% block sidebar %}
{% include 'order/po_sidebar.html' %}
{% endblock %}
{% block page_content %}
{% settings_value "PURCHASEORDER_EDIT_COMPLETED_ORDERS" as allow_extra_editing %}
<div class='panel panel-hidden' id='panel-order-items'>
<div class='panel-heading'>
@ -18,7 +20,7 @@
{% include "spacer.html" %}
<div class='btn-group' role='group'>
{% if roles.purchase_order.change %}
{% if order.status == PurchaseOrderStatus.PENDING %}
{% if order.is_pending or allow_extra_editing %}
<a class='btn btn-primary' href='{% url "po-upload" order.id %}' role='button'>
<span class='fas fa-file-upload side-icon'></span> {% trans "Upload File" %}
</a>
@ -48,11 +50,13 @@
<h4>{% trans "Extra Lines" %}</h4>
{% include "spacer.html" %}
<div class='btn-group' role='group'>
{% if roles.purchase_order.change %}
{% if roles.purchase_order.change %}
{% if order.is_pending or allow_extra_editing %}
<button type='button' class='btn btn-success' id='new-po-extra-line'>
<span class='fas fa-plus-circle'></span> {% trans "Add Extra Line" %}
</button>
{% endif %}
{% endif %}
</div>
</div>
</div>
@ -209,6 +213,9 @@ loadPurchaseOrderLineItemTable('#po-line-table', {
{% else %}
allow_edit: false,
{% endif %}
{% if order.status == PurchaseOrderStatus.PENDING %}
pending: true,
{% endif %}
{% if order.status == PurchaseOrderStatus.PLACED and roles.purchase_order.change %}
allow_receive: true,
{% else %}
@ -241,6 +248,12 @@ loadPurchaseOrderExtraLineTable(
{
order: {{ order.pk }},
status: {{ order.status }},
{% if order.is_pending %}
pending: true,
{% endif %}
{% if roles.purchase_order.change %}
allow_edit: true,
{% endif %}
}
);

15
InvenTree/order/templates/order/sales_order_detail.html
View File

@ -10,6 +10,7 @@
{% endblock %}
{% block page_content %}
{% settings_value "SALESORDER_EDIT_COMPLETED_ORDERS" as allow_extra_editing %}
<div class='panel panel-hidden' id='panel-order-items'>
<div class='panel-heading'>
@ -17,11 +18,13 @@
<h4>{% trans "Sales Order Items" %}</h4>
{% include "spacer.html" %}
<div class='btn-group' role='group'>
{% if roles.sales_order.change and order.is_pending %}
{% if roles.sales_order.change %}
{% if order.is_pending or allow_extra_editing %}
<button type='button' class='btn btn-success' id='new-so-line'>
<span class='fas fa-plus-circle'></span> {% trans "Add Line Item" %}
</button>
{% endif %}
{% endif %}
</div>
</div>
</div>
@ -43,10 +46,12 @@
{% include "spacer.html" %}
<div class='btn-group' role='group'>
{% if roles.sales_order.change %}
{% if order.is_pending or allow_extra_editing %}
<button type='button' class='btn btn-success' id='new-so-extra-line'>
<span class='fas fa-plus-circle'></span> {% trans "Add Extra Line" %}
</button>
{% endif %}
{% endif %}
</div>
</div>
</div>
@ -265,6 +270,12 @@
order: {{ order.pk }},
reference: '{{ order.reference }}',
status: {{ order.status }},
{% if roles.sales_order.change %}
allow_edit: true,
{% endif %}
{% if order.is_pending %}
pending: true,
{% endif %}
}
);
@ -289,6 +300,8 @@
{
order: {{ order.pk }},
status: {{ order.status }},
{% if roles.sales_order.change %}allow_edit: true,{% endif %}
{% if order.is_pending %}pending: true,{% endif %}
}
);

1
InvenTree/templates/InvenTree/settings/po.html
View File

@ -11,6 +11,7 @@
<table class='table table-striped table-condensed'>
<tbody>
{% include "InvenTree/settings/setting.html" with key="PURCHASEORDER_REFERENCE_PATTERN" %}
{% include "InvenTree/settings/setting.html" with key="PURCHASEORDER_EDIT_COMPLETED_ORDERS" icon='fa-edit' %}
</tbody>
</table>
{% endblock %}

1
InvenTree/templates/InvenTree/settings/so.html
View File

@ -13,6 +13,7 @@
<tbody>
{% include "InvenTree/settings/setting.html" with key="SALESORDER_REFERENCE_PATTERN" %}
{% include "InvenTree/settings/setting.html" with key="SALESORDER_DEFAULT_SHIPMENT" icon="fa-truck-loading" %}
{% include "InvenTree/settings/setting.html" with key="SALESORDER_EDIT_COMPLETED_ORDERS" icon='fa-edit' %}
</tbody>
</table>

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

@ -2084,6 +2084,11 @@ function loadPurchaseOrderLineItemTable(table, options={}) {
options.params['order'] = options.order;
options.params['part_detail'] = true;
// Override 'editing' if order is not pending
if (!options.pending && !global_settings.PURCHASEORDER_EDIT_COMPLETED_ORDERS) {
options.allow_edit = false;
}
var filters = loadTableFilters('purchaseorderlineitem');
for (var key in options.params) {
@ -2445,6 +2450,10 @@ function loadPurchaseOrderExtraLineTable(table, options={}) {
options.table = table;
if (!options.pending && !global_settings.PURCHASEORDER_EDIT_COMPLETED_ORDERS) {
options.allow_edit = false;
}
options.params = options.params || {};
if (!options.order) {
@ -2561,9 +2570,11 @@ function loadPurchaseOrderExtraLineTable(table, options={}) {
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" %}', );
if (options.allow_edit) {
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>`;
@ -3740,6 +3751,10 @@ 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) {
@ -3769,7 +3784,7 @@ function loadSalesOrderLineItemTable(table, options={}) {
setupFilterList('salesorderlineitem', $(table), filter_target);
// Is the order pending?
var pending = options.status == {{ SalesOrderStatus.PENDING }};
var pending = options.pending;
// Has the order shipped?
var shipped = options.status == {{ SalesOrderStatus.SHIPPED }};
@ -4287,6 +4302,10 @@ function loadSalesOrderExtraLineTable(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) {
@ -4401,14 +4420,14 @@ function loadSalesOrderExtraLineTable(table, options={}) {
var html = `<div class='btn-group float-right' role='group'>`;
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" %}', );
if (options.allow_edit) {
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 += `</div>`;
return html;
}
});