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

# Conflicts:
#	InvenTree/company/forms.py
This commit is contained in:
Oliver committed 2021-07-02 11:26:09 +10:00
commit 51ebe30754
20 files changed
+240 -53

No files matched your search

@@ -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>