6676 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Oliver	2a391e1d61	Fix: New translations django.po from Crowdin	2021-07-03 13:16:18 +10:00
Oliver	d1436d154c	Fix: New translations django.po from Crowdin	2021-07-03 13:16:15 +10:00
Oliver	eb5b386009	Fix: New translations django.po from Crowdin	2021-07-03 13:16:14 +10:00
Oliver	359e92cd8e	Merge remote-tracking branch 'inventree/master' into drf-api-forms ... # Conflicts: # InvenTree/InvenTree/static/css/inventree.css	2021-07-03 12:59:13 +10:00
github-actions[bot]	9323a91073	updated translation base	2021-07-03 02:56:42 +00:00
Oliver	2b32f04af2	Merge pull request #1712 from matmair/one-pricing-view ... One pricing view	2021-07-03 12:55:34 +10:00
Oliver	67a35dc879	New Crowdin updates (#1751) ... * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.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-07-03 12:46:23 +10:00
Oliver	77c3aa5379	Use custom currency choices	2021-07-03 12:45:59 +10:00
Oliver	90a3a8a288	Merge remote-tracking branch 'inventree/master' into drf-api-forms	2021-07-03 12:35:40 +10:00
Oliver	55f8fefe79	Remove old test	2021-07-03 12:33:28 +10:00
github-actions[bot]	3c8cba01b1	updated translation base	2021-07-03 02:06:35 +00:00
Oliver	d8f5cc7f56	Merge pull request #1744 from matmair/stock-table-has-price ... Stock table filter: has purchase price	2021-07-03 12:05:29 +10:00
github-actions[bot]	2a10e4a69b	updated translation base	2021-07-03 02:00:57 +00:00
Oliver	1d5429f07e	Merge pull request #1750 from matmair/stock-table-supplier-part ... Stock table add supplier part column	2021-07-03 11:59:46 +10:00
Matthias	16fafbfb30	sock table link to stock	2021-07-03 02:05:37 +02:00
Matthias	57ce82de32	show supplier_part in stock-table ... #1323	2021-07-03 02:04:39 +02:00
github-actions[bot]	f6e6b82df5	updated translation base	2021-07-02 23:10:57 +00:00
Oliver	802294632d	Merge pull request #1748 from matmair/email-warning ... changes email-warning to yellow #1732	2021-07-03 09:09:51 +10:00
github-actions[bot]	7b8d056d19	updated translation base	2021-07-02 22:41:45 +00:00
Oliver	2b90190230	Merge pull request #1746 from matmair/human-readable-cur ... make currency selection options human-readable	2021-07-03 08:40:15 +10:00
Matthias	f46d9537ec	changes email-warning to yellow #1732	2021-07-03 00:36:07 +02:00
Matthias	23bd6acc94	changed doc string	2021-07-03 00:18:41 +02:00
Matthias	54cb8fa736	adds depleted stock to index	2021-07-03 00:08:00 +02:00
Matthias	1bfa3cdd63	makes currency selection human-readable	2021-07-02 20:02:15 +02:00
Oliver	8c3a4b60ab	Refactoring forms for order line items ... - Required some fixes for money serializer -	2021-07-03 01:17:29 +10:00
Matthias	f8e2d53ad4	Merge branch 'master' of https://github.com/inventree/InvenTree into one-pricing-view	2021-07-02 16:44:43 +02:00
Matthias	628e365c6a	fix for bom-pricing chart not showing up	2021-07-02 16:44:25 +02:00
Oliver	1cdf03ef49	Added MinMoneyValidator to InvenTreeModelMoneyField ... - Refactor edit and delete forms for PurchaseOrderLineItem	2021-07-03 00:34:41 +10:00
Matthias	f051714a75	style fix	2021-07-02 16:34:06 +02:00
Matthias	9c8717574a	implement purchase price filter for stock table ... Closes #1717	2021-07-02 16:31:42 +02:00
Oliver	993abd9d91	Refactor forms for sales orders	2021-07-03 00:14:36 +10:00
Oliver	984828f3bb	Specify 'default' functions for 'reference' field in SalesOrder and PurchaseOrder ... - Refactor CreatePurchaseOrder form - Some migrations	2021-07-02 23:59:02 +10:00
Oliver	7e5c9aa043	Refactor PurchaseOrderEdit form	2021-07-02 23:04:53 +10:00
Oliver	5e9372f2d6	Add API endpoints for Owner model ... - Will be necessary for PurchaseOrder, SalesOrder and BuildOrder forms	2021-07-02 22:45:42 +10:00
github-actions[bot]	5739b73fb0	updated translation base	2021-07-02 12:14:25 +00:00
Oliver	ded0fb5353	L10 (#1740) ... * 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 * 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 * 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 * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.po from Crowdin * Fix: New translations django.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 Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2021-07-02 22:13:14 +10:00
Oliver	2ff9b23647	Fixes for company serializer	2021-07-02 22:02:18 +10:00
Oliver	298d870b44	Refactor CompanyDelete view	2021-07-02 21:55:59 +10:00
Oliver	bb4a53bb81	Merge remote-tracking branch 'inventree/master' into l10 ... # 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-07-02 21:48:49 +10:00
Oliver	227d202e68	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-07-02 21:48:09 +10:00
Oliver	07910766b3	select2 fixes	2021-07-02 21:36:41 +10:00
Oliver	a47948ffe0	Include model name in metadata	2021-07-02 21:18:02 +10:00
Oliver	2a4cbd6eb9	Refactor setRelatedFieldData function	2021-07-02 21:17:20 +10:00
Oliver	6d73265f0e	Add support for custom placeholder text	2021-07-02 19:47:47 +10:00
Oliver	3756bd6668	CSS tweaks	2021-07-02 19:44:37 +10:00
Oliver	746a0210fe	Add option to focus on a particular field when launching	2021-07-02 19:40:02 +10:00
Oliver	c7f834e547	Display message when action is not allowed	2021-07-02 19:34:40 +10:00
Oliver	366a2d57c3	Improve docstring	2021-07-02 19:27:19 +10:00
Oliver	2e3bfd18cc	Starting work on "secondary modal" functionality	2021-07-02 17:47:18 +10:00
Oliver	291149d733	New modal forms automatically work themselves out	2021-07-02 17:46:54 +10:00