933 Commits

Author	SHA1	Message	Date
Matthias	e7b189ba29	fix templates	2022-05-02 22:41:24 +02:00
Matthias	8f3899ffe6	move migrations	2022-05-02 22:10:50 +02:00
Matthias Mair	0c338cb2ae	Merge branch 'inventree:master' into matmair/issue2788	2022-05-02 21:50:57 +02:00
Oliver Walters	e87a02638e	Merge remote-tracking branch 'inventree/master' into order-parts-wizard ... # Conflicts: # InvenTree/order/serializers.py # InvenTree/templates/js/translated/model_renderers.js	2022-05-02 16:11:11 +10:00
Matthias	de6507e918	update translation commands	2022-05-01 22:03:49 +02:00
Matthias	67ab45bdee	update depreciated paths	2022-05-01 22:00:18 +02:00
Matthias	d05472b30c	upgrade to pyhton 3.9 syntax ... using pyupgrade	2022-05-01 21:53:12 +02:00
Matthias	58901a8cf6	fix migrations	2022-05-01 00:15:02 +02:00
Matthias	0c72fa180c	fix model backtrack	2022-05-01 00:09:17 +02:00
Matthias	132f4aa82e	Use set_null instead	2022-05-01 00:07:13 +02:00
Matthias	4180336705	comment out not used variable	2022-04-28 00:51:35 +02:00
Matthias	87aeed9ab3	disable broken test	2022-04-28 00:46:59 +02:00
Matthias	6319beb14e	only print if models found	2022-04-28 00:42:28 +02:00
Matthias	f1ee206c53	fix typo	2022-04-28 00:37:55 +02:00
Oliver Walters	b8ca7fb092	Merge remote-tracking branch 'inventree/master' into order-parts-wizard ... # Conflicts: # InvenTree/templates/js/translated/model_renderers.js	2022-04-26 21:22:31 +10:00
Matthias Mair	3e39f99ccb	Merge branch 'inventree:master' into matmair/issue2788	2022-04-19 18:24:15 +02:00
Matthias Mair	b3dca68c6b	Merge branch 'inventree:master' into matmair/issue2694	2022-04-19 18:24:12 +02:00
Oliver Walters	c7257a1bd3	build order	2022-04-10 20:03:40 +10:00
Oliver Walters	1c60d4e152	Refactor notes for "purchase order"	2022-04-10 19:55:32 +10:00
Oliver Walters	ed69f06620	Merge remote-tracking branch 'inventree/master' into order-parts-wizard	2022-04-07 18:54:00 +10:00
eeintech	ad366ef0bd	Fix part and po files import	2022-04-06 16:45:23 -04:00
Matthias	66e14b6ad0	move helper function to models.py	2022-04-02 00:01:38 +02:00
Matthias	57f9ef75e9	enable all functions for deleted company	2022-04-01 23:55:08 +02:00
Matthias	1d24f3586d	PEP fix	2022-03-30 01:35:21 +02:00
Matthias	e7f940810a	PEP style fix	2022-03-30 01:32:41 +02:00
Matthias	48441ea48e	add docstring	2022-03-30 01:32:29 +02:00
Matthias	aa30e62ad8	[BUG] Deleting a Customer Breaks Associated Sales Orders ... Add special protected deleted company Fixes #2788	2022-03-30 01:29:36 +02:00
Matthias	05cc34f573	add test for so	2022-03-29 22:54:15 +02:00
Matthias	03328088a2	add missing migrations	2022-03-29 00:03:19 +02:00
Matthias	1387709281	remove coverage from reverse action	2022-03-29 00:01:34 +02:00
Matthias	4cde888be6	fix docstrings	2022-03-28 23:59:50 +02:00
Matthias	5dcb84ec0f	stop adding blank part entries	2022-03-28 23:59:28 +02:00
Matthias	2bbad1d387	add unit test for migration	2022-03-28 23:52:26 +02:00
Matthias	760dafcdb2	use sub-context for migrations	2022-03-27 23:18:20 +02:00
Matthias	a724908423	remove blank line	2022-03-27 23:14:28 +02:00
Matthias	7a32f8edfc	add migration to convert items	2022-03-27 04:18:19 +02:00
Matthias	085a7c7d11	unify migrations	2022-03-27 03:16:49 +02:00
Matthias	a1a743513f	add context to extra lines	2022-03-27 01:55:55 +01:00
Matthias	68a02af9cd	finish renaming SO / PO	2022-03-27 01:41:16 +01:00
Matthias	bff2fb81f3	rename AdditionalLineItems to ExtraLine	2022-03-27 01:11:25 +01:00
Oliver Walters	64bbcd2570	Add validation checks for the PurchaseOrderLineItem serializer	2022-03-21 22:41:50 +11:00
Matthias Mair	cc50eff3a1	Merge branch 'master' into matmair/issue2694	2022-03-20 02:29:20 +01:00
Oliver	e691536a84	Remove redundant table on Part page	2022-03-16 23:13:29 +11:00
Oliver	6ca61e2cd7	Fix rendering for "sales order allocations" table	2022-03-16 23:09:18 +11:00
Oliver	d1338e210e	Only display "outstanding" sales order allocations in table	2022-03-16 23:01:46 +11:00
Matthias Mair	69a792a520	Merge branch 'inventree:master' into matmair/issue2694	2022-03-14 23:14:17 +01:00
Matthias	b977a8c124	[BUG] Wrong icon on the place order button ... Use paper plane as symbol Fixes #2742	2022-03-11 23:27:51 +01:00
Matthias	4b8a2e3c1f	fix js function call	2022-03-11 02:18:46 +01:00
Matthias	6516d9dbe6	fix permission check	2022-03-11 02:18:24 +01:00
Matthias	b34f39cc44	fix wrong fix ;-)	2022-03-11 02:16:05 +01:00
Matthias	f1f0027cef	fix wrong reference for POs	2022-03-11 02:10:21 +01:00
Matthias	98ea838ec4	fix serializer	2022-03-11 01:55:13 +01:00
Matthias	934754ddff	migration for PO additional item	2022-03-11 01:18:50 +01:00
Matthias	f5d3a64aef	add missing class	2022-03-11 01:18:26 +01:00
Matthias	721f2cb63b	PEP fix	2022-03-11 01:04:37 +01:00
Matthias	2e05cc670d	fix definition	2022-03-11 01:04:29 +01:00
Matthias	e841b7faf6	add HTML templates for PO	2022-03-11 00:58:18 +01:00
Matthias	84dd85852b	fix naming	2022-03-11 00:46:42 +01:00
Matthias	c69fdf90d9	add PO serializer	2022-03-11 00:34:16 +01:00
Matthias	2ae038a006	use abstract classes	2022-03-11 00:33:59 +01:00
Matthias	e2d301be3f	add total to PO serializer	2022-03-11 00:26:27 +01:00
Matthias	d086f09771	use more abstract definitions	2022-03-11 00:25:58 +01:00
Matthias	0a1961bc31	Add additionallLineItems for POs	2022-03-11 00:22:11 +01:00
Matthias	84a95aaadb	spelling fix	2022-03-11 00:21:43 +01:00
Matthias	c6d0c03adf	more abstraction	2022-03-11 00:21:33 +01:00
Matthias	72d565d17a	move to abstract model	2022-03-11 00:20:36 +01:00
Matthias	2036164ef1	add po API endpoints	2022-03-11 00:09:07 +01:00
Matthias	c30e8d9b4e	make more generalised	2022-03-11 00:08:39 +01:00
Matthias	df418c503e	reduce duplication	2022-03-11 00:02:18 +01:00
Matthias	6ef7cb82b4	Add admin for PO additional line	2022-03-10 23:57:59 +01:00
Matthias Mair	ec021624cd	Merge branch 'inventree:master' into matmair/issue2694	2022-03-08 21:26:21 +01:00
Oliver	09ff4862ec	Unit test fixes	2022-03-07 14:43:55 +11:00
Matthias	174bba90ab	total read only	2022-03-06 23:49:36 +01:00
Matthias	7a54cb4cb8	merge migrations	2022-03-06 23:38:59 +01:00
Matthias	5336d09296	fix api values	2022-03-06 23:34:01 +01:00
Matthias	f0b19e69b8	add total price woth js reload	2022-03-06 23:21:33 +01:00
Matthias	de11b3463e	add API schema	2022-03-06 18:44:05 +01:00
Matthias	3452880d2a	add search to API	2022-03-06 18:43:40 +01:00
Matthias	acec4fa5d5	remove titile	2022-03-06 18:43:27 +01:00
Matthias	ed75970010	ad UI components	2022-03-06 18:42:10 +01:00
Matthias	aed708d339	PEP fix	2022-03-05 23:25:00 +01:00
Matthias	b81d2b8410	cut back on modifications	2022-03-05 23:10:20 +01:00
Matthias	157f0e72a7	[FR] Add delivery cost (excluding unit cost that already exists) in PO ... Fixes #2694	2022-03-04 01:06:39 +01:00
Oliver	846899fa53	Adds ability to download purchase order line item table	2022-03-04 00:45:30 +11:00
Oliver	0ac86417a7	Adds "duplicate line item" button to purchase order and sales order tables	2022-03-04 00:36:26 +11:00
Oliver	5d37ce9175	Merge remote-tracking branch 'inventree/master' into date-format	2022-03-01 08:18:24 +11:00
Oliver	c4d462b0b4	Merge pull request #2684 from SchrodingersGat/po-target-date ... Order target date improvements	2022-03-01 08:17:54 +11:00
Oliver	421db61f21	Adding unit testing for new features	2022-02-28 23:09:57 +11:00
Oliver	73484192a5	Add "batch code" and "serial numbers" serializer fields when receiving stock items against a purchase order	2022-02-28 22:47:41 +11:00
Oliver	b00ae67d68	Pass dates in templates through the new template tag	2022-02-28 19:10:33 +11:00
Oliver	7c82857cc7	Remove unique_together requirement for purchaseorderlineitem ... - Allow a single purchase order to specify duplicate lines (e.g. split shipments / order scheduling)	2022-02-28 15:27:56 +11:00
Oliver	4858787a78	Adds "overdue" field to sales order line item ... - API serializer - front end / UX tables	2022-02-28 15:24:01 +11:00
Oliver	b451f3d149	adds target_date field when adding a new line item to a purchase order	2022-02-28 15:11:10 +11:00
Oliver	9e82b28e9d	Update PO line item table	2022-02-28 15:03:39 +11:00
Oliver	df7713f6c2	Adds "overdue" annotation field to POLineItem serializer	2022-02-28 15:03:22 +11:00
Oliver	557aa44904	Adds "target_date" field to PurchaseOrderLineItem and SalesOrderLineItem models ... - Allows different target dates to be specified for different line items - If not set (null) then the base "target_date" parameter for the parent order is used	2022-02-28 14:26:01 +11:00
Matthias	dbb4c3f407	Merge branch 'master' of https://github.com/inventree/InvenTree into coverage-fixes	2022-02-13 17:46:09 +01:00
Matthias	22bc0b3d90	ignore exception ref	2022-02-13 05:21:43 +01:00
Matthias	a4c6d0e6c5	fix migration coverage for orders	2022-02-13 04:49:08 +01:00
Matthias	bc17536e6d	fix quotes	2022-02-13 03:49:52 +01:00
Matthias	aa3192a106	Merge branch 'master' of https://github.com/inventree/InvenTree into template-reduce-duplication	2022-02-12 00:55:39 +01:00
Oliver	dbf1e1b463	Fix logic for enabling "place order" button	2022-02-08 08:59:42 +11:00
Oliver	64b1523013	Do not hide the "submit order" button	2022-02-07 13:55:25 +11:00
Oliver	f6ffef66e0	Fixes for new "allocation" tab ... - Fix broken link - Add "description" column - Add thumbnail images	2022-01-27 16:25:26 +11:00
Oliver	5ec1d5aab8	Display allocations for individual stock items	2022-01-27 15:21:04 +11:00
Oliver Walters	9a2d47cd53	style fixes	2022-01-26 23:17:58 +11:00
Oliver Walters	681e007092	Add clean() function for PurchaseOrderLineItem ... Also adds renderer for purchaseorder model	2022-01-26 22:56:00 +11:00
Matthias	2e0198e7cd	refactor field matching	2022-01-21 01:20:32 +01:00
Matthias	3c02c918b2	reduce code in wizard templates	2022-01-21 01:12:11 +01:00
Matthias	ff897ccc41	remove dead code	2022-01-21 00:30:51 +01:00
eeintech	391836689d	Allow decimal for quantity received on PO	2022-01-17 09:04:14 -05:00
Oliver	1243923944	Event refactoring	2022-01-10 17:28:44 +11:00
Oliver	886b1f1d72	Simplify event triggering ... - add generic receivers for database actions - exclude django_q tables, otherwise we get an infinite loop! Ref: https://stackoverflow.com/questions/17507784/consolidating-multiple-post-save-signals-with-one-receiver/32230933#32230933	2022-01-10 17:24:53 +11:00
Oliver	13d8bf437a	PEP fixes	2022-01-10 09:02:11 +11:00
Oliver	2370e41961	Add multiple triggered events for the "order" app	2022-01-10 09:01:17 +11:00
Matthias	95ee4f908f	Merge branch 'master' of https://github.com/inventree/InvenTree into sn-append	2021-12-29 23:45:19 +01:00
Matthias	2ec41b02f8	append information about next serial numbe to fnc call ... Fixes #2484	2021-12-29 03:01:52 +01:00
Oliver	943b27e195	Adds "items" list to API endpoint	2021-12-20 19:29:08 +11:00
Oliver	463192e0b9	Improved table filtering for "purchase order" table (as seen from "part" view)	2021-12-07 10:33:09 +11:00
Oliver	120870712a	Merge pull request #2420 from SchrodingersGat/assigned-to-me ... Assigned to me	2021-12-04 23:08:08 +11:00
Oliver	66462d0a68	Fix for APIFilter	2021-12-04 22:07:55 +11:00
Oliver	20dac08158	PEP fixes	2021-12-04 21:31:39 +11:00
Oliver	087ac0bd34	Adds filter to purchase order for "assigned to me"	2021-12-04 21:15:38 +11:00
Oliver	1667af4c07	Add autocomplete fields to "order" admin pages	2021-12-04 20:09:39 +11:00
Oliver	9e35c52b1d	unit testing fixes	2021-12-04 17:30:13 +11:00
Oliver	31398b4c10	Sales order can now be completed via the API	2021-12-04 13:50:11 +11:00
Oliver	008c52ef39	Allocation by serial number now moved to the API	2021-12-04 13:08:00 +11:00
Oliver	e9796676c0	Add a progress spinner to modal forms	2021-12-04 10:44:48 +11:00
Oliver	9ba6ac423d	Add shipment status to sales order page	2021-12-04 10:16:51 +11:00
Oliver	35b3bc73cc	Merge remote-tracking branch 'inventree/master' into partial-shipment ... # Conflicts: # InvenTree/order/api.py	2021-12-04 09:35:54 +11:00
Oliver	43ee4e390a	API updates ... - Allow filtering of POLineItem list endpoint by base part instance - Include "order detail" in POLineItem serializer	2021-12-03 20:53:59 +11:00
Oliver	c93009876d	UI changes	2021-12-03 20:14:09 +11:00
Oliver	88fce1e813	Unit test fixes	2021-12-03 18:42:36 +11:00
Oliver	6b29e60494	Fixes for migration tests	2021-12-03 11:12:49 +11:00
Oliver	3c3dd9368d	Do not auto-complete salesorder when shipment is done ... - User might want to add more line items?	2021-12-03 00:45:44 +11:00
Oliver	732034d9e5	Merge conflicting migrations	2021-12-03 00:43:10 +11:00
Oliver	80b615bfb7	Import fix	2021-12-03 00:08:05 +11:00
Oliver	93173ef1ee	Merge remote-tracking branch 'inventree/master' into partial-shipment ... # Conflicts: # InvenTree/order/serializers.py	2021-12-02 23:58:52 +11:00
Oliver	ecf70b6d4d	Some PEP fixes	2021-12-02 23:58:02 +11:00
Oliver	e1668c8662	More stuffs: ... - Allow filtering of salesorderlineitem by "completed" status - Allow deletion of (empty) shipment - Show which items are going to be shipped	2021-12-02 23:52:53 +11:00
Oliver	e74e7138a9	More stuff: ... - Pass tracking number through when completing a shipment - Reload tables automatically when certain actions are performed - Limit stock items to only those with available stock	2021-12-02 21:59:59 +11:00
Oliver	d5ace1a8da	Differentiate between "fully allocated" and "partially allocated" in stock item table	2021-12-02 21:46:05 +11:00
Oliver	6ec0cfc641	Merge branch 'master' into partial-shipment ... # Conflicts: # InvenTree/company/templates/company/company_base.html # InvenTree/stock/templates/stock/item_base.html	2021-12-02 20:49:13 +11:00
Matthias	c2a6a8a30c	PEP fix	2021-12-02 10:01:20 +01:00
Matthias	970cec590b	only values starting with int possible -> only positive values	2021-12-02 09:06:58 +01:00
Matthias	c4f1a81c9c	fix permissions for test	2021-12-02 01:18:45 +01:00
Matthias	fc6f1b4acc	unittests to show the fix works	2021-12-01 23:45:16 +01:00
Matthias	dc65634abc	use mixin on all serializers whos models use ReferenceIndexingMixin	2021-12-01 23:36:21 +01:00
Matthias	3b5e9d3283	use BigIntegerField for a hugher range ;-)	2021-12-01 22:39:53 +01:00
Oliver	fd02197851	Refactor purchase order page	2021-11-30 20:39:28 +11:00