inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-07-03 04:00:57 +00:00
Code Activity

Merge remote-tracking branch 'inventree/master' into partial-shipment

Browse Source
This commit is contained in:
Oliver
2021-11-15 10:55:17 +11:00
parent d5cf2b08ac 56ebe1596c
commit dad097a3ba
14 changed files with 11254 additions and 2033 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/templates/js/dynamic/settings.js
View File

@ -13,7 +13,7 @@ const user_settings = {
{% endfor %}
};
{% global_settings as GLOBAL_SETTINGS %}
{% visible_global_settings as GLOBAL_SETTINGS %}
const global_settings = {
{% for key, value in GLOBAL_SETTINGS.items %}
{{ key }}: {% primitive_to_javascript value %},