From bf4de526acb0613dee28762002268a604cfa3860 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 5 Nov 2021 10:20:47 +1100 Subject: [PATCH 01/49] 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 02/49] 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 03/49] 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 04/49] 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 { From 5550c89b9aed725efe05f95d7f523828fe984bfe Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 6 Nov 2021 14:44:31 +0000 Subject: [PATCH 05/49] make padding uniform --- InvenTree/InvenTree/static/css/inventree.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css index 632ec2e0e5..f3e1a558e2 100644 --- a/InvenTree/InvenTree/static/css/inventree.css +++ b/InvenTree/InvenTree/static/css/inventree.css @@ -545,6 +545,7 @@ .inventree-body { width: 100%; padding: 5px; + padding-right: 0; } .inventree-pre-content { @@ -835,7 +836,7 @@ input[type="submit"] { .panel { box-shadow: 2px 2px #DDD; - margin-bottom: 20px; + margin-bottom: .75rem; background-color: #fff; border: 1px solid #ccc; } From d604b2afff2b668bc8ca3a25bffafb4c4af7d667 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 6 Nov 2021 14:44:46 +0000 Subject: [PATCH 06/49] make padding uniform --- InvenTree/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html index 856deac4be..6378b6b2ee 100644 --- a/InvenTree/templates/base.html +++ b/InvenTree/templates/base.html @@ -83,7 +83,7 @@ -
+
{% block alerts %}
From 19a3568511ad75869c5917dfee2f6982baf52047 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 6 Nov 2021 15:02:40 +0000 Subject: [PATCH 07/49] fix nav arranging on mobile --- InvenTree/templates/navbar.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/InvenTree/templates/navbar.html b/InvenTree/templates/navbar.html index 58c7b8ecb2..56cc4ed488 100644 --- a/InvenTree/templates/navbar.html +++ b/InvenTree/templates/navbar.html @@ -62,9 +62,9 @@
{% include "search_form.html" %} -
    +
      {% if barcodes %} -
    - From bbd723a17673feac250a6fe93b93752cd4b291c6 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 6 Nov 2021 15:11:31 +0000 Subject: [PATCH 09/49] fix QR code alingment --- InvenTree/InvenTree/static/css/inventree.css | 6 ------ InvenTree/templates/qr_code.html | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css index f3e1a558e2..00041f0fae 100644 --- a/InvenTree/InvenTree/static/css/inventree.css +++ b/InvenTree/InvenTree/static/css/inventree.css @@ -125,12 +125,6 @@ align-content: center; } -.qr-container { - width: 100%; - align-content: center; - object-fit: fill; -} - .navbar { border-bottom: 1px solid #ccc; background-color: var(--secondary-color); diff --git a/InvenTree/templates/qr_code.html b/InvenTree/templates/qr_code.html index 8964ef02be..a39847629d 100644 --- a/InvenTree/templates/qr_code.html +++ b/InvenTree/templates/qr_code.html @@ -3,7 +3,7 @@
    {% if qr_data %} -
    +
    {% else %} From 857cdd5aeac4004a269e4d82256a5eca2f799baa Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 6 Nov 2021 17:41:11 +0000 Subject: [PATCH 10/49] Enlsigh is the base - always translated! Fixes #2257 --- InvenTree/templates/InvenTree/settings/user.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html index d1baf1ba6e..867c8ef733 100644 --- a/InvenTree/templates/InvenTree/settings/user.html +++ b/InvenTree/templates/InvenTree/settings/user.html @@ -224,7 +224,7 @@ {% if lang_translated %} {% blocktrans %}{{ lang_translated }}% translated{% endblocktrans %} {% else %} - {% trans 'No translations available' %} + {% if lang_code == 'en' %}-{% else %}{% trans 'No translations available' %}{% endif %} {% endif %} {% endfor %} From cea466973a4886721a790610a2d4d88929f0675b Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 6 Nov 2021 19:55:02 +0000 Subject: [PATCH 11/49] Check if language has enough translations Fixes #2257 --- InvenTree/templates/InvenTree/settings/user.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html index 867c8ef733..2692d11c02 100644 --- a/InvenTree/templates/InvenTree/settings/user.html +++ b/InvenTree/templates/InvenTree/settings/user.html @@ -216,9 +216,12 @@ {% get_current_language as LANGUAGE_CODE %} {% get_available_languages as LANGUAGES %} {% get_language_info_list for LANGUAGES as languages %} + {% define 'alllang' in request.GET as ALL_LANG %} {% for language in languages %} {% define language.code as lang_code %} {% define locale_stats|keyvalue:lang_code as lang_translated %} + {% define lang_translated > 10 or lang_code == 'en' as use_lang %} + {% if ALL_LANG or use_lang %} + {% endif %} {% endfor %}
    +

    {% trans "Some languages are have a low translation percentage." %} + {% if ALL_LANG %} + {% trans "Show only sufficent" %} + {% else %} + {% trans "Show them too" %} + {% endif %} +

    From dccc832779e9741f711880c945fbdfb30c2c5a15 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 6 Nov 2021 20:41:29 +0000 Subject: [PATCH 12/49] fix logic --- InvenTree/templates/InvenTree/settings/user.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html index 2692d11c02..81c9af885e 100644 --- a/InvenTree/templates/InvenTree/settings/user.html +++ b/InvenTree/templates/InvenTree/settings/user.html @@ -216,7 +216,7 @@ {% get_current_language as LANGUAGE_CODE %} {% get_available_languages as LANGUAGES %} {% get_language_info_list for LANGUAGES as languages %} - {% define 'alllang' in request.GET as ALL_LANG %} + {% if 'alllang' in request.GET %}{% define True as ALL_LANG %}{% endif %} {% for language in languages %} {% define language.code as lang_code %} {% define locale_stats|keyvalue:lang_code as lang_translated %} From 45b7bc0c5128a2dee7a5e8476ce8e1b261909983 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 6 Nov 2021 20:41:52 +0000 Subject: [PATCH 13/49] always show the current language --- InvenTree/templates/InvenTree/settings/user.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html index 81c9af885e..4e882b5e19 100644 --- a/InvenTree/templates/InvenTree/settings/user.html +++ b/InvenTree/templates/InvenTree/settings/user.html @@ -220,7 +220,7 @@ {% for language in languages %} {% define language.code as lang_code %} {% define locale_stats|keyvalue:lang_code as lang_translated %} - {% define lang_translated > 10 or lang_code == 'en' as use_lang %} + {% if lang_translated > 10 or lang_code == 'en' or lang_code == LANGUAGE_CODE %}{% define True as use_lang %}{% else %}{% define False as use_lang %}{% endif %} {% if ALL_LANG or use_lang %}