9592 Commits

Author	SHA1	Message	Date
Oliver	0a21512329	Adds refresh and filtering for "company" table	2021-12-21 16:41:34 +11:00
Oliver	52ca2e5068	Add another check for merging stock	2021-12-21 09:29:12 +11:00
Oliver	dd53748f9f	Cleanup models	2021-12-21 08:49:53 +11:00
Oliver	785c5edf96	Reduce verbosity of translation coverage stats script	2021-12-21 08:13:38 +11:00
Oliver	fcb2bb2a46	Fix behaviour on deleting parent stock item	2021-12-21 01:03:37 +11:00
Oliver	552ca8e5c4	Adds javascript function to merge multiple stock items together	2021-12-20 22:09:08 +11:00
Oliver	31dbb9563b	Add some unit tests for the new endpoint	2021-12-20 21:25:27 +11:00
Oliver	943b27e195	Adds "items" list to API endpoint	2021-12-20 19:29:08 +11:00
Oliver	5ca50022b9	Incremenent API version	2021-12-20 18:47:51 +11:00
Oliver	fdf79065a9	Adds framework for API endpoint and serializer to merge stock items	2021-12-20 18:03:08 +11:00
Oliver	189f836e47	Merge pull request #2466 from SchrodingersGat/depleted-badge ... Float "depleted" badge to the right	2021-12-20 14:25:03 +11:00
Oliver	c060bc0815	Float "depleted" badge to the right	2021-12-20 13:30:54 +11:00
Oliver	ec4f898562	Cleanup search results page	2021-12-20 13:10:48 +11:00
Oliver	81a3547120	Hide "receive parts" button for orders which have been cancelled	2021-12-20 11:17:29 +11:00
Oliver	30f509ad32	Clip overflow	2021-12-16 08:27:55 +11:00
Matthias	0ee36b360d	Merge branch 'master' of https://github.com/inventree/InvenTree into api-mixin	2021-12-15 00:22:34 +01:00
Matthias Mair	3ed8fc6ad4	Merge branch 'inventree:master' into webhooks	2021-12-15 00:21:03 +01:00
Oliver	597d26d3d4	Merge pull request #2452 from SchrodingersGat/bom-export-form-fixes ... BOM export form fixes	2021-12-14 23:15:51 +11:00
sintech	58364bb3b5	JS style fix	2021-12-14 11:30:09 +03:00
Matthias	251fdeb69e	PEP fixes	2021-12-13 18:01:20 +01:00
sintech	b6d9bc3093	Remove treeview state saving.	2021-12-13 15:51:34 +03:00
Oliver	36026a9217	PEP fixes	2021-12-13 23:15:06 +11:00
Oliver	922b8b1c30	Fix typo ... (cherry picked from commit 673a5779f9dd08aee3b821104e8c4bec3c83280e)	2021-12-13 23:12:18 +11:00
Oliver	01ce752a8c	BOM export options are now han ... (cherry picked from commit c797eb07037237a6ce273d1783f99d43551f77de)	2021-12-13 23:12:11 +11:00
Oliver	88fc0393b7	Logic fix for boolean fields in JS forms ... (cherry picked from commit 10dec7743e083ccffdd819b36b231189b26ca8d9)	2021-12-13 23:11:56 +11:00
Oliver	d75ce451be	Allow user to select file format when downloadin BOM import template ... (cherry picked from commit 8030ca0bb9be0ce564d041b406f0024512f99000)	2021-12-13 23:11:42 +11:00
Matthias	8e962c0c59	add mixin to consum a single API	2021-12-13 08:03:19 +01:00
sintech	40f73b00ce	Propagate expanded state all the way to the root	2021-12-12 19:59:18 +03:00
sintech	e9650a94f3	Do not show icons for childless categories	2021-12-12 19:57:30 +03:00
Oliver	a2357b5b46	Fix decimal places for money field	2021-12-12 22:18:29 +11:00
Matthias	41302398e9	managment and invoke commands to remove mfa	2021-12-11 23:07:37 +01:00
Matthias	67b3c339b9	add back button to setup screen	2021-12-11 22:10:05 +01:00
Matthias Mair	f6d43946b3	Merge branch 'inventree:master' into webhooks	2021-12-11 00:08:56 +01:00
Matthias Mair	89758f28b2	Merge branch 'inventree:master' into matmair/issue2201	2021-12-11 00:08:29 +01:00
Oliver	dfd7a439a6	Merge pull request #2445 from SchrodingersGat/issue2250 ... Issue2250	2021-12-11 09:15:37 +11:00
Oliver	c35971c524	Merge pull request #2448 from SchrodingersGat/build-allocation-fixes ... Correctly allow "inherited" BOM items to be allocated to a build order	2021-12-11 08:10:26 +11:00
Oliver	438bbb5c03	Translation merge (#2447) ... * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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 * Fix: New translations django.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-12-11 01:11:27 +11:00
Oliver	1dafa040f9	Move 'quantity' field	2021-12-11 01:08:18 +11:00
Oliver	d573668f81	Correctly allow "inherited" BOM items to be allocated to a build order ... - Some back-end logic was not running correctly	2021-12-11 01:05:19 +11:00
Oliver	e1a5192604	Calculate how many items to assign to sales order ... - Do not over-allocate by default	2021-12-11 00:45:53 +11:00
Oliver	b908aa2467	fix js linting issues	2021-12-11 00:33:16 +11:00
Oliver	9e16989c91	Add same breadcrumb tree for StockLocation and StockItem	2021-12-11 00:25:59 +11:00
Oliver	e9ae3eb01d	Revert to bootstrap-treeview ... - More "bootstrappy" design - Already in code base - Cleaner API	2021-12-11 00:25:44 +11:00
Oliver	3bc3ff493a	CSS tweaks	2021-12-10 22:53:24 +11:00
Oliver	7dcd166d50	Change "sidetree" to "breadcrumb-tree"	2021-12-10 22:53:19 +11:00
Oliver	8c018cf987	Add href to nav toggle (so mouse cursor changes)	2021-12-10 22:31:50 +11:00
Oliver	ffe970d139	Move "sidetree" to underneath breadcrumbs	2021-12-10 22:31:11 +11:00
Matthias	e6ad22ec15	fix plugin urlpattern patching	2021-12-10 01:34:47 +01:00
Matthias Mair	ac0a5d4efc	Merge branch 'inventree:master' into webhooks	2021-12-09 23:56:18 +01:00
Matthias Mair	75aeab48b8	Merge branch 'inventree:master' into matmair/issue2250	2021-12-09 23:56:08 +01:00