From 1dc56827670e7fe60d46259c540f91dbc17a21ff Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 8 Aug 2021 00:44:30 +1000 Subject: [PATCH 1/4] bug fix --- InvenTree/templates/js/translated/forms.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/InvenTree/templates/js/translated/forms.js b/InvenTree/templates/js/translated/forms.js index 8f8ea71d54..4b41623fbf 100644 --- a/InvenTree/templates/js/translated/forms.js +++ b/InvenTree/templates/js/translated/forms.js @@ -1240,7 +1240,9 @@ function setRelatedFieldData(name, data, options) { } -function initializeChoiceField(name, field, options) { +function initializeChoiceField(field, fields, options) { + + var name = field.name; var select = $(options.modal).find(`#id_${name}`); From 4e6c8c45ee6f4e6cf500fadaa91f4fe655dfbde9 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 8 Aug 2021 00:44:46 +1000 Subject: [PATCH 2/4] secondary modal for part form --- InvenTree/templates/js/translated/part.js | 14 ++++++++++++-- InvenTree/templates/js/translated/stock.js | 12 ++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/InvenTree/templates/js/translated/part.js b/InvenTree/templates/js/translated/part.js index 3def7abdad..6f51f492c4 100644 --- a/InvenTree/templates/js/translated/part.js +++ b/InvenTree/templates/js/translated/part.js @@ -17,7 +17,16 @@ function yesNoLabel(value) { function partFields(options={}) { var fields = { - category: {}, + category: { + secondary: { + title: '{% trans "Add Part Category" %}', + fields: function(data) { + var fields = categoryFields(); + + return fields; + } + } + }, name: {}, IPN: {}, revision: {}, @@ -30,7 +39,8 @@ function partFields(options={}) { link: { icon: 'fa-link', }, - default_location: {}, + default_location: { + }, default_supplier: {}, default_expiry: { icon: 'fa-calendar-alt', diff --git a/InvenTree/templates/js/translated/stock.js b/InvenTree/templates/js/translated/stock.js index 826048471d..36b3bea03a 100644 --- a/InvenTree/templates/js/translated/stock.js +++ b/InvenTree/templates/js/translated/stock.js @@ -2,6 +2,18 @@ {% load inventree_extras %} {% load status_codes %} + +function locationFields() { + return { + parent: { + help_text: '{% trans "Parent stock location" %}', + }, + name: {}, + description: {}, + }; +} + + /* Stock API functions * Requires api.js to be loaded first */ From 52ba2201b2d410047678fb9292c715c76fe1392b Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 8 Aug 2021 00:49:16 +1000 Subject: [PATCH 3/4] secondary for creating sales order customers --- InvenTree/templates/js/translated/order.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/InvenTree/templates/js/translated/order.js b/InvenTree/templates/js/translated/order.js index 86035c5c47..8e9809c2c0 100644 --- a/InvenTree/templates/js/translated/order.js +++ b/InvenTree/templates/js/translated/order.js @@ -13,6 +13,16 @@ function createSalesOrder(options={}) { }, customer: { value: options.customer, + secondary: { + title: '{% trans "Add Customer" %}', + fields: function(data) { + var fields = companyFormFields(); + + fields.is_customer.value = true; + + return fields; + } + } }, customer_reference: {}, description: {}, From e3efd1218441aec6a2901c67e0d3d58a79a13e68 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 8 Aug 2021 00:50:59 +1000 Subject: [PATCH 4/4] secondary for purcahse order --- InvenTree/templates/js/translated/order.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/InvenTree/templates/js/translated/order.js b/InvenTree/templates/js/translated/order.js index 8e9809c2c0..8a8f45103c 100644 --- a/InvenTree/templates/js/translated/order.js +++ b/InvenTree/templates/js/translated/order.js @@ -54,6 +54,16 @@ function createPurchaseOrder(options={}) { }, supplier: { value: options.supplier, + secondary: { + title: '{% trans "Add Supplier" %}', + fields: function(data) { + var fields = companyFormFields(); + + fields.is_supplier.value = true; + + return fields; + } + } }, supplier_reference: {}, description: {},