2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-15 03:25:42 +00:00
Commit Graph

11905 Commits

Author SHA1 Message Date
502d701a70 Merge branch 'inventree:master' into pipeline 2021-12-04 17:53:02 +01:00
d9c6e6c4f4 remove version nb checks 2021-12-04 16:45:59 +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
7f86bfc6da Merge pull request #2419 from SchrodingersGat/admin-autocomplete
Add autocomplete fields to admin views
2021-12-04 21:31:52 +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
3f2cdf9dc4 Merge pull request #2199 from SchrodingersGat/partial-shipment
Create SalesOrderShipment model
2021-12-04 18:22:16 +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
31398b4c10 Sales order can now be completed via the API 2021-12-04 13:50:11 +11:00
008c52ef39 Allocation by serial number now moved to the API 2021-12-04 13:08:00 +11:00
3da5767e02 move version checks out into own check 2021-12-04 01:22:10 +01:00
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
e9796676c0 Add a progress spinner to modal forms 2021-12-04 10:44:48 +11:00
9ba6ac423d Add shipment status to sales order page 2021-12-04 10:16:51 +11:00
921ef5ae9e Tweaks to PO and SO tables 2021-12-04 10:11:18 +11:00
1215ef520d Further JS linting 2021-12-04 09:44:23 +11:00
6690001e81 Merge pull request #2415 from matmair/workflow-remaster
Workflow remaster
2021-12-04 09:36:46 +11:00
35b3bc73cc Merge remote-tracking branch 'inventree/master' into partial-shipment
# Conflicts:
#	InvenTree/order/api.py
2021-12-04 09:35:54 +11:00
3abad2f73d js linting 2021-12-04 09:33:42 +11:00
b871115484 always run style 2021-12-03 20:24:01 +01:00
c1052b6c1d only trigger version number if pullrequest 2021-12-03 20:14:48 +01:00
825b1473b2 Merge pull request #2413 from SchrodingersGat/part-po-refactor
Part PO table refactor
2021-12-03 21:36:31 +11:00
f6e1de42f5 JS linting 2021-12-03 21:16:58 +11:00
1a37564d86 Update README.md
Remove duplicated docker badge
2021-12-03 21:15:00 +11:00
767036c4ad Update README.md
Fixes build status badges
2021-12-03 21:14:18 +11:00
acfafe22c5 order lines can be received directly from the new table 2021-12-03 21:07:09 +11:00
6d90ded27f First pass at a part-purchase-order table 2021-12-03 20:54:21 +11:00
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
c93009876d UI changes 2021-12-03 20:14:09 +11:00
63f6776e83 set default ref 2021-12-03 09:00:32 +01:00
88fce1e813 Unit test fixes 2021-12-03 18:42:36 +11:00
daebae81c1 fix spelling
using c instead of k does not make it Englisch
2021-12-03 08:00:04 +01:00
86014dd4c9 fix panel headings 2021-12-03 07:58:47 +01:00
977f0e7e8d Merge pull request #2406 from matmair/workflow-remaster
One workflow for PR checks
2021-12-03 17:55:22 +11:00
d7c87300c6 Merge remote-tracking branch 'inventree/master' into partial-shipment 2021-12-03 17:31:27 +11:00
9511a66634 Merge pull request #2411 from SchrodingersGat/status-colors
Use different colors for "pending" orders status
2021-12-03 15:43:01 +11:00
7362162764 Use different colors for "pending" orders status 2021-12-03 15:20:49 +11:00
e31cf45cbc fix db name 2021-12-03 01:27:33 +01:00
7e3be4a496 rename 2021-12-03 01:18:31 +01:00
6b29e60494 Fixes for migration tests 2021-12-03 11:12:49 +11:00
83708d645c add packagelock 2021-12-03 01:11:04 +01:00