11654 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Oliver	01ce752a8c	BOM export options are now han ... (cherry picked from commit c797eb0703)	2021-12-13 23:12:11 +11:00
Oliver	88fc0393b7	Logic fix for boolean fields in JS forms ... (cherry picked from commit 10dec7743e)	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 8030ca0bb9)	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	95db82a4ea	Merge pull request #2450 from SchrodingersGat/bom-pricing-fix ... Fix decimal places for money field	2021-12-12 22:51:50 +11:00
Oliver	f641a3a014	Merge pull request #2449 from inventree/dependabot/pip/django-3.2.10 ... Bump django from 3.2.5 to 3.2.10	2021-12-12 22:19:03 +11:00
Oliver	a2357b5b46	Fix decimal places for money field	2021-12-12 22:18:29 +11:00
dependabot[bot]	f9b1305f9c	Bump django from 3.2.5 to 3.2.10 ... Bumps [django](https://github.com/django/django) from 3.2.5 to 3.2.10. - [Release notes](https://github.com/django/django/releases) - [Commits](https://github.com/django/django/compare/3.2.5...3.2.10) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2021-12-12 10:06:07 +00:00
Oliver	a56cf5ce49	Merge pull request #2221 from matmair/matmair/issue2201 ... 2FA with TOTP	2021-12-12 21:04:41 +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	05abe40978	Merge pull request #2446 from SchrodingersGat/so-allocation-quantity ... Calculate how many items to assign to sales order	2021-12-11 01:08:21 +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
Matthias	869324249e	Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201	2021-12-09 23:54:55 +01:00
Matthias	18244f0adf	docstring	2021-12-09 23:54:23 +01:00
Matthias	ceb06c6e62	require MFA for admin if set	2021-12-09 23:54:02 +01:00
Oliver	2b27fab771	Merge pull request #2436 from SchrodingersGat/assign-to-customer ... Assign to customer	2021-12-09 10:41:57 +11:00
Oliver	fefe39b88d	Fixes for unit tests	2021-12-09 10:04:33 +11:00
Oliver	c1163b9f6b	Adds missing semicolon	2021-12-09 09:07:36 +11:00
Matthias	ba921b45ff	remove state from api interface	2021-12-08 22:44:01 +01:00
Matthias	3a3f8ba4ef	Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201	2021-12-08 18:31:33 +01:00
Matthias Mair	b8404c44b4	Merge branch 'inventree:master' into webhooks	2021-12-08 18:28:11 +01:00
Matthias	cfa576d03d	Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2250	2021-12-08 18:26:49 +01:00
Oliver	4a453b0a35	Assign multiple stock items to a customer at one	2021-12-09 00:33:45 +11:00
Oliver	96a885e4e1	client side form for assigning stock items to customers	2021-12-09 00:20:45 +11:00
Oliver	c36687af22	Add unit test for new API serializer	2021-12-08 23:45:47 +11:00
Oliver	e0d52843a4	Basic stock assignment serializer implementation	2021-12-08 23:42:27 +11:00
Oliver	88840e6adb	Merge pull request #2435 from SchrodingersGat/old-session-fix ... Remove old task to delete expired sessions	2021-12-08 22:49:51 +11:00
Oliver	b19a7cc4fb	Run at app startup, not as a migration	2021-12-08 22:26:59 +11:00
Matthias	1cc1fca5fe	set background color	2021-12-08 02:06:55 +01:00
Matthias	2725a2eb87	disable icons	2021-12-08 02:01:26 +01:00