2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-22 14:50:53 +00:00
Commit Graph

10780 Commits

Author SHA1 Message Date
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
c703f9993f make url simpler 2021-12-06 22:37:42 +01:00
8e425e67a1 reduce 2021-12-06 22:37:17 +01:00
70939a0cf9 first working example 2021-12-06 22:35:14 +01:00
de4d057b93 Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2250 2021-12-06 01:37:48 +01:00
9ebbf8190c add tree to replication 2021-12-06 01:35:14 +01:00
416bcb822b remove unneeded sidebar block 2021-12-06 01:34:16 +01:00
49f9cc7edc modifiy sidebar code 2021-12-06 01:33:41 +01:00
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
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
da020f6fd6 Remove extra options 2021-12-06 09:05:13 +11:00
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
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
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
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
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
529987bb17 remove unneeded Todo 2021-12-04 19:52:56 +01:00
ed5bb3d264 turn around template loader order 2021-12-04 19:49:43 +01:00
5567ee432a more coverage 2021-12-04 18:50:49 +01:00
d156e4c431 make simpler 2021-12-04 18:44:31 +01:00
2413119cc1 seperate wrong implementations into own cases 2021-12-04 18:42:08 +01:00
bb2ad7c2cb Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-12-04 18:04:47 +01:00
1060f60117 Merge branch 'inventree:master' into webhooks 2021-12-04 17:53:21 +01:00
2a0e07abe0 Merge branch 'inventree:master' into matmair/issue2201 2021-12-04 17:53:13 +01:00
0d9f76a019 Merge branch 'inventree:master' into matmair/issue2279 2021-12-04 17:52:58 +01:00
2ef8c25c05 directer import 2021-12-04 17:46:04 +01:00
8724471fc0 rename 2021-12-04 17:45:52 +01:00
ce726f89a1 refactor wrong implementations into own testcase 2021-12-04 17:45:40 +01:00
13b390d69b test that single errors do not kill the whole 2021-12-04 17:44:10 +01:00
cfd509adb4 PEP fix 2021-12-04 17:43:11 +01:00
58f0838d3d improve coverage 2021-12-04 17:24:41 +01:00
0b6cceb998 this should not happen 2021-12-04 17:23:35 +01:00
cccbc567fe delivery must be true 2021-12-04 17:23:04 +01:00
120870712a Merge pull request #2420 from SchrodingersGat/assigned-to-me
Assigned to me
2021-12-04 23:08:08 +11:00
66462d0a68 Fix for APIFilter 2021-12-04 22:07:55 +11:00
20dac08158 PEP fixes 2021-12-04 21:31:39 +11:00
9e1251d78d Adds "assigned_to_me" filtering to build orders 2021-12-04 21:30:11 +11:00
087ac0bd34 Adds filter to purchase order for "assigned to me" 2021-12-04 21:15:38 +11:00
cdf63c43aa Add autocomplete fields to admin views for "build" app 2021-12-04 20:17:36 +11:00
71aa6a910d Adds autocomplete fields to admin pages for "company" app 2021-12-04 20:14:12 +11:00
1667af4c07 Add autocomplete fields to "order" admin pages 2021-12-04 20:09:39 +11:00
e83b5f9db0 Add autocomplete admin fields for "part" app 2021-12-04 20:01:56 +11:00
cde85a5168 Add autocomplete fields to admin views for "stock" app:
- StockItem
- StockLocation
- StockItemTestResult
- StockItemAttachment
- StockItemTracking
2021-12-04 19:25:57 +11:00
ab80980b5a Translation merge (#2418)
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.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

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.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

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.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

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.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

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.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

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.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

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.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-12-04 19:11:17 +11:00
9ec5e39c50 js tweaks 2021-12-04 17:50:25 +11:00
9e35c52b1d unit testing fixes 2021-12-04 17:30:13 +11:00
7016c253a8 fix test to trigger 2021-12-04 04:38:45 +01:00
55ca284a13 Revert "this wont happen"
This reverts commit 3047bd6612.
2021-12-04 04:22:07 +01:00
3047bd6612 this wont happen 2021-12-04 04:11:42 +01:00
e25759c1ac check message counters too 2021-12-04 04:08:11 +01:00