From 8ad141f910ba86570c29cd31d854c3807f4af381 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 20 May 2022 16:57:30 +1000 Subject: [PATCH 1/5] Add extra options to control search results in preview window - Allow user to optionally show / hide inactive purchase orders - Allow user to optionally show / hide inactive sales orders --- InvenTree/common/models.py | 14 +++++++++ .../InvenTree/settings/user_search.html | 2 ++ InvenTree/templates/js/translated/search.js | 31 ++++++++++++++----- 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py index 92e5c1522c..a9150a8e6d 100644 --- a/InvenTree/common/models.py +++ b/InvenTree/common/models.py @@ -1464,6 +1464,13 @@ class InvenTreeUserSetting(BaseInvenTreeSetting): 'validator': bool, }, + 'SEARCH_PREVIEW_EXCLUDE_INACTIVE_PURCHASE_ORDERS': { + 'name': _('Exclude Inactive Purchase Orders'), + 'description': _('Exclude inactive purchase orders from search preview window'), + 'default': True, + 'validator': bool, + }, + 'SEARCH_PREVIEW_SHOW_SALES_ORDERS': { 'name': _('Search Sales Orders'), 'description': _('Display sales orders in search preview window'), @@ -1471,6 +1478,13 @@ class InvenTreeUserSetting(BaseInvenTreeSetting): 'validator': bool, }, + 'SEARCH_PREVIEW_EXCLUDE_INACTIVE_SALES_ORDERS': { + 'name': 'Exclude Inactive Sales Orders', + 'description': _('Exclude inactive sales orders from search preview window'), + 'validator': bool, + 'default': True, + }, + 'SEARCH_PREVIEW_RESULTS': { 'name': _('Search Preview Results'), 'description': _('Number of results to show in each section of the search preview window'), diff --git a/InvenTree/templates/InvenTree/settings/user_search.html b/InvenTree/templates/InvenTree/settings/user_search.html index 1883110b80..97ce2bb7e9 100644 --- a/InvenTree/templates/InvenTree/settings/user_search.html +++ b/InvenTree/templates/InvenTree/settings/user_search.html @@ -20,7 +20,9 @@ {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_SHOW_LOCATIONS" user_setting=True icon='fa-sitemap' %} {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_SHOW_COMPANIES" user_setting=True icon='fa-building' %} {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_SHOW_PURCHASE_ORDERS" user_setting=True icon='fa-shopping-cart' %} + {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_EXCLUDE_INACTIVE_PURCHASE_ORDERS" user_setting=True icon='fa-search-minus' %} {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_SHOW_SALES_ORDERS" user_setting=True icon='fa-truck' %} + {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_EXCLUDE_INACTIVE_SALES_ORDERS" user_setting=True icon='fa-search-minus' %} {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_RESULTS" user_setting=True icon='fa-search' %} diff --git a/InvenTree/templates/js/translated/search.js b/InvenTree/templates/js/translated/search.js index 4db310a062..8ba54a5dd1 100644 --- a/InvenTree/templates/js/translated/search.js +++ b/InvenTree/templates/js/translated/search.js @@ -167,15 +167,23 @@ function updateSearch() { } if (user_settings.SEARCH_PREVIEW_SHOW_PURCHASE_ORDERS) { + + var filters = { + supplier_detail: true, + } + + if (user_settings.SEARCH_PREVIEW_EXCLUDE_INACTIVE_PURCHASE_ORDERS) { + var filters = { + outstanding: true, + } + } + // Search for matching purchase orders addSearchQuery( 'purchaseorder', '{% trans "Purchase Orders" %}', '{% url "api-po-list" %}', - { - supplier_detail: true, - outstanding: true, - }, + filters, renderPurchaseOrder, { url: '/order/purchase-order', @@ -184,15 +192,22 @@ function updateSearch() { } if (user_settings.SEARCH_PREVIEW_SHOW_SALES_ORDERS) { + + var filters = { + customer_detail: true, + }; + + // Hide inactive (not "outstanding" orders) + if (user_settings.SEARCH_PREVIEW_EXCLUDE_INACTIVE_SALES_ORDERS) { + filters.outstanding = true; + } + // Search for matching sales orders addSearchQuery( 'salesorder', '{% trans "Sales Orders" %}', '{% url "api-so-list" %}', - { - customer_detail: true, - outstanding: true, - }, + filters, renderSalesOrder, { url: '/order/sales-order', From 0f4ed55bed1985640fee115b14ad57c6e2a6f74c Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 20 May 2022 17:02:28 +1000 Subject: [PATCH 2/5] JS fixes --- InvenTree/templates/InvenTree/settings/user_search.html | 6 +++--- InvenTree/templates/js/translated/search.js | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/InvenTree/templates/InvenTree/settings/user_search.html b/InvenTree/templates/InvenTree/settings/user_search.html index 97ce2bb7e9..f54c5fd2ef 100644 --- a/InvenTree/templates/InvenTree/settings/user_search.html +++ b/InvenTree/templates/InvenTree/settings/user_search.html @@ -15,18 +15,18 @@ {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_SHOW_PARTS" user_setting=True icon='fa-shapes' %} + {% include "InvenTree/settings/setting.html" with key="SEARCH_HIDE_INACTIVE_PARTS" user_setting=True icon='fa-eye-slash' %} {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_SHOW_CATEGORIES" user_setting=True icon='fa-sitemap' %} {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_SHOW_STOCK" user_setting=True icon='fa-boxes' %} {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_SHOW_LOCATIONS" user_setting=True icon='fa-sitemap' %} {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_SHOW_COMPANIES" user_setting=True icon='fa-building' %} {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_SHOW_PURCHASE_ORDERS" user_setting=True icon='fa-shopping-cart' %} - {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_EXCLUDE_INACTIVE_PURCHASE_ORDERS" user_setting=True icon='fa-search-minus' %} + {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_EXCLUDE_INACTIVE_PURCHASE_ORDERS" user_setting=True icon='fa-eye-slash' %} {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_SHOW_SALES_ORDERS" user_setting=True icon='fa-truck' %} - {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_EXCLUDE_INACTIVE_SALES_ORDERS" user_setting=True icon='fa-search-minus' %} + {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_EXCLUDE_INACTIVE_SALES_ORDERS" user_setting=True icon='fa-eye-slash' %} {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_RESULTS" user_setting=True icon='fa-search' %} - {% include "InvenTree/settings/setting.html" with key="SEARCH_HIDE_INACTIVE_PARTS" user_setting=True icon='fa-eye-slash' %}
diff --git a/InvenTree/templates/js/translated/search.js b/InvenTree/templates/js/translated/search.js index 8ba54a5dd1..5900a9b28d 100644 --- a/InvenTree/templates/js/translated/search.js +++ b/InvenTree/templates/js/translated/search.js @@ -170,12 +170,10 @@ function updateSearch() { var filters = { supplier_detail: true, - } + }; if (user_settings.SEARCH_PREVIEW_EXCLUDE_INACTIVE_PURCHASE_ORDERS) { - var filters = { - outstanding: true, - } + filters.outstanding = true; } // Search for matching purchase orders From 8da278a0721743b6e2b1eb80f45acb966bac4be3 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 20 May 2022 17:10:51 +1000 Subject: [PATCH 3/5] Adds option to hide unavailable stock items from the search preview window --- InvenTree/common/models.py | 23 ++++++++++++------- .../InvenTree/settings/user_search.html | 1 + InvenTree/templates/js/translated/search.js | 16 +++++++++---- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py index a9150a8e6d..2beeb26f1d 100644 --- a/InvenTree/common/models.py +++ b/InvenTree/common/models.py @@ -1428,6 +1428,13 @@ class InvenTreeUserSetting(BaseInvenTreeSetting): 'default': True, 'validator': bool, }, + + 'SEARCH_HIDE_INACTIVE_PARTS': { + 'name': _("Hide Inactive Parts"), + 'description': _('Excluded inactive parts from search preview window'), + 'default': False, + 'validator': bool, + }, 'SEARCH_PREVIEW_SHOW_CATEGORIES': { 'name': _('Search Categories'), @@ -1443,6 +1450,13 @@ class InvenTreeUserSetting(BaseInvenTreeSetting): 'validator': bool, }, + 'SEARCH_PREVIEW_HIDE_UNAVAILABLE_STOCK': { + 'name': _('Hide Unavailable Stock Items'), + 'description': _('Exclude stock items which are not available from the search preview window'), + 'validator': bool, + 'default': False, + }, + 'SEARCH_PREVIEW_SHOW_LOCATIONS': { 'name': _('Search Locations'), 'description': _('Display stock locations in search preview window'), @@ -1479,7 +1493,7 @@ class InvenTreeUserSetting(BaseInvenTreeSetting): }, 'SEARCH_PREVIEW_EXCLUDE_INACTIVE_SALES_ORDERS': { - 'name': 'Exclude Inactive Sales Orders', + 'name': _('Exclude Inactive Sales Orders'), 'description': _('Exclude inactive sales orders from search preview window'), 'validator': bool, 'default': True, @@ -1492,13 +1506,6 @@ class InvenTreeUserSetting(BaseInvenTreeSetting): 'validator': [int, MinValueValidator(1)] }, - 'SEARCH_HIDE_INACTIVE_PARTS': { - 'name': _("Hide Inactive Parts"), - 'description': _('Hide inactive parts in search preview window'), - 'default': False, - 'validator': bool, - }, - 'PART_SHOW_QUANTITY_IN_FORMS': { 'name': _('Show Quantity in Forms'), 'description': _('Display available part quantity in some forms'), diff --git a/InvenTree/templates/InvenTree/settings/user_search.html b/InvenTree/templates/InvenTree/settings/user_search.html index f54c5fd2ef..f18fb5816c 100644 --- a/InvenTree/templates/InvenTree/settings/user_search.html +++ b/InvenTree/templates/InvenTree/settings/user_search.html @@ -18,6 +18,7 @@ {% include "InvenTree/settings/setting.html" with key="SEARCH_HIDE_INACTIVE_PARTS" user_setting=True icon='fa-eye-slash' %} {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_SHOW_CATEGORIES" user_setting=True icon='fa-sitemap' %} {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_SHOW_STOCK" user_setting=True icon='fa-boxes' %} + {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_HIDE_UNAVAILABLE_STOCK" user_setting=True icon='fa-eye-slash' %} {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_SHOW_LOCATIONS" user_setting=True icon='fa-sitemap' %} {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_SHOW_COMPANIES" user_setting=True icon='fa-building' %} {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_SHOW_PURCHASE_ORDERS" user_setting=True icon='fa-shopping-cart' %} diff --git a/InvenTree/templates/js/translated/search.js b/InvenTree/templates/js/translated/search.js index 5900a9b28d..9758ee2ff9 100644 --- a/InvenTree/templates/js/translated/search.js +++ b/InvenTree/templates/js/translated/search.js @@ -122,14 +122,22 @@ function updateSearch() { if (user_settings.SEARCH_PREVIEW_SHOW_STOCK) { // Search for matching stock items + + var filters = { + part_detail: true, + location_detail: true, + }; + + if (user_settings.SEARCH_PREVIEW_HIDE_UNAVAILABLE_STOCK) { + // Only show 'in stock' items in the preview windoww + filters.in_stock = true; + } + addSearchQuery( 'stock', '{% trans "Stock Items" %}', '{% url "api-stock-list" %}', - { - part_detail: true, - location_detail: true, - }, + filters, renderStockItem, { url: '/stock/item', From 33bab19abbbd47783ad72fc84c3d8f65ee407380 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 20 May 2022 17:29:18 +1000 Subject: [PATCH 4/5] Better reporting of settings errors --- InvenTree/common/tests.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/InvenTree/common/tests.py b/InvenTree/common/tests.py index 7f6f6dbe40..f46f1007a5 100644 --- a/InvenTree/common/tests.py +++ b/InvenTree/common/tests.py @@ -163,10 +163,19 @@ class SettingsTest(TestCase): """ for key, setting in InvenTreeSetting.SETTINGS.items(): - self.run_settings_check(key, setting) + + try: + self.run_settings_check(key, setting) + except Exception as exc: + print(f"run_settings_check failed for global setting '{key}'") + raise exc for key, setting in InvenTreeUserSetting.SETTINGS.items(): - self.run_settings_check(key, setting) + try: + self.run_settings_check(key, setting) + except Exception as exc: + print(f"run_settings_check failed for user setting '{key}'") + raise exc def test_defaults(self): """ From cc59ef65fcb2a4f57cc50e204ae85b8021820a82 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 20 May 2022 17:31:08 +1000 Subject: [PATCH 5/5] PEP fixes --- InvenTree/common/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py index 2beeb26f1d..9095d4af07 100644 --- a/InvenTree/common/models.py +++ b/InvenTree/common/models.py @@ -1428,7 +1428,7 @@ class InvenTreeUserSetting(BaseInvenTreeSetting): 'default': True, 'validator': bool, }, - + 'SEARCH_HIDE_INACTIVE_PARTS': { 'name': _("Hide Inactive Parts"), 'description': _('Excluded inactive parts from search preview window'),