6353 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Oliver	ff2094d1d8	Fix: New translations django.po from Crowdin	2021-06-28 09:18:21 +10:00
Oliver	5f0de34c12	Fix: New translations django.po from Crowdin	2021-06-28 09:18:20 +10:00
github-actions[bot]	144ae6b7ff	updated translation base	2021-06-27 23:17:18 +00:00
Oliver	b5086ab731	Merge pull request #1726 from matmair/bom-pricing ... Bom pricing	2021-06-28 09:15:52 +10:00
Matthias	cd6d13fa7d	Merge branch 'master' of https://github.com/inventree/InvenTree into bom-pricing	2021-06-27 14:38:23 +02:00
Matthias	e4a9d56ba0	style fixes	2021-06-27 14:26:51 +02:00
Matthias	4f726931a6	adds in money-conversion helper	2021-06-27 14:18:37 +02:00
Matthias	a3ec24fbcc	Reenabling prices for BOM items ... Closes #1721	2021-06-27 13:48:08 +02:00
github-actions[bot]	fbe48e2533	updated translation base	2021-06-27 11:01:12 +00:00
Oliver	604c136b00	Update version.py	2021-06-27 21:00:01 +10:00
github-actions[bot]	91e28bb3d6	updated translation base	2021-06-27 10:59:34 +00:00
Oliver	786e994e19	Update version.py ... 0.2.4	2021-06-27 20:58:24 +10:00
Matthias	67128c308b	fixing typo	2021-06-27 12:26:02 +02:00
Oliver	4320a995df	Fix: New translations django.po from Crowdin	2021-06-27 10:11:52 +10:00
Oliver	f9a1700b50	Fix: New translations django.po from Crowdin	2021-06-27 10:11:51 +10:00
Oliver	f175389735	Fix: New translations django.po from Crowdin	2021-06-27 10:11:49 +10:00
Oliver	2c2c5b585c	Fix: New translations django.po from Crowdin	2021-06-27 10:11:48 +10:00
Oliver	ab72e39d05	Fix: New translations django.po from Crowdin	2021-06-27 10:11:47 +10:00
Oliver	a994b35029	Fix: New translations django.po from Crowdin	2021-06-27 10:11:45 +10:00
Oliver	f9215e8e59	Fix: New translations django.po from Crowdin	2021-06-27 10:11:44 +10:00
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