2
0
mirror of https://github.com/inventree/InvenTree.git synced 2026-05-21 08:46:47 +00:00
Commit Graph

6333 Commits

Author SHA1 Message Date
Oliver 146cf61be3 Fix: New translations django.po from Crowdin 2021-06-27 10:11:43 +10:00
Oliver 3134a91a32 Fix: New translations django.po from Crowdin 2021-06-27 10:11:42 +10:00
github-actions[bot] 0fbd50fa4e updated translation base 2021-06-26 23:25:15 +00:00
Oliver 42ed95c936 Merge pull request #1588 from matmair/part-import
Part import
2021-06-27 09:24:10 +10:00
github-actions[bot] 0dd7c3d893 updated translation base 2021-06-26 23:02:38 +00:00
Oliver 9e720ea620 Merge pull request #1700 from SchrodingersGat/api-default-values
Unit testing for default values
2021-06-27 09:01:01 +10:00
Matthias Mair e760aa172a Merge branch 'master' into part-import 2021-06-26 23:58:41 +02:00
Oliver Walters 34a374ce9a Add try/except around callable default 2021-06-27 01:18:09 +10:00
Oliver Walters 0cc999410b More unit test fixes 2021-06-27 01:03:54 +10:00
Oliver Walters 7505d7b3c5 Unit test fixes 2021-06-27 00:47:12 +10:00
Oliver Walters d3e9803fd4 Remove debug statement 2021-06-27 00:25:49 +10:00
Oliver Walters 232899e0c4 Simpler implementation 2021-06-27 00:25:23 +10:00
Oliver Walters 8913b74f41 Typo fixes 2021-06-27 00:12:10 +10:00
Oliver Walters ae1a1e139f Further fixes for default API values
- Account for callable defaults
- Extra check in is_valid()
2021-06-27 00:01:40 +10:00
Oliver a0390f0821 PEP style fixes 2021-06-26 21:14:47 +10:00
Oliver b2aa38fefa Override get_initial() rather than is_valid() 2021-06-26 21:14:10 +10:00
Oliver ddbf863617 Merge remote-tracking branch 'inventree/master' into api-default-values
# Conflicts:
#	InvenTree/InvenTree/serializers.py
2021-06-26 21:04:41 +10:00
Oliver ba1c70e86b Intercept is_valid() method to set default values 2021-06-26 20:48:09 +10:00
github-actions[bot] 7a648726c1 updated translation base 2021-06-26 10:20:03 +00:00
Oliver 3f1aca9e94 Translation merge (#1724)
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.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

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.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

* 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

* 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

* New Crowdin updates (#1670)

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.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

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.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

* updated translation base

* 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

* 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

* 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

* 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

* 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

* 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

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.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

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.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

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.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-06-26 20:18:25 +10:00
Oliver 76b24dd1d9 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-26 19:55:33 +10:00
Oliver 5dc7ece16c Fix: New translations django.po from Crowdin 2021-06-26 00:06:42 +10:00
Oliver b122b88e12 Fix: New translations django.po from Crowdin 2021-06-25 07:40:21 +10:00
Oliver e6a584173b Fix: New translations django.po from Crowdin 2021-06-25 07:40:20 +10:00
Oliver 287104619a Fix: New translations django.po from Crowdin 2021-06-25 07:40:19 +10:00
Oliver 2f24424b41 Fix: New translations django.po from Crowdin 2021-06-25 07:40:18 +10:00
Oliver 8b2c4ed934 Fix: New translations django.po from Crowdin 2021-06-25 07:40:16 +10:00
Oliver e223cd60f2 Fix: New translations django.po from Crowdin 2021-06-25 07:40:15 +10:00
Oliver ce0bd9a39c Fix: New translations django.po from Crowdin 2021-06-25 07:40:14 +10:00
Oliver b65cc6e65a Fix: New translations django.po from Crowdin 2021-06-25 07:40:12 +10:00
Oliver 016cd40a87 Fix: New translations django.po from Crowdin 2021-06-25 07:40:11 +10:00
github-actions[bot] 887667df99 updated translation base 2021-06-24 21:38:29 +00:00
Oliver 76ec51a93b Merge pull request #1722 from matmair/internal-price-op
full Internal price coverage
2021-06-25 07:37:06 +10:00
matmair 9ce5a9823e added doc for internal price 2021-06-24 21:48:00 +02:00
matmair abe00232f3 use internal price in more places 2021-06-24 21:47:11 +02:00
Oliver a6cca16341 Fix: New translations django.po from Crowdin 2021-06-24 13:44:39 +10:00
Oliver b1f53f6366 Fix: New translations django.po from Crowdin 2021-06-24 13:44:38 +10:00
Oliver 63d8d1e2d3 Fix: New translations django.po from Crowdin 2021-06-24 13:44:37 +10:00
Oliver 83dd8de528 Fix: New translations django.po from Crowdin 2021-06-24 13:44:35 +10:00
Oliver e54396d699 Fix: New translations django.po from Crowdin 2021-06-24 13:44:33 +10:00
Oliver 7c3f50404e Fix: New translations django.po from Crowdin 2021-06-24 13:44:32 +10:00
Oliver d47df2135b Fix: New translations django.po from Crowdin 2021-06-24 13:44:30 +10:00
Oliver 917fb410bb Fix: New translations django.po from Crowdin 2021-06-24 13:44:29 +10:00
Oliver 4df50887f5 Fix: New translations django.po from Crowdin 2021-06-24 13:44:28 +10:00
github-actions[bot] 258585bc56 updated translation base 2021-06-24 03:41:34 +00:00
Oliver be85de4a7b Merge pull request #1719 from SchrodingersGat/test-results-fix
Fixes table data nesting
2021-06-24 13:40:09 +10:00
Oliver a12790d5ca Fixes table data nesting
Sometimes you just need a quick break
2021-06-24 13:23:12 +10:00
Oliver 92967af2ad Fix: New translations django.po from Crowdin 2021-06-23 19:52:53 +10:00
Oliver 6d46313149 Fix: New translations django.po from Crowdin 2021-06-23 19:52:52 +10:00
Oliver da9e12a170 Fix: New translations django.po from Crowdin 2021-06-23 19:52:50 +10:00