Commit Graph

4949 Commits

Author SHA1 Message Date
Matthias
dac112d908 added footer total for price 2021-06-17 00:22:32 +02:00
Matthias
2fc185bd71 show footer 2021-06-16 23:57:33 +02:00
Matthias
70e0933336 total price column as per #1660 2021-06-16 23:52:00 +02:00
Oliver
9386332de1
Update version.py 2021-06-16 23:54:42 +10:00
Oliver
731ea0238e
Update version.py
Bump version number
2021-06-16 23:53:58 +10:00
Oliver Walters
513449e13c Whoops, missed one 2021-06-16 23:03:38 +10:00
Oliver Walters
725d26d76f Fix default paths in InvenTree settings 2021-06-16 23:03:09 +10:00
Oliver Walters
acd7322ff0 Files under /media require session to be authenticated
References:

- https://docs.djangoproject.com/en/3.2/howto/deployment/wsgi/apache-auth/
- https://stackoverflow.com/questions/46421589/nginx-location-and-django-auth
- https://docs.nginx.com/nginx/admin-guide/security-controls/configuring-subrequest-authentication/
- https://pawamoy.github.io/posts/django-auth-server-for-shiny/
2021-06-16 21:30:25 +10:00
Oliver Walters
0821ead024 Only provide static redirects if in DEBUG mode 2021-06-15 23:51:37 +10:00
eeintech
08fbdf660b Fix for #1661 2021-06-14 14:19:10 -04:00
Matthias
447a7dd4e4 style fix 2021-06-13 15:04:57 +02:00
Matthias
3f04a57452 added test for internal prices 2021-06-13 15:01:03 +02:00
Matthias
3fb95bea7e added test for sell price breaks 2021-06-13 13:31:31 +02:00
Matthias
c0e50128dd display latest serial on all part-views #1648 2021-06-11 23:43:23 +02:00
Nigel
f8e4a5ac2e
test: improve coverage of new get_destination 2021-06-09 11:04:42 -06:00
Nigel
cd07ea835d
feat(purchase orders): show the preferred location for each PO Line
Adds the ability for the Purchaser to specify where the item is
intentended to go when received.  If the Purchaser does not set a
preferred location, then the default location for the part is displayed.
If the item is received them where it was actually placed is shown.

NOTE: if an item is split when received only one of the resulting
StockItem location is used.

Fixes #1467
Addresses some of the requests in #551
2021-06-09 09:06:03 -06:00
Oliver
0c14457598 Fix typo in getStockItemThumbnail 2021-06-09 11:16:37 +10:00
Oliver
9fd212d1b2 BuildItemSerializer: Handle errors when thumbnail is not found 2021-06-09 09:41:27 +10:00
Oliver
3aadf94a9c Stock Test: Fix display of stock test table
- Incorrect parent node was set
2021-06-08 16:15:40 +10:00
Matthias
74c4c559e4 clearer wording for internal price settings 2021-06-07 05:33:20 +02:00
Matthias
4f3bfe569a added in internal prices in price calculations 2021-06-07 05:25:13 +02:00
Matthias
0e8a97acb0 added permissions 2021-06-07 05:23:13 +02:00
Matthias
37c0025399 settings for internal prices added 2021-06-07 04:58:37 +02:00
Matthias
62638f76ed fixing wrong page title 2021-06-07 04:00:12 +02:00
Matthias
6ae9fa716c added internal price to part_pricing 2021-06-07 00:19:37 +02:00
Matthias
27282c8049 Merge branch 'master' of https://github.com/inventree/InvenTree into internal-price 2021-06-06 18:15:41 +02:00
Matthias
413fa2e842 merging in sidebar icon changes fr upstream 2021-06-06 17:50:13 +02:00
Matthias
5a869d247f Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-06 17:46:33 +02:00
Matthias
d70b4bcabb refactor 2021-06-06 17:44:02 +02:00
Matthias
4f7edac213 back button 2021-06-06 17:43:16 +02:00
Matthias
a535f8df42 hide scrollbar if not needed 2021-06-06 16:40:51 +02:00
Matthias
a2a2c61e31 refactor and fix rendering on error 2021-06-06 16:36:01 +02:00
Matthias
7439f72ab1 hide error messagre on error 2021-06-06 16:33:19 +02:00
Matthias
5e6919f14e hide error message 2021-06-06 16:32:46 +02:00
Matthias
ded68bb4f6 change titel with modal submit 2021-06-06 16:09:51 +02:00
Matthias
35451248c2 reseting modal on open 2021-06-06 15:25:56 +02:00
Matthias
fcf360f2a3 clearer information text? as in #1577 2021-06-06 14:33:26 +02:00
Oliver
5377d860f4 Merge remote-tracking branch 'inventree/master' into l10-merge
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/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-06-06 22:27:27 +10:00
Matthias
36ff21f11e hide supply part price on start 2021-06-06 14:21:08 +02:00
Matthias
ced7768030 calculate button added 2021-06-06 14:20:30 +02:00
Oliver
573f601752
Merge pull request #1632 from matmair/nav-style
same nav sidebar distance for everything
2021-06-06 22:14:20 +10:00
Matthias
06d3489ede fix: added ruleset 2021-06-05 18:06:26 +02:00
Matthias
81f00753c6 style 2021-06-05 17:24:04 +02:00
Matthias
0bac7ebf3e styling 2021-06-05 17:18:46 +02:00
Matthias
768080f9a0 Adding internal functions to use internal prices 2021-06-05 17:06:58 +02:00
Matthias
0d93c96f2a adding internal price breaks as in #1606 2021-06-05 17:01:49 +02:00
Matthias
05d79a4c19 same nav sidebar distance for everything 2021-06-05 15:18:08 +02:00
Matthias
44717b646f using new tag for currency 2021-06-05 15:07:42 +02:00
Matthias
0eff7d000a added tag to replace dynamic setting 2021-06-05 15:05:05 +02:00
Matthias
691142ea4c fixing currency display 2021-06-05 13:27:39 +02:00
Matthias
d87592aedb use the default currency in forms 2021-06-05 13:22:11 +02:00
Matthias
daf3d06cf0 added in optional matches 2021-06-05 01:19:12 +02:00
eeintech
74bd975a0b Revert back to form_list
Moved OrderMatchItemForm to forms.py
2021-06-04 13:41:07 -04:00
Oliver
3e9adec4ff Fix: New translations django.po from Crowdin 2021-06-04 03:03:42 +10:00
Oliver
6f3593220a Fix: New translations django.po from Crowdin 2021-06-04 02:08:23 +10:00
Oliver
f0a1cca914 Fix: New translations django.po from Crowdin 2021-06-03 14:40:53 +10:00
Oliver
4af74a5ba5 Fix: New translations django.po from Crowdin 2021-06-03 09:52:21 +10:00
Matthias
625d868a3f fix for form_list 2021-06-03 00:29:24 +02:00
Matthias
fc9e1e6770 suggested changes @eeintech 2021-06-03 00:17:29 +02:00
Oliver
2948cf5671 Fix: New translations django.po from Crowdin 2021-06-03 05:11:59 +10:00
Oliver
3b6aba7153 Fix: New translations django.po from Crowdin 2021-06-03 04:12:58 +10:00
Oliver
69ed180034 Fix: New translations django.po from Crowdin 2021-06-03 03:15:00 +10:00
Oliver
7b1bd87d84 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-06-02 22:58:34 +10:00
Oliver
7df72f09f4 Fix: New translations django.po from Crowdin 2021-06-02 09:57:53 +10:00
Oliver
56afcfa91f Fix: New translations django.po from Crowdin 2021-06-02 08:50:33 +10:00
Matthias
75cdec81ae style fix 2021-06-02 00:39:38 +02:00
Matthias
495babe712 Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-02 00:36:15 +02:00
Matthias
3c384947b2 spaces cleanup 2021-06-02 00:26:30 +02:00
Matthias
ee582a5490 fixes the problem reported by @eeintech ? 2021-06-02 00:21:01 +02:00
eeintech
ffaa6ee3a9 Fixed price break row actions after sorting 2021-06-01 14:22:00 -04:00
Oliver
61af4ca1b3 Fix: New translations django.po from Crowdin 2021-06-01 20:22:45 +10:00
Oliver
ddf1f5c5ba Fix: New translations django.po from Crowdin 2021-06-01 20:22:43 +10:00
Oliver
1a3943fd7c Fix: New translations django.po from Crowdin 2021-06-01 20:22:42 +10:00
Oliver
3df5ef5676 Fix: New translations django.po from Crowdin 2021-06-01 20:22:40 +10:00
Oliver
235b2632ed Fix: New translations django.po from Crowdin 2021-06-01 20:22:39 +10:00
Oliver
a4d63ad9b0 Fix: New translations django.po from Crowdin 2021-06-01 20:22:37 +10:00
Oliver
85a0cd84d4 Fix: New translations django.po from Crowdin 2021-06-01 20:22:36 +10:00
Oliver
feb1b47f93 Fix: New translations django.po from Crowdin 2021-06-01 20:22:34 +10:00
Oliver
f9b5f78716 Fix: New translations django.po from Crowdin 2021-06-01 20:22:33 +10:00
github-actions[bot]
60752d2619 updated translation base 2021-06-01 10:08:09 +00:00
Oliver Walters
b31796cbeb Simplified "installed_in" table 2021-06-01 16:40:02 +10:00
Oliver Walters
ee9df039cb allocatedItems function now takes variants into account 2021-06-01 16:19:24 +10:00
Oliver Walters
9baf856d75 Fixes for build item allocation rendering 2021-06-01 16:14:26 +10:00
Oliver Walters
ab16e1efc3 Custom migration to find BomItem / BuildItem links where they exist 2021-06-01 15:39:21 +10:00
Oliver Walters
7578cab9a8 Add 'bom_item' field to BuildItem model
- Required to link the build to the output in case of variant stock
2021-06-01 15:25:39 +10:00
Oliver Walters
9f407df15a Update BOM table display 2021-06-01 14:17:31 +10:00
Oliver Walters
0bd0e57f16 BomList can be filtered by "allow_variants" flag 2021-06-01 14:03:21 +10:00
Oliver Walters
5c71f04360 Add "allow_variants" field to BomItem 2021-06-01 13:59:01 +10:00
Oliver
bd83888717 Fix: New translations django.po from Crowdin 2021-06-01 10:20:41 +10:00
Oliver
beae6c55e8 Fix: New translations django.po from Crowdin 2021-06-01 09:15:10 +10:00
Oliver
f0354a90fe Fix: New translations django.po from Crowdin 2021-06-01 09:15:09 +10:00
Oliver
cc2192aed5 Fix: New translations django.po from Crowdin 2021-06-01 09:15:08 +10:00
Oliver
96f6152f91 Fix: New translations django.po from Crowdin 2021-06-01 09:15:06 +10:00
Oliver
9ceb6353c8 Fix: New translations django.po from Crowdin 2021-06-01 09:15:05 +10:00
Oliver
49abacdc86 Fix: New translations django.po from Crowdin 2021-06-01 09:15:04 +10:00
Oliver
9dceba77bc Fix: New translations django.po from Crowdin 2021-06-01 09:15:03 +10:00
Oliver
416e69bdc5 Fix: New translations django.po from Crowdin 2021-06-01 09:15:02 +10:00
Oliver
c2fb582a4e Fix: New translations django.po from Crowdin 2021-06-01 09:15:00 +10:00
github-actions[bot]
19e48708d0 updated translation base 2021-05-31 22:53:08 +00:00
Oliver Walters
0375d5b940 Specify a unique parent node that cannot shadow an existing pk 2021-06-01 08:30:50 +10:00
Oliver
ba1d283e64 Fix: New translations django.po from Crowdin 2021-06-01 08:16:19 +10:00
Oliver
76059a4694 Fix: New translations django.po from Crowdin 2021-05-31 17:32:26 +10:00
Oliver
4e4bcd5b65 Fix: New translations django.po from Crowdin 2021-05-31 17:32:25 +10:00
Oliver
a97a6ba386 Fix: New translations django.po from Crowdin 2021-05-31 17:32:24 +10:00
Oliver
65321cf9d1 Fix: New translations django.po from Crowdin 2021-05-31 17:32:22 +10:00
Oliver
049f546987 Fix: New translations django.po from Crowdin 2021-05-31 17:32:21 +10:00
Oliver
195f703e69 Fix: New translations django.po from Crowdin 2021-05-31 17:32:20 +10:00
Oliver
5e2f9eebba Fix: New translations django.po from Crowdin 2021-05-31 17:32:19 +10:00
Oliver
ca301ea4c0 Fix: New translations django.po from Crowdin 2021-05-31 17:32:17 +10:00
Oliver
aa13376a71 Fix: New translations django.po from Crowdin 2021-05-31 17:32:16 +10:00
github-actions[bot]
4c660b12aa updated translation base 2021-05-31 07:25:26 +00:00
Oliver Walters
3ba7b2d136 Visual hack for custom part card view 2021-05-31 17:05:12 +10:00
Oliver Walters
f0cf83a0b8 Use tree-grid instead of group-by for showing test results
- Much more predictable display
2021-05-31 16:55:21 +10:00
Oliver Walters
b10410ca1f Update bootstrap-table library
Updated javascript / css to latest version
2021-05-31 12:47:07 +10:00
Oliver
5f11f371dc Fix: New translations django.po from Crowdin 2021-05-31 03:23:34 +10:00
Oliver
0dc77ddfca Fix: New translations django.po from Crowdin 2021-05-31 02:18:49 +10:00
Oliver
bd28face28 Fix: New translations django.po from Crowdin 2021-05-30 23:19:27 +10:00
Oliver
f0e913d200 Fix: New translations django.po from Crowdin 2021-05-30 22:14:06 +10:00
Oliver
0d9d8cf773 Fix: New translations django.po from Crowdin 2021-05-30 07:53:06 +10:00
Oliver
a7e8580a36 Fix: New translations django.po from Crowdin 2021-05-30 07:53:04 +10:00
Oliver
51aea69c25 Fix: New translations django.po from Crowdin 2021-05-30 07:53:03 +10:00
Oliver
2620613702 Fix: New translations django.po from Crowdin 2021-05-30 07:53:02 +10:00
Oliver
29edd11323 Fix: New translations django.po from Crowdin 2021-05-30 07:53:00 +10:00
Oliver
4b04502f59 Fix: New translations django.po from Crowdin 2021-05-30 07:52:59 +10:00
Oliver
a9ece5f6f2 Fix: New translations django.po from Crowdin 2021-05-30 07:52:58 +10:00
Oliver
0362ce76b4 Fix: New translations django.po from Crowdin 2021-05-30 07:52:57 +10:00
Oliver
4bffd36da1 Fix: New translations django.po from Crowdin 2021-05-30 07:52:54 +10:00
github-actions[bot]
4f30d5a71a updated translation base 2021-05-29 21:51:49 +00:00
Oliver Walters
f1ca17286f Save grid / list selection to local storage settings 2021-05-30 00:38:59 +10:00
Oliver Walters
e846c744f4 Buttons to toggle between list and grid views 2021-05-30 00:23:05 +10:00
Oliver Walters
ee95cf5c21 Clicking on thumbnail shows modal image 2021-05-30 00:10:46 +10:00
Oliver Walters
887adf35f4 Add simple tile grid view for part list 2021-05-29 23:59:27 +10:00
Oliver Walters
8450029c68 Add custom-view plugin for bootstrap-table 2021-05-29 23:59:07 +10:00
Oliver
1da283d8cc Fix: New translations django.po from Crowdin 2021-05-29 19:33:55 +10:00
Oliver
5b5b4e4bf5 Fix: New translations django.po from Crowdin 2021-05-29 19:33:53 +10:00
Oliver
a7070713bc Fix: New translations django.po from Crowdin 2021-05-29 19:33:52 +10:00
Oliver
eb96bbb7fd Fix: New translations django.po from Crowdin 2021-05-29 19:33:51 +10:00
Oliver
f180c99a96 Fix: New translations django.po from Crowdin 2021-05-29 19:33:50 +10:00
Oliver
9b1100918c Fix: New translations django.po from Crowdin 2021-05-29 19:33:48 +10:00
Oliver
68bbdd8193 Fix: New translations django.po from Crowdin 2021-05-29 19:33:47 +10:00
Oliver
6a84ff55da Fix: New translations django.po from Crowdin 2021-05-29 19:33:46 +10:00
Oliver
c967f9c03f Fix: New translations django.po from Crowdin 2021-05-29 19:33:45 +10:00
github-actions[bot]
8559802ae7 updated translation base 2021-05-29 09:06:53 +00:00
Oliver
dff367b0b0
Update version.py 2021-05-29 19:05:41 +10:00
Oliver Walters
f08c83d6e5 Fix part page heading 2021-05-29 18:48:18 +10:00
github-actions[bot]
60dc7c3260 updated translation base 2021-05-29 08:29:32 +00:00
github-actions[bot]
dee5b4c90a updated translation base 2021-05-29 08:26:33 +00:00
github-actions[bot]
27cc21cd51 updated translation base 2021-05-29 07:36:31 +00:00
Oliver
878e9c1e8a
Update version.py
Bump to v2.2
2021-05-29 17:35:05 +10:00
github-actions[bot]
e255f7b2d3 updated translation base 2021-05-29 07:34:41 +00:00
Oliver
50189afc2e
New Crowdin updates (#1618)
* 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-29 17:33:52 +10:00
Oliver
0995ccee67
L10 merge master (#1617)
* 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 (#1551)

* 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 (#1552)

* 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 (#1568)

* 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 (#1570)

* 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

* updated translation base

* updated translation base

* updated translation base

* Trans merge fix (#1599)

* 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

* New Crowdin updates (#1597)

* 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

* 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

* updated translation base

* updated translation base

* Update github actions

* L10 merge fix (#1614)

* 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

* 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

* 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

* 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

* Update github actions

(cherry picked from commit d9bbebddb0)

* New Crowdin updates (#1603)

* 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

* 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

* 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

* 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

* Update github actions

(cherry picked from commit d9bbebddb0)

* updated translation base

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2021-05-29 17:33:07 +10:00
github-actions[bot]
00a15551eb updated translation base 2021-05-29 07:29:05 +00:00
Matthias Mair
9cc81df276 Merge branch 'inventree:master' into price-history 2021-05-28 12:14:03 +02:00
Oliver
d4e8a06259
L10 merge fix (#1614)
* 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

* 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

* 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

* 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

* Update github actions

(cherry picked from commit d9bbebddb0)
2021-05-28 17:25:05 +10:00
github-actions[bot]
8319e57532 updated translation base 2021-05-28 04:35:51 +00:00
github-actions[bot]
c1bbaf98b5 updated translation base 2021-05-28 03:27:38 +00:00
Oliver
4c78f88aa3
Merge pull request #1612 from SchrodingersGat/exchange-fixes
Remove debug message
2021-05-28 13:26:14 +10:00
Oliver Walters
be6e2aa276 Better exception handling 2021-05-28 13:02:34 +10:00
Oliver Walters
7832ccccc2 Check if database tables are ready 2021-05-28 12:54:55 +10:00
github-actions[bot]
1b668bf920 updated translation base 2021-05-28 02:51:33 +00:00
Oliver Walters
0978235370 Fix? 2021-05-28 12:49:50 +10:00
Oliver Walters
4ddeab3330 Update exchange rates when launching the server
- Ensures that the exchange rates don't get messed up if the base currency is changed!
2021-05-28 12:44:39 +10:00
Oliver Walters
52fc698b51 Remove debug message 2021-05-28 12:07:53 +10:00
eeintech
cdb453b09c Merge branch 'master' of github.com:inventree/InvenTree into bom_items_purchase_price 2021-05-27 10:20:40 -04:00
github-actions[bot]
8181f0dafa updated translation base 2021-05-27 07:11:29 +00:00
Oliver Walters
c71f4ed045 Add currency exchange unit tests 2021-05-27 16:48:13 +10:00
Oliver Walters
4520bb7447 PEP style fixes 2021-05-27 16:36:26 +10:00
Oliver Walters
6085478672 Simplify settings view
- Show various currency exchange rates
- Button to "refresh now"
2021-05-27 16:34:37 +10:00
Oliver Walters
af1904b6e4 Simplify exhange rate backend 2021-05-27 15:45:38 +10:00
github-actions[bot]
81d2672df7 updated translation base 2021-05-27 03:25:15 +00:00
Oliver Walters
2a64e4a309 Bug fix for template 2021-05-27 13:23:20 +10:00
github-actions[bot]
84c473ef0d updated translation base 2021-05-27 03:19:54 +00:00
Oliver Walters
4df7e53bb8 Add DEFAULT_CURRENCY option 2021-05-27 12:55:30 +10:00
Oliver Walters
c2fe5e08b4 Expand possibilities for variant conversion
- Ref get_conversion_options
2021-05-27 12:35:55 +10:00
eeintech
bf83cfb04c Merge branch 'master' of github.com:inventree/InvenTree into bom_items_purchase_price 2021-05-26 09:28:55 -04:00
Matthias
9d5b90190b style + merge fix 2021-05-26 13:18:07 +02:00
Matthias Mair
859a3178a4
Merge branch 'master' into part-import 2021-05-26 13:08:58 +02:00
Matthias
79374c5dfd ajax implementation for part import 2021-05-26 13:05:20 +02:00
Matthias
421b0a896d AjaxView for reuse of FormViews 2021-05-26 13:04:21 +02:00
Matthias
002706849c enrich context with form if not set 2021-05-26 12:20:37 +02:00
github-actions[bot]
70c131dca6 updated translation base 2021-05-26 09:12:19 +00:00
Matthias
4319ba16af Settings to show import-button 2021-05-26 09:20:50 +02:00
eeintech
b04ad48178 Fixed test using manual exchange backend, template update 2021-05-25 11:39:04 -04:00
eeintech
93bfe4c5f1 Added 'Custom Exchange Rate' boolea setting
Removed Fixer.io exchange rate backend
2021-05-25 11:19:07 -04:00
eeintech
654d4ecf46 Merged @SchrodingersGat ExchangeRateHost integration work 2021-05-25 10:34:20 -04:00
github-actions[bot]
6c62ee4548 updated translation base 2021-05-25 04:34:43 +00:00
Oliver Walters
0a26a06909 Use INVENTREE_DEFAULT_CURRENCY as specified base currency 2021-05-25 10:46:30 +10:00
Oliver Walters
619cba6007 Currency: Use ExchangeRateHost backend by default, rather than fixer.io
- No longer support fixer.io as it requires an API key and does not support "base" currency
2021-05-25 10:37:53 +10:00
github-actions[bot]
9b02171681 updated translation base 2021-05-24 23:50:05 +00:00
Matthias
b15c20611d style 2021-05-24 22:45:00 +02:00
Matthias
b4c9edcd27 bom-price ranges as pie-chart 2021-05-24 22:31:33 +02:00
Matthias
3363969c17 added in randomColor for dynamic color gen 2021-05-24 19:14:38 +02:00
Matthias
206bab137b refactor 2021-05-24 17:39:32 +02:00
Matthias
fe8e03c666 additional information for graph 2021-05-24 15:46:11 +02:00
Matthias
d5b2bfedbc re-layouting tables 2021-05-24 02:18:34 +02:00
Matthias
25681fb805 style 2021-05-24 01:30:37 +02:00
Matthias
84d71d928f removing new stuff in pricing modal 2021-05-24 01:14:15 +02:00
Matthias
7c18ebbbe4 creating new tab 2021-05-24 01:13:46 +02:00
Matthias
b803fbae72 remofing setting 2021-05-24 00:18:04 +02:00
github-actions[bot]
f8b5996928 updated translation base 2021-05-23 11:36:36 +00:00
Oliver Walters
65aa468168 Add backend for exchangerate.host 2021-05-23 21:14:43 +10:00
Matthias
1da1753b23 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-23 02:31:07 +02:00
Matthias
3c5bb048a1 renaming a few parts 2021-05-22 15:39:54 +02:00
Matthias
b1b974a1f6 safer check if fixer-backend is used 2021-05-22 14:55:41 +02:00
Matthias
4503f23ae4 beeing safe with wrong / unknown setttings 2021-05-22 14:55:05 +02:00
Matthias
53ce848145 better translation 2021-05-22 14:48:56 +02:00
github-actions[bot]
ee79c022a1 updated translation base 2021-05-22 11:15:33 +00:00
Oliver Walters
240ff59b30 Bump API version to 3
- New stock item history tracking is incompatible
- Adds API info to the "about" dialog
2021-05-22 20:56:56 +10:00
eeintech
be3f37f28f Updated default currency backend 2021-05-20 15:22:18 -04:00
eeintech
bbd95f2c70 Fixed exchange rate backend test 2021-05-20 14:52:56 -04:00
eeintech
27799b43b2 Template fix/improvement 2021-05-20 13:51:54 -04:00
eeintech
747b0554e1 Ready for review 2021-05-20 13:45:26 -04:00
eeintech
bed6a7e49c Added exchange rates form 2021-05-20 09:49:56 -04:00
eeintech
6d5b2d3227 Added 'Currencies' settings view in global settings 2021-05-19 17:06:41 -04:00
eeintech
34ded08ee7 Added InvenTreeFixerExchangeBackend class 2021-05-19 16:17:03 -04:00
eeintech
7a175f13a1 Merge branch 'master' of github.com:inventree/InvenTree into bom_items_purchase_price 2021-05-19 13:25:13 -04:00
Oliver
9ac1c8be12
Trans merge fix (#1599)
* 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
github-actions[bot]
92db7ec27e updated translation base 2021-05-18 13:00:35 +00:00
Oliver Walters
4101e25680 Style fixes 2021-05-18 22:41:57 +10:00
Oliver Walters
663f5562e8 Schedule a daily task to update currency information 2021-05-18 22:41:26 +10:00
Oliver Walters
01d444279c Add setting for fixer.io API key 2021-05-18 22:11:24 +10:00
Matthias
900f707ff9 permission added 2021-05-18 11:51:08 +02:00
github-actions[bot]
167eae4322 updated translation base 2021-05-18 09:35:28 +00:00
Oliver
efe888056f
Merge pull request #1596 from SchrodingersGat/banner-reworks
Banner reworks
2021-05-18 19:34:18 +10:00
github-actions[bot]
20f06ab209 updated translation base 2021-05-18 09:21:48 +00:00
Matthias
9a42421852 restructure overrides 2021-05-18 11:20:25 +02:00
Oliver
013d42de7a
L10 merge (#1595)
* 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 (#1551)

* 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 (#1552)

* 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 (#1568)

* 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 (#1570)

* 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
Oliver Walters
7cd345aeb5 Change location of 'banner' messages
- Place them inside the main panel
- Generally underneath the thumbnail
2021-05-18 19:19:43 +10:00
Matthias
dd56bc1fa5 setup not realy needed 2021-05-18 11:18:13 +02:00
Oliver Walters
a1c4662e91 Move status messages for stock item 2021-05-18 19:11:37 +10:00
Matthias
616dd76f8a refactor and doc 2021-05-18 11:10:01 +02:00
Oliver Walters
5204567628 Bug fix for stock item tracking API 2021-05-18 19:06:41 +10:00
Matthias
e49256a218 fixed bug pointed out by @eeintech 2021-05-18 10:52:27 +02:00
Oliver Walters
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
Matthias
db9fd28276 preparing stuff for gen get_field_selection() 2021-05-18 10:48:29 +02:00
Matthias
64f8846e99 generalising for done() 2021-05-18 10:47:56 +02:00
Matthias
ad4902ea44 restucture 2021-05-18 10:19:35 +02:00
Matthias
cb0ef30eff form overrides 2021-05-18 10:17:19 +02:00
Matthias
92f8bd36f1 inherited setup method 2021-05-18 01:55:47 +02:00
Matthias
eafaf92ae2 unified naming schema 2021-05-18 01:02:31 +02:00
Matthias
46723f42ca Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-05-18 00:57:10 +02:00
Oliver
c31380ec6b Fix: New translations django.po from Crowdin 2021-05-18 00:58:49 +10:00
Oliver
69b935d97c Fix: New translations django.po from Crowdin 2021-05-17 20:47:43 +10:00
Oliver
2568299192 Fix: New translations django.po from Crowdin 2021-05-17 20:47:42 +10:00
Oliver
b7a8c2c5bd Fix: New translations django.po from Crowdin 2021-05-17 20:47:40 +10:00
Oliver
b2f568368d Fix: New translations django.po from Crowdin 2021-05-17 20:47:39 +10:00
Oliver
80cfa13377 Fix: New translations django.po from Crowdin 2021-05-17 20:47:37 +10:00
Oliver
25f8e3a2d3 Fix: New translations django.po from Crowdin 2021-05-17 20:47:36 +10:00
Oliver
e176bb1c80 Fix: New translations django.po from Crowdin 2021-05-17 20:47:34 +10:00
Oliver
8025e12b0d Fix: New translations django.po from Crowdin 2021-05-17 20:47:33 +10:00
Oliver
c2ea6a7cbc Fix: New translations django.po from Crowdin 2021-05-17 20:47:31 +10:00
github-actions[bot]
87f4ce8c47 updated translation base 2021-05-17 10:46:13 +00:00
Oliver Walters
64c1503fe4 Disable "purchase price" field for non-purchaseable parts 2021-05-17 20:15:53 +10:00
Oliver
cf9bc5136d Fix: New translations django.po from Crowdin 2021-05-17 08:55:05 +10:00
Oliver
ae6c458e09 Fix: New translations django.po from Crowdin 2021-05-17 08:55:03 +10:00
Oliver
cdf2c1c4b2 Fix: New translations django.po from Crowdin 2021-05-17 08:55:02 +10:00
Oliver
6b9163fe4c Fix: New translations django.po from Crowdin 2021-05-17 08:55:00 +10:00
Oliver
8756a2ecef Fix: New translations django.po from Crowdin 2021-05-17 08:54:59 +10:00
Oliver
6aee171405 Fix: New translations django.po from Crowdin 2021-05-17 08:54:57 +10:00
Oliver
41a27203ff Fix: New translations django.po from Crowdin 2021-05-17 08:54:56 +10:00
Oliver
505b942bd1 Fix: New translations django.po from Crowdin 2021-05-17 08:54:54 +10:00
Oliver
7d29490c7e Fix: New translations django.po from Crowdin 2021-05-17 08:54:53 +10:00
github-actions[bot]
c17e586241 updated translation base 2021-05-16 22:53:54 +00:00
Matthias
508099e536 style fixing 2021-05-16 19:53:01 +02:00
Matthias
cfa6994302 docker-mode in stats 2021-05-16 18:20:32 +02:00
Matthias
ff9970f1cc docker in version copy 2021-05-16 18:20:06 +02:00
Matthias
b2a912c770 docker-mode switch in settings and tags 2021-05-16 18:19:35 +02:00
Matthias
16b7d6c34d database and debug info in version copy 2021-05-16 18:18:58 +02:00
Matthias
6c30d128a1 removing duplicate information 2021-05-16 17:33:24 +02:00
Oliver
271dad4cd9 Fix: New translations django.po from Crowdin 2021-05-17 00:43:32 +10:00
Matthias
3a5b4ab74b crispy forms for FileManagementFormView 2021-05-16 16:00:02 +02:00
Matthias
b9c73b1e60 simpler code 2021-05-16 15:58:35 +02:00
Matthias
8168db8061 implementation for part import 2021-05-16 15:57:57 +02:00
Matthias
90ae281387 adding in optional headers 2021-05-16 15:50:13 +02:00
Matthias
941ac25d53 style fixes 2021-05-15 08:45:01 +02:00
Matthias
27ed20c123 fix for wrong mapping 2021-05-15 08:36:08 +02:00
Oliver
96d3a233d1 Fix: New translations django.po from Crowdin 2021-05-15 16:21:38 +10:00
Matthias
6c2e18dd7a part creation + alerts 2021-05-15 01:09:50 +02:00
Matthias
437e75c598 form functions 2021-05-15 01:09:29 +02:00
Matthias
f1f75b45cb using messages for alerts 2021-05-15 01:02:25 +02:00
Matthias
888154e30b added todo for cleaner implemention 2021-05-15 01:01:57 +02:00
Matthias
f136f90e12 config for all form-fields 2021-05-15 00:59:47 +02:00
Matthias
0c5fa57770 template tag for dict-reading 2021-05-15 00:58:03 +02:00
Matthias
4ae7debb2b navigation 2021-05-15 00:57:38 +02:00
Matthias
8effdffe6f templates and FileManagement config 2021-05-15 00:57:18 +02:00
Matthias
307a097ab4 adding in url 2021-05-15 00:56:14 +02:00
Oliver
b192df6aa5 Fix: New translations django.po from Crowdin 2021-05-15 07:56:05 +10:00
Oliver
76b3cb2a9a Fix: New translations django.po from Crowdin 2021-05-15 07:56:04 +10:00
Oliver
d9af08f17b Fix: New translations django.po from Crowdin 2021-05-15 07:56:02 +10:00
Oliver
39a25c1ac2 Fix: New translations django.po from Crowdin 2021-05-15 07:56:01 +10:00
Oliver
5b9eeb7a6d Fix: New translations django.po from Crowdin 2021-05-15 07:55:59 +10:00
Oliver
d6a34d4e2e Fix: New translations django.po from Crowdin 2021-05-15 07:55:58 +10:00
Oliver
1e83496226 Fix: New translations django.po from Crowdin 2021-05-15 07:55:56 +10:00
Oliver
1936601747 Fix: New translations django.po from Crowdin 2021-05-15 07:55:54 +10:00
Oliver
a50384a015 Fix: New translations django.po from Crowdin 2021-05-15 07:55:52 +10:00
github-actions[bot]
b78f74b3c6 updated translation base 2021-05-14 21:51:24 +00:00
Oliver
980befe0fa
Merge pull request #1586 from nwns/feature/show_poline_items_in_admin
feat(admin): Show the line items on the PO on the Admin Site
2021-05-15 07:50:53 +10:00
Oliver
6f10195f8c
Merge pull request #1465 from nwns/feature/po_on_sales_order
Show PO for Stock Items on Sales Order Detail and stock
2021-05-15 07:49:59 +10:00
eeintech
5ce262172d Fixed bom_item unit test 2021-05-14 16:59:59 -04:00
eeintech
e9f41a8357 Currency finding fix 2021-05-14 16:38:30 -04:00
eeintech
274eb51e48 Added read_only args 2021-05-14 16:29:55 -04:00
eeintech
1940fd5199 Now processing currencies 2021-05-14 16:16:23 -04:00
Nigel
30a2194fe1
feat(admin): Show the line items on the PO on the Admin Site 2021-05-14 13:24:13 -06:00
Oliver
cb088322eb Fix: New translations django.po from Crowdin 2021-05-14 19:41:56 +10:00
Oliver
3229c3d130 Fix: New translations django.po from Crowdin 2021-05-14 13:06:14 +10:00
Oliver
3b0d96fff2 Fix: New translations django.po from Crowdin 2021-05-14 13:06:12 +10:00
Oliver
fccbaadcce Fix: New translations django.po from Crowdin 2021-05-14 13:06:11 +10:00
Oliver
c9104becfe Fix: New translations django.po from Crowdin 2021-05-14 13:06:10 +10:00
Oliver
f35f143096 Fix: New translations django.po from Crowdin 2021-05-14 13:06:08 +10:00
Oliver
39b87a5e27 Fix: New translations django.po from Crowdin 2021-05-14 13:06:07 +10:00
Oliver
42a75494f9 Fix: New translations django.po from Crowdin 2021-05-14 13:06:05 +10:00
Oliver
2f6834b069 Fix: New translations django.po from Crowdin 2021-05-14 13:06:04 +10:00
Oliver
78459d5590 Fix: New translations django.po from Crowdin 2021-05-14 13:06:02 +10:00
github-actions[bot]
c4641c3ab8 updated translation base 2021-05-14 02:57:28 +00:00
Oliver
310728ead4
Merge pull request #1583 from SchrodingersGat/server-info
Add debug mode and database backend as info to the "stats" dialog
2021-05-14 12:56:12 +10:00
Oliver Walters
7deea1ec00 Style fixes 2021-05-14 12:40:42 +10:00
Oliver Walters
f76bc5a7b8 Add debug mode and database backend as info to the "stats" dialog 2021-05-14 12:38:38 +10:00
github-actions[bot]
65e6756c45 updated translation base 2021-05-13 21:51:17 +00:00
Oliver
033aa29531
Merge pull request #1580 from matmair/BUG-copy
fixing bug from refactor
2021-05-14 07:50:33 +10:00
eeintech
68f5ec8b6a Added currency conversion 2021-05-13 17:09:52 -04:00
Matthias
be92efe7b9 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-13 22:58:01 +02:00
Nigel
bca2f4a07b
feat(sales_order): Stock Items show the PO number
Stock items show the PO number that they were purchased on when being
viewed in the sales order allocation modal and when viewing the sales
order details.
2021-05-13 14:18:25 -06:00
eeintech
32d0f3039d Obviously new float fields should be read-only... 2021-05-13 16:17:45 -04:00
eeintech
a64ab5956b Removed leftover print 2021-05-13 16:07:57 -04:00
eeintech
22249206d2 Fixed duplicate check 2021-05-13 16:06:57 -04:00
eeintech
f2e9f58f1b Added purchase price range and average to BOM items/view 2021-05-13 15:47:42 -04:00
Matthias
e382f2a57e fixing bug from refactor 2021-05-13 15:46:27 +02:00
Oliver Walters
aa6bbdc82c 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-13 17:30:58 +10:00
Oliver
499bad2be8 Fix: New translations django.po from Crowdin 2021-05-13 14:17:49 +10:00
Oliver
ef0a49c55a Fix: New translations django.po from Crowdin 2021-05-13 14:17:48 +10:00
Oliver
6f9982b2db Fix: New translations django.po from Crowdin 2021-05-13 14:17:45 +10:00
Oliver
5bd538a889 Fix: New translations django.po from Crowdin 2021-05-13 14:17:43 +10:00
Oliver
26a83a45b3 Fix: New translations django.po from Crowdin 2021-05-13 14:17:42 +10:00
Oliver
cfa6cbd831 Fix: New translations django.po from Crowdin 2021-05-13 14:17:41 +10:00
Oliver
455cf0a0f8 Fix: New translations django.po from Crowdin 2021-05-13 14:17:39 +10:00
Oliver
defdd638fc Fix: New translations django.po from Crowdin 2021-05-13 14:17:37 +10:00
Oliver
68ef2ba0ac Fix: New translations django.po from Crowdin 2021-05-13 14:17:36 +10:00
github-actions[bot]
ec6affa9c7 updated translation base 2021-05-13 04:04:55 +00:00
Oliver Walters
82a3d9ca96 Implements custom naming for generated labels 2021-05-13 13:40:40 +10:00
Oliver Walters
6de44a5921 Adds a "filename_template" field to reports
- Allows users to define the naming scheme for generated reports
- Templated, can use any context variable already available to the report instance
- Adds some more context variables to various reports
2021-05-13 13:23:51 +10:00
Oliver
d5fa4d5f66 Fix: New translations django.po from Crowdin 2021-05-13 11:07:51 +10:00
Oliver
c58665fed2 Fix: New translations django.po from Crowdin 2021-05-13 11:07:49 +10:00
Oliver
5a51219671 Fix: New translations django.po from Crowdin 2021-05-13 11:07:48 +10:00
Oliver
1802f12325 Fix: New translations django.po from Crowdin 2021-05-13 11:07:46 +10:00
Oliver
da727d3143 Fix: New translations django.po from Crowdin 2021-05-13 11:07:45 +10:00
Oliver
dfd784df99 Fix: New translations django.po from Crowdin 2021-05-13 11:07:43 +10:00
Oliver
7a6b269586 Fix: New translations django.po from Crowdin 2021-05-13 11:07:42 +10:00
Oliver
6d66a83123 Fix: New translations django.po from Crowdin 2021-05-13 11:07:40 +10:00
Oliver
66429ed545 Fix: New translations django.po from Crowdin 2021-05-13 11:07:39 +10:00
github-actions[bot]
3d8b350082 updated translation base 2021-05-13 00:47:10 +00:00
Matthias
ba3f3108d7 missing translation 2021-05-13 00:21:42 +02:00
Matthias
5077419b68 fewer js-functions 2021-05-13 00:20:51 +02:00
Matthias Mair
b1410c7c2b Merge branch 'inventree:master' into price-history 2021-05-12 23:39:57 +02:00
Matthias
8a8f61c568 functionality for #725 2021-05-12 23:25:39 +02:00
Oliver
a9dd53d81f Fix: New translations django.po from Crowdin 2021-05-13 01:57:52 +10:00
Oliver
34f7452c8a Fix: New translations django.po from Crowdin 2021-05-13 01:01:46 +10:00
Oliver
705bbf519a Fix: New translations django.po from Crowdin 2021-05-13 00:04:55 +10:00
Matthias
0ff7ee21d0 usage of new templates 2021-05-12 15:41:48 +02:00
Matthias
3d574f6a18 templates for mailto and tel - links 2021-05-12 15:41:15 +02:00
Matthias
cdcb6504f9 fixing wrong position 2021-05-12 15:33:49 +02:00
Matthias
f9f191b5e3 Inclusion in all tamplates
#1574
2021-05-12 15:31:35 +02:00
Oliver
6c2c92a6e9 Fix: New translations django.po from Crowdin 2021-05-12 23:05:38 +10:00
Oliver
2175e8a4c0 Fix: New translations django.po from Crowdin 2021-05-12 23:05:36 +10:00
Oliver
5bc24f9a36 Fix: New translations django.po from Crowdin 2021-05-12 23:05:34 +10:00
Oliver
45ddb6231b Fix: New translations django.po from Crowdin 2021-05-12 23:05:32 +10:00
Oliver
a0e7d5c731 Fix: New translations django.po from Crowdin 2021-05-12 23:05:29 +10:00
Oliver
edb8af38c0 Fix: New translations django.po from Crowdin 2021-05-12 23:05:27 +10:00
Oliver
15d23581fa Fix: New translations django.po from Crowdin 2021-05-12 23:05:24 +10:00
Oliver
d617add182 Fix: New translations django.po from Crowdin 2021-05-12 23:05:22 +10:00
Oliver
d14043c756 Fix: New translations django.po from Crowdin 2021-05-12 23:05:19 +10:00
github-actions[bot]
bad4cc65d0 updated translation base 2021-05-12 12:29:35 +00:00
Oliver
07c7af1f2e
Merge pull request #1569 from SchrodingersGat/docker-dev
Development docker image
2021-05-12 22:27:50 +10:00
github-actions[bot]
4dfaa96834 updated translation base 2021-05-12 12:19:46 +00:00
Oliver
9d98ecca92
Merge pull request #1561 from eeintech/multi_part_forms
Multi-step form framework + Purchase order upload file view
2021-05-12 22:18:35 +10:00
Oliver
a144763d92 Fix: New translations django.po from Crowdin 2021-05-12 22:07:15 +10:00
Oliver
77624532c2 Fix: New translations django.po from Crowdin 2021-05-12 20:55:22 +10:00
Oliver Walters
3381c5e257 Improvements to development docker-compose script
- Python packages are installed in a virtual environment within the src dir
- This prevents a LONG installation process each time the docker image is rebuilt
2021-05-12 20:53:50 +10:00
Oliver
bfe3cffa66 Fix: New translations django.po from Crowdin 2021-05-12 11:18:05 +10:00
Oliver
7fde507d85 Fix: New translations django.po from Crowdin 2021-05-12 11:18:04 +10:00
Oliver
e85e27def0 Fix: New translations django.po from Crowdin 2021-05-12 11:18:02 +10:00
Oliver
98d431d774 Fix: New translations django.po from Crowdin 2021-05-12 11:18:00 +10:00
Oliver
4b332aa96b Fix: New translations django.po from Crowdin 2021-05-12 11:17:57 +10:00
Oliver
60fb47ec31 Fix: New translations django.po from Crowdin 2021-05-12 11:17:56 +10:00
Oliver
7fdb0756cf Fix: New translations django.po from Crowdin 2021-05-12 11:17:54 +10:00
Oliver
385fff9c26 Fix: New translations django.po from Crowdin 2021-05-12 11:17:53 +10:00
Oliver
de858e53cc Fix: New translations django.po from Crowdin 2021-05-12 11:17:52 +10:00
github-actions[bot]
8d5996ffca updated translation base 2021-05-12 00:59:47 +00:00
Oliver Walters
3b252b8409 Record the user when updating stock items 2021-05-12 10:42:09 +10:00
Oliver Walters
30ff48d803 Fixes 2021-05-12 10:09:02 +10:00
Oliver Walters
68b53acbf1 remove old fields from the StockItemTracking model 2021-05-12 08:07:03 +10:00
eeintech
e9c4ce8c5f Added support for reference and notes fields 2021-05-11 17:11:09 -04:00
eeintech
ba561d6d19 Fixed import for excel formats 2021-05-11 14:06:38 -04:00
eeintech
a093118856 Few more fixes 2021-05-11 11:02:54 -04:00
Matthias
169745c11f style fix 2021-05-11 16:23:26 +02:00
eeintech
10eb69caf9 Merge branch 'master' of github.com:inventree/InvenTree into multi_part_forms 2021-05-11 10:22:34 -04:00
Matthias
71c3ff4b9f prefetching related information 2021-05-11 16:15:10 +02:00
Oliver Walters
03a231bffb Updates
- Add StockHistoryCode to custom context
- Add simple form for editing stock item history
- Add tracking entry when stock status is changed
2021-05-11 23:38:26 +10:00
Oliver Walters
84bfffd5a7 Override 'add_note' when new StockItem is created
- This allows us to prevent the issue of duplicate notes being created
2021-05-11 22:51:29 +10:00
Oliver Walters
0c19a94f5c Add run-time addition of extra data to the API 2021-05-11 22:50:58 +10:00