10935 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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
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
Oliver	e4b6306ddb	Merge pull request #2434 from wengtad/issue2428 ... fix: stock tracking table aligment	2021-12-08 10:21:31 +11:00
Oliver	c8c35e2f04	Remove old task to delete expired sessions ... - Does not apply any more with new session management	2021-12-08 09:55:41 +11:00
Weng Tad	c143826e9b	fix: stock tracking table aligment ... Fixes #2428	2021-12-07 13:59:51 +08:00
Oliver	f2b966fac5	Merge pull request #2433 from SchrodingersGat/string-fix ... Translateable string fixes	2021-12-07 11:29:44 +11:00
Oliver	af1fe021f5	Merge pull request #2432 from SchrodingersGat/po-part-filter ... Improved table filtering for "purchase order" table	2021-12-07 11:29:38 +11:00
Oliver	1a85e4f21d	Translateable string fixeas	2021-12-07 10:51:40 +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	1ad91811a5	Merge pull request #2426 from nwns/feature/qcluster_redis ... Q_CLUSTER is using the database for its broker	2021-12-07 09:24:29 +11:00
Oliver	b7f3a044d9	Merge pull request #2427 from nwns/fix/overlapping_currency ... Swallow Serialization failure while updating exchange rates	2021-12-06 09:49:54 +11:00
Oliver	07c88328ae	Merge pull request #2423 from SchrodingersGat/maintenance-mode-state-file ... Adjustments for maintenance-mode options:	2021-12-06 09:48:43 +11:00
Oliver	44d35d06f4	Merge remote-tracking branch 'inventree/master' into maintenance-mode-state-file ... # Conflicts: # InvenTree/InvenTree/settings.py	2021-12-06 09:16:44 +11:00
Oliver	da020f6fd6	Remove extra options	2021-12-06 09:05:13 +11:00
Nigel	a9f584cb65	fix: swallow Serialization failure ... We can swallow the serialization exception because there is a scheduled task that will update these later anyway. Fixes #2241	2021-12-05 09:24:57 -07:00
Nigel	561fd6afc1	fix: Q_CLUSTER is using the database for its broker ... Q_CLUSTER is using the database as its broker, and adding cache configuration for it and not using it is pointless. But rather than change Q_CLUSTER's configuration to use redis as the broker, lets just leave it using the database as the database broker has its advantages.	2021-12-05 09:04:54 -07:00
Oliver	8814868fc7	Merge pull request #2424 from SchrodingersGat/remove-schedule-delete ... Remove schedule delete	2021-12-05 19:11:00 +11:00
Oliver	93a240d9c3	Remove the "scheduled_for_deletion" field from the StockItem model ... Reverts back to the original behaviour - stock items are just deleted	2021-12-05 18:14:14 +11:00
Oliver	a821717103	Add a data migration which deletes any stock items which have been scheduled for deletion. ... Also deletes any instance of the "delete_old_stock_items" worker task	2021-12-05 17:56:39 +11:00
Oliver	ae8166984f	Adjustments for maintenance-mode options: ... - Brings the state into the same directory as the runtime config file	2021-12-05 17:28:46 +11:00
Oliver	7ba01612d8	Merge pull request #2074 from matmair/plugin-2037 ... New Plugin definition	2021-12-05 08:46:47 +11:00
Oliver	0c9590ba37	Merge pull request #2417 from matmair/pipeline ... Pipeline refactor ... again	2021-12-05 08:00:02 +11:00
Matthias	529987bb17	remove unneeded Todo	2021-12-04 19:52:56 +01:00
Matthias	ed5bb3d264	turn around template loader order	2021-12-04 19:49:43 +01:00
Matthias	bb2ad7c2cb	Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037	2021-12-04 18:04:47 +01:00
Matthias Mair	502d701a70	Merge branch 'inventree:master' into pipeline	2021-12-04 17:53:02 +01:00
Matthias	d9c6e6c4f4	remove version nb checks	2021-12-04 16:45:59 +01: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	7f86bfc6da	Merge pull request #2419 from SchrodingersGat/admin-autocomplete ... Add autocomplete fields to admin views	2021-12-04 21:31:52 +11:00
Oliver	20dac08158	PEP fixes	2021-12-04 21:31:39 +11:00
Oliver	9e1251d78d	Adds "assigned_to_me" filtering to build orders	2021-12-04 21:30:11 +11:00
Oliver	087ac0bd34	Adds filter to purchase order for "assigned to me"	2021-12-04 21:15:38 +11:00
Oliver	cdf63c43aa	Add autocomplete fields to admin views for "build" app	2021-12-04 20:17:36 +11:00
Oliver	71aa6a910d	Adds autocomplete fields to admin pages for "company" app	2021-12-04 20:14:12 +11:00
Oliver	1667af4c07	Add autocomplete fields to "order" admin pages	2021-12-04 20:09:39 +11:00
Oliver	e83b5f9db0	Add autocomplete admin fields for "part" app	2021-12-04 20:01:56 +11:00