7438 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matthias	ebe2ae77a5	hide error message with response	2021-06-17 19:18:34 +02:00
Oliver	0a619dce86	Fix: New translations django.po from Crowdin	2021-06-18 03:06:40 +10:00
Matthias	789865b996	style-fix	2021-06-17 18:25:05 +02:00
Matthias	997d68694e	fix for part with no bom-price #1678	2021-06-17 18:21:11 +02:00
Matthias	6e77029d7d	Revert "fix for part with no bom" ... This reverts commit dd58f89977.	2021-06-17 18:12:41 +02:00
Oliver	436abf31a8	Fix: New translations django.po from Crowdin	2021-06-18 02:09:40 +10:00
Oliver	17343cbfad	Fix: New translations django.po from Crowdin	2021-06-18 02:09:39 +10:00
Oliver	21f541f188	Fix: New translations django.po from Crowdin	2021-06-18 00:58:15 +10:00
Matthias Mair	44464de2b6	Merge branch 'inventree:master' into internal-price	2021-06-17 16:42:57 +02:00
Matthias Mair	e77e89b16c	Merge branch 'inventree:master' into part-import	2021-06-17 16:42:49 +02:00
Matthias	dd58f89977	fix for part with no bom	2021-06-17 14:51:41 +02:00
github-actions[bot]	ba6a3667ad	updated translation base	2021-06-17 12:40:12 +00:00
Oliver	49a60dad0a	Fix: New translations django.po from Crowdin	2021-06-17 22:38:27 +10:00
Oliver	57572fe1e1	Fix: New translations django.po from Crowdin	2021-06-17 22:38:26 +10:00
Oliver	c249f4c004	Fix: New translations django.po from Crowdin	2021-06-17 22:38:25 +10:00
Oliver	bce93d9a19	Fix: New translations django.po from Crowdin	2021-06-17 22:38:22 +10:00
Oliver	4e26604b54	Fix: New translations django.po from Crowdin	2021-06-17 22:38:21 +10:00
Oliver	869eae871b	Fix: New translations django.po from Crowdin	2021-06-17 22:38:19 +10:00
Oliver	f8dbd59a85	Fix: New translations django.po from Crowdin	2021-06-17 22:38:18 +10:00
Oliver	90132d32b6	Fix: New translations django.po from Crowdin	2021-06-17 22:38:15 +10:00
Oliver	485df6c6c8	Fix: New translations django.po from Crowdin	2021-06-17 22:38:14 +10:00
Oliver	bc46cca9f0	Merge pull request #1677 from SchrodingersGat/new-typo-fix ... Typo fix for excluded commands	2021-06-17 22:37:45 +10:00
github-actions[bot]	a87270b371	updated translation base	2021-06-17 12:37:45 +00:00
Oliver	8766c80233	Merge pull request #1645 from matmair/pricing-reformat ... Pricing reformat	2021-06-17 22:36:07 +10:00
Oliver Walters	f6241031f6	Typo fix for excluded commands ... (cherry picked from commit cf7087747b)	2021-06-17 22:21:26 +10:00
Oliver	1634926574	Fix: New translations django.po from Crowdin	2021-06-17 18:06:59 +10:00
Oliver	773d4a7039	Fix: New translations django.po from Crowdin	2021-06-17 18:06:57 +10:00
Oliver	35342a5c7b	Fix: New translations django.po from Crowdin	2021-06-17 18:06:55 +10:00
Oliver	5b3e396a98	Fix: New translations django.po from Crowdin	2021-06-17 18:06:53 +10:00
Oliver	2fb8e83577	Fix: New translations django.po from Crowdin	2021-06-17 18:06:52 +10:00
Oliver	0a3916fec7	Fix: New translations django.po from Crowdin	2021-06-17 18:06:50 +10:00
Oliver	b8c496c869	Fix: New translations django.po from Crowdin	2021-06-17 18:06:49 +10:00
Oliver	4ec2956cc7	Fix: New translations django.po from Crowdin	2021-06-17 18:06:47 +10:00
Oliver	6a62e3315e	Fix: New translations django.po from Crowdin	2021-06-17 18:06:45 +10:00
github-actions[bot]	bfd509a1de	updated translation base	2021-06-17 07:02:35 +00:00
Oliver	93e83d0bf9	Merge pull request #1587 from nwns/feature/see_default_location ... feat(purchase orders): show the preferred location for each PO Line	2021-06-17 17:01:05 +10:00
Oliver	2c3f0fc95e	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	2021-06-17 15:48:24 +10:00
github-actions[bot]	3fc68a76f7	updated translation base	2021-06-16 23:12:21 +00:00
github-actions[bot]	b161a72cbe	updated translation base	2021-06-16 23:12:11 +00:00
Oliver	b2975596dc	L10 (#1668) ... * 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 * 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 Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2021-06-17 09:11:04 +10:00
Oliver	45eb2f6f26	Merge pull request #1669 from matmair/so-total ... So total	2021-06-17 09:10:57 +10:00
Matthias	af2cfe55be	missed a translation there	2021-06-17 00:51:53 +02:00
Matthias	ddd84dcd7c	Merge branch 'master' of https://github.com/inventree/InvenTree into so-total	2021-06-17 00:50:39 +02:00
Oliver	69c253bee5	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-17 08:50:32 +10:00
Matthias	bbe7edbf82	totals like in #1666	2021-06-17 00:50:10 +02:00
Oliver	a8ae62e133	Merge remote-tracking branch 'inventree/master' into l10	2021-06-17 08:49:00 +10:00
Oliver	0f53a03aae	Fix: New translations django.po from Crowdin	2021-06-17 08:41:06 +10:00
Oliver	d85fe7cf4c	Fix: New translations django.po from Crowdin	2021-06-17 08:41:04 +10:00
Oliver	e1e3608700	Fix: New translations django.po from Crowdin	2021-06-17 08:41:03 +10:00
Oliver	431ae69ee9	Fix: New translations django.po from Crowdin	2021-06-17 08:41:02 +10:00