From bf4de526acb0613dee28762002268a604cfa3860 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 5 Nov 2021 10:20:47 +1100 Subject: [PATCH 1/4] Typo fix --- InvenTree/part/templates/part/category.html | 2 +- InvenTree/part/templates/part/part_base.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html index 48677ee71d..b8e3dbe1f6 100644 --- a/InvenTree/part/templates/part/category.html +++ b/InvenTree/part/templates/part/category.html @@ -29,7 +29,7 @@ {% else %} - {% endif %} diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html index bb7aea3abb..4ca7c80d65 100644 --- a/InvenTree/part/templates/part/part_base.html +++ b/InvenTree/part/templates/part/part_base.html @@ -24,7 +24,7 @@ {% endif %} {% if starred_directly %} - {% elif starred %} @@ -32,7 +32,7 @@ {% else %} - {% endif %} From 1f1cf9f9e4d2868652b3977ff6140e42b6663569 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 5 Nov 2021 10:39:03 +1100 Subject: [PATCH 2/4] Allow escape key on barcode modal --- InvenTree/templates/js/translated/barcode.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/templates/js/translated/barcode.js b/InvenTree/templates/js/translated/barcode.js index 2778983341..6be56d14f1 100644 --- a/InvenTree/templates/js/translated/barcode.js +++ b/InvenTree/templates/js/translated/barcode.js @@ -257,7 +257,7 @@ function barcodeDialog(title, options={}) { $(modal).modal({ backdrop: 'static', - keyboard: false, + keyboard: user_settings.FORMS_CLOSE_USING_ESCAPE, }); if (options.preShow) { From 1743111613f1f1bf14ef03470c34f4771eff3753 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 5 Nov 2021 11:03:38 +1100 Subject: [PATCH 3/4] Check if customer exists when rendering sales order template Fixes https://github.com/inventree/InvenTree/issues/1742 --- InvenTree/order/templates/order/sales_order_base.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/InvenTree/order/templates/order/sales_order_base.html b/InvenTree/order/templates/order/sales_order_base.html index 952319da10..0f705212db 100644 --- a/InvenTree/order/templates/order/sales_order_base.html +++ b/InvenTree/order/templates/order/sales_order_base.html @@ -16,7 +16,7 @@ {% block thumbnail %} + {% if order.customer %} {% trans "Customer" %} {{ order.customer.name }}{% include "clip.html"%} + {% endif %} {% if order.customer_reference %} From 42155b2e056411343d268ffae47dd539d7e64b84 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 5 Nov 2021 13:51:26 +1100 Subject: [PATCH 4/4] Adds a fancy shadow --- InvenTree/InvenTree/static/css/inventree.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css index b2e3b36354..632ec2e0e5 100644 --- a/InvenTree/InvenTree/static/css/inventree.css +++ b/InvenTree/InvenTree/static/css/inventree.css @@ -134,6 +134,7 @@ .navbar { border-bottom: 1px solid #ccc; background-color: var(--secondary-color); + box-shadow: 0px 5px 5px rgb(0 0 0 / 5%); } .navbar-brand { @@ -829,6 +830,7 @@ input[type="submit"] { color: var(--bs-body-color); background-color: var(--secondary-color); border-bottom: 1px solid var(--border-color); + box-shadow: 0px 5px 5px rgb(0 0 0 / 5%); } .panel {