2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-11 01:25:40 +00:00
Commit Graph

8290 Commits

Author SHA1 Message Date
747b0554e1 Ready for review 2021-05-20 13:45:26 -04:00
bed6a7e49c Added exchange rates form 2021-05-20 09:49:56 -04:00
6d5b2d3227 Added 'Currencies' settings view in global settings 2021-05-19 17:06:41 -04:00
34ded08ee7 Added InvenTreeFixerExchangeBackend class 2021-05-19 16:17:03 -04:00
7a175f13a1 Merge branch 'master' of github.com:inventree/InvenTree into bom_items_purchase_price 2021-05-19 13:25:13 -04:00
9ac1c8be12 Trans merge fix ()
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin
2021-05-20 00:07:16 +10:00
92db7ec27e updated translation base 2021-05-18 13:00:35 +00:00
6c91d067d7 Merge pull request from SchrodingersGat/fixer-currency-integration
Fixer currency integration
2021-05-18 22:59:14 +10:00
4101e25680 Style fixes 2021-05-18 22:41:57 +10:00
663f5562e8 Schedule a daily task to update currency information 2021-05-18 22:41:26 +10:00
01d444279c Add setting for fixer.io API key 2021-05-18 22:11:24 +10:00
900f707ff9 permission added 2021-05-18 11:51:08 +02:00
167eae4322 updated translation base 2021-05-18 09:35:28 +00:00
efe888056f Merge pull request from SchrodingersGat/banner-reworks
Banner reworks
2021-05-18 19:34:18 +10:00
20f06ab209 updated translation base 2021-05-18 09:21:48 +00:00
9a42421852 restructure overrides 2021-05-18 11:20:25 +02:00
013d42de7a L10 merge ()
* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* Adds a commit message

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* updated translation base

* New Crowdin updates ()

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* New Crowdin updates ()

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* New Crowdin updates ()

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* New Crowdin updates ()

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2021-05-18 19:20:24 +10:00
7cd345aeb5 Change location of 'banner' messages
- Place them inside the main panel
- Generally underneath the thumbnail
2021-05-18 19:19:43 +10:00
dd56bc1fa5 setup not realy needed 2021-05-18 11:18:13 +02:00
a1c4662e91 Move status messages for stock item 2021-05-18 19:11:37 +10:00
616dd76f8a refactor and doc 2021-05-18 11:10:01 +02:00
5204567628 Bug fix for stock item tracking API 2021-05-18 19:06:41 +10:00
e49256a218 fixed bug pointed out by @eeintech 2021-05-18 10:52:27 +02:00
79c6e5cbf2 Merge remote-tracking branch 'inventree/l10_crowdin' into l10
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po
2021-05-18 18:50:51 +10:00
db9fd28276 preparing stuff for gen get_field_selection() 2021-05-18 10:48:29 +02:00
64f8846e99 generalising for done() 2021-05-18 10:47:56 +02:00
ad4902ea44 restucture 2021-05-18 10:19:35 +02:00
cb0ef30eff form overrides 2021-05-18 10:17:19 +02:00
92f8bd36f1 inherited setup method 2021-05-18 01:55:47 +02:00
eafaf92ae2 unified naming schema 2021-05-18 01:02:31 +02:00
46723f42ca Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-05-18 00:57:10 +02:00
c31380ec6b Fix: New translations django.po from Crowdin 2021-05-18 00:58:49 +10:00
69b935d97c Fix: New translations django.po from Crowdin 2021-05-17 20:47:43 +10:00
2568299192 Fix: New translations django.po from Crowdin 2021-05-17 20:47:42 +10:00
b7a8c2c5bd Fix: New translations django.po from Crowdin 2021-05-17 20:47:40 +10:00
b2f568368d Fix: New translations django.po from Crowdin 2021-05-17 20:47:39 +10:00
80cfa13377 Fix: New translations django.po from Crowdin 2021-05-17 20:47:37 +10:00
25f8e3a2d3 Fix: New translations django.po from Crowdin 2021-05-17 20:47:36 +10:00
e176bb1c80 Fix: New translations django.po from Crowdin 2021-05-17 20:47:34 +10:00
8025e12b0d Fix: New translations django.po from Crowdin 2021-05-17 20:47:33 +10:00
c2ea6a7cbc Fix: New translations django.po from Crowdin 2021-05-17 20:47:31 +10:00
87f4ce8c47 updated translation base 2021-05-17 10:46:13 +00:00
56fd8132c7 Merge pull request from SchrodingersGat/hide-purchase-price
Disable "purchase price" field for non-purchaseable parts
2021-05-17 20:45:06 +10:00
64c1503fe4 Disable "purchase price" field for non-purchaseable parts 2021-05-17 20:15:53 +10:00
cf9bc5136d Fix: New translations django.po from Crowdin 2021-05-17 08:55:05 +10:00
ae6c458e09 Fix: New translations django.po from Crowdin 2021-05-17 08:55:03 +10:00
cdf2c1c4b2 Fix: New translations django.po from Crowdin 2021-05-17 08:55:02 +10:00
6b9163fe4c Fix: New translations django.po from Crowdin 2021-05-17 08:55:00 +10:00
8756a2ecef Fix: New translations django.po from Crowdin 2021-05-17 08:54:59 +10:00
6aee171405 Fix: New translations django.po from Crowdin 2021-05-17 08:54:57 +10:00