6465 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matthias	7d5aa8189d	Merge branch 'master' of https://github.com/inventree/InvenTree into part-import	2021-06-18 23:30:54 +02:00
Matthias	b86793703e	Merge branch 'part-import' of https://github.com/matmair/InvenTree into part-import	2021-06-18 23:14:48 +02:00
Matthias	59e6cc1a10	Merge branch 'master' of https://github.com/inventree/InvenTree into part-import	2021-06-18 23:10:59 +02:00
Matthias	15804f873b	Merge branch 'master' of https://github.com/inventree/InvenTree into order-modal-show-price	2021-06-18 16:46:11 +02:00
Oliver	05142d977a	Merge pull request #1684 from SchrodingersGat/rebuild-command ... Adds a management command to rebuild MPTT models	2021-06-18 22:08:43 +10:00
Oliver	9a4ccedf5c	Adds a management command to rebuild MPTT models ... - Important to do after importing records / fixtures! - Otherwise very strange things might happen especially when you try to use the API...	2021-06-18 21:53:15 +10:00
Oliver	e36414b312	Merge pull request #1316 from SchrodingersGat/part-allocation-display ... Part allocation display	2021-06-18 20:10:28 +10:00
Oliver	e68a4abdf2	Error: wrong error	2021-06-18 19:51:54 +10:00
Oliver	3fb57abe66	Error catching	2021-06-18 19:39:06 +10:00
Oliver	34c34487b5	PEP style fix	2021-06-18 19:21:46 +10:00
Oliver	778aa0314d	Load and display build order allocation items via AJAX	2021-06-18 19:18:35 +10:00
Oliver	245c9bfd28	Enhancement for the BuildItem API / serializer ... - Add optional "part_detail" information - Add optional "build_detail" information - Add optional "location_detail" information	2021-06-18 19:08:54 +10:00
Matthias Mair	8d317581dd	Merge branch 'master' into order-modal-show-price	2021-06-18 09:41:10 +02:00
Oliver	10ecddf9b4	Fixes after rebase	2021-06-18 17:25:24 +10:00
Oliver Walters	0b8a50cd92	Add 'location_detail' filter	2021-06-18 16:51:34 +10:00
Oliver Walters	caf52c6ce5	Add optional detail elements to SOAllocation API	2021-06-18 16:49:56 +10:00
Oliver Walters	ad8dbb5900	Add API LIST endpoint for SalesOrderAllocations	2021-06-18 16:48:32 +10:00
Oliver	43478a0be7	Merge pull request #1634 from matmair/internal-price ... Internal price	2021-06-18 10:36:29 +10:00
Oliver	bb910a09fb	Merge pull request #1679 from matmair/fix-for-1678 ... fix for part with no bom-price	2021-06-18 10:35:59 +10:00
Oliver	b6e3df4e6b	Merge pull request #1680 from matmair/modal-options ... more modal options	2021-06-18 10:30:18 +10:00
Matthias Mair	5bca978172	Merge branch 'inventree:master' into order-modal-show-price	2021-06-18 01:29:57 +02:00
Matthias	2cbdeae914	style-fix	2021-06-18 00:18:45 +02:00
Oliver	9991f4a694	Merge pull request #1681 from matmair/more-templatetags ... More templatetags	2021-06-18 08:18:40 +10:00
Matthias	865a2b4af8	Merge branch 'modal-options' of https://github.com/matmair/InvenTree into order-modal-show-price	2021-06-17 23:44:45 +02:00
Matthias	f0dd543ffa	render price in oer-modal if enabled in settings	2021-06-17 23:44:22 +02:00
Matthias	a3a623a5ca	update-button for modal, repeat 1st step on use	2021-06-17 23:24:32 +02:00
Matthias	2d8b96a6b8	setting to control visibility of price	2021-06-17 23:15:42 +02:00
Matthias	4c7508cd6b	tag to call a method with (multiple)args	2021-06-17 23:11:31 +02:00
Matthias	58b6bbb236	tag to read out dict value	2021-06-17 23:09:50 +02:00
Matthias	c74ee4e925	doc for option.buttons	2021-06-17 19:24:08 +02:00
Matthias	96c29847e1	add custom buttons with response	2021-06-17 19:23:30 +02:00
Matthias	3d17388b48	set modal title with response	2021-06-17 19:22:00 +02:00
Matthias	ebe2ae77a5	hide error message with response	2021-06-17 19:18:34 +02: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
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
Oliver	bc46cca9f0	Merge pull request #1677 from SchrodingersGat/new-typo-fix ... Typo fix for excluded commands	2021-06-17 22:37:45 +10: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	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	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
Matthias	bbe7edbf82	totals like in #1666	2021-06-17 00:50:10 +02: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