7021 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Oliver	5704dcc551	Fix: New translations django.po from Crowdin	2021-06-17 08:41:00 +10:00
Oliver	42ecb11dbc	Fix: New translations django.po from Crowdin	2021-06-17 08:40:59 +10:00
Oliver	b59de2a9ba	Fix: New translations django.po from Crowdin	2021-06-17 08:40:58 +10:00
Oliver	716167d4d0	Fix: New translations django.po from Crowdin	2021-06-17 08:40:57 +10:00
Oliver	7fd9dd4f12	Fix: New translations django.po from Crowdin	2021-06-17 08:40:55 +10:00
github-actions[bot]	7eb420409b	updated translation base	2021-06-16 22:40:13 +00:00
Oliver	5bbc44e816	Merge pull request #1666 from matmair/po-total ... total price column as per #1660	2021-06-17 08:38:51 +10:00
Matthias	5d3360e63b	added quantity total	2021-06-17 00:23:08 +02:00
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 Walters	70f3c03b64	Merge remote-tracking branch 'upstream/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 00:37:50 +10:00
Oliver Walters	4703fdf1b3	Merge remote-tracking branch 'upstream/master'	2021-06-17 00:34:29 +10:00
Oliver	0781ad525e	Fix: New translations django.po from Crowdin	2021-06-17 00:02:35 +10:00
Oliver	f44959b9a8	Fix: New translations django.po from Crowdin	2021-06-17 00:02:34 +10:00
Oliver	626019323b	Fix: New translations django.po from Crowdin	2021-06-17 00:02:31 +10:00
Oliver	1f10ab699f	Fix: New translations django.po from Crowdin	2021-06-17 00:02:29 +10:00