Commit Graph

10909 Commits

Author SHA1 Message Date
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
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
Oliver
cde85a5168 Add autocomplete fields to admin views for "stock" app:
- StockItem
- StockLocation
- StockItemTestResult
- StockItemAttachment
- StockItemTracking
2021-12-04 19:25:57 +11:00
Oliver
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
Oliver
3f2cdf9dc4
Merge pull request #2199 from SchrodingersGat/partial-shipment
Create SalesOrderShipment model
2021-12-04 18:22:16 +11:00
Oliver
9ec5e39c50 js tweaks 2021-12-04 17:50:25 +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
Matthias
3da5767e02
move version checks out into own check 2021-12-04 01:22:10 +01:00
Matthias Mair
6bc3e3ccbb
Workflow remaster (#2416)
* Workflow remaster (#28)

* set default ref

* only trigger version number if pullrequest

* try skipping just a step

* Workflow remaster (#29)

* set default ref

* only trigger version number if pullrequest

* always run style

* try skipping just a step

* try adding a step so everything continues

* Workflow remaster (#30)

* set default ref

* only trigger version number if pullrequest

* always run style

* try skipping just a step

* try adding a step so everything continues

* maybe this does not fail them

* skip ahead

* do not skip the whole job, just the steps
2021-12-04 11:01:18 +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
921ef5ae9e Tweaks to PO and SO tables 2021-12-04 10:11:18 +11:00
Oliver
1215ef520d Further JS linting 2021-12-04 09:44:23 +11:00
Oliver
6690001e81
Merge pull request #2415 from matmair/workflow-remaster
Workflow remaster
2021-12-04 09:36:46 +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
3abad2f73d js linting 2021-12-04 09:33:42 +11:00
Matthias
b871115484
always run style 2021-12-03 20:24:01 +01:00
Matthias
c1052b6c1d
only trigger version number if pullrequest 2021-12-03 20:14:48 +01:00
Oliver
825b1473b2
Merge pull request #2413 from SchrodingersGat/part-po-refactor
Part PO table refactor
2021-12-03 21:36:31 +11:00
Oliver
f6e1de42f5 JS linting 2021-12-03 21:16:58 +11:00
Oliver
1a37564d86
Update README.md
Remove duplicated docker badge
2021-12-03 21:15:00 +11:00
Oliver
767036c4ad
Update README.md
Fixes build status badges
2021-12-03 21:14:18 +11:00
Oliver
acfafe22c5 order lines can be received directly from the new table 2021-12-03 21:07:09 +11:00
Oliver
6d90ded27f First pass at a part-purchase-order table 2021-12-03 20:54:21 +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