inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-18 13:05:42 +00:00
Code Activity

Merge remote-tracking branch 'inventree/master' into drf-api-forms

Browse Source 
# Conflicts:
#	InvenTree/company/forms.py
This commit is contained in:
Oliver
2021-07-02 11:26:09 +10:00
parent 00e921f505 d243356324
commit 51ebe30754
20 changed files with 240 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
InvenTree/templates/InvenTree/settings/currencies.html
View File

@ -12,6 +12,13 @@
{% block settings %}
<table class='table table-striped table-condensed'>
{% include "InvenTree/settings/header.html" %}
<tbody>
{% include "InvenTree/settings/setting.html" with key="INVENTREE_DEFAULT_CURRENCY" icon="fa-globe" %}
</tbody>
</table>
<table class='table table-striped table-condensed'>
<tbody>
<tr>