2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-04 22:38:49 +00:00

10691 Commits

Author SHA1 Message Date
Matthias
daebae81c1
fix spelling
using c instead of k does not make it Englisch
2021-12-03 08:00:04 +01:00
Matthias
86014dd4c9
fix panel headings 2021-12-03 07:58:47 +01:00
Matthias
6e464447f5
markers for notification tests 2021-12-03 07:51:21 +01:00
Oliver
d7c87300c6 Merge remote-tracking branch 'inventree/master' into partial-shipment 2021-12-03 17:31:27 +11:00
Oliver
7362162764 Use different colors for "pending" orders status 2021-12-03 15:20:49 +11:00
Matthias
2917af9715
add marker statment to wrong implementations 2021-12-03 02:02:51 +01:00
Matthias
79bab93afc
refactor into new test file 2021-12-03 02:01:17 +01:00
Matthias
cf6415ddba
Merge branch 'matmair/issue2279' of https://github.com/matmair/InvenTree into matmair/issue2279 2021-12-03 01:58:53 +01:00
Matthias
f4f390f4c2
PEP fix 2021-12-03 01:58:27 +01:00
Oliver
6b29e60494 Fixes for migration tests 2021-12-03 11:12:49 +11:00
Matthias
0f0460f8ea
merge 2021-12-02 17:24:07 +01:00
Matthias
329b00ae07
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-12-02 17:16:26 +01:00
Matthias Mair
4904beb45a
Merge branch 'inventree:master' into webhooks 2021-12-02 17:08:36 +01:00
Matthias Mair
932b78d3e8
Merge branch 'inventree:master' into matmair/issue2279 2021-12-02 17:08:18 +01:00
Oliver
3c3dd9368d Do not auto-complete salesorder when shipment is done
- User might want to add more line items?
2021-12-03 00:45:44 +11:00
Oliver
732034d9e5 Merge conflicting migrations 2021-12-03 00:43:10 +11:00
Oliver
96c1f74cd8
Merge pull request #2408 from SchrodingersGat/initial-stock-when-duplicating
Add option for creating initial stock quantity when duplicating a part
2021-12-03 00:29:37 +11:00
Oliver
84a4060cd9
Merge pull request #2401 from matmair/load-minified-fa
Load minified fa
2021-12-03 00:23:58 +11:00
Oliver
80b615bfb7 Import fix 2021-12-03 00:08:05 +11:00
Oliver
9ca6204d4b Add option for creating initial stock quantity when duplicating a part
Fixes https://github.com/inventree/InvenTree/issues/2407
2021-12-03 00:05:55 +11:00
Oliver
93173ef1ee Merge remote-tracking branch 'inventree/master' into partial-shipment
# Conflicts:
#	InvenTree/order/serializers.py
2021-12-02 23:58:52 +11:00
Oliver
ecf70b6d4d Some PEP fixes 2021-12-02 23:58:02 +11:00
Oliver
e1668c8662 More stuffs:
- Allow filtering of salesorderlineitem by "completed" status
- Allow deletion of (empty) shipment
- Show which items are going to be shipped
2021-12-02 23:52:53 +11:00
Matthias
6657d093d7
PEP fixes 2021-12-02 12:13:03 +01:00
Matthias
b0fb5657e8
also validate serial number 2021-12-02 12:11:09 +01:00
Oliver
e74e7138a9 More stuff:
- Pass tracking number through when completing a shipment
- Reload tables automatically when certain actions are performed
- Limit stock items to only those with available stock
2021-12-02 21:59:59 +11:00
Oliver
d5ace1a8da Differentiate between "fully allocated" and "partially allocated" in stock item table 2021-12-02 21:46:05 +11:00
Oliver
586d38fb61 Add item count to shipment table 2021-12-02 21:40:21 +11:00
Oliver
123aab89bc Adds an "available" filter for stock item API 2021-12-02 21:40:03 +11:00
Matthias
bd60364deb
maybe addd a package 2021-12-02 11:20:32 +01:00
Matthias
df9d189ca0
maybe this move helps`? 2021-12-02 11:17:35 +01:00
Matthias
48f28ad5bb
move package.json 2021-12-02 11:03:24 +01:00
Matthias
65d5ed1bdf
raise not implemented 2021-12-02 10:54:04 +01:00
Matthias
162d4347e7
more implementation tests 2021-12-02 10:53:46 +01:00
Matthias
ae13672273
refactor to enable use in notification tests 2021-12-02 10:52:21 +01:00
Oliver
6ec0cfc641 Merge branch 'master' into partial-shipment
# Conflicts:
#	InvenTree/company/templates/company/company_base.html
#	InvenTree/stock/templates/stock/item_base.html
2021-12-02 20:49:13 +11:00
Matthias
84499f4b10
better description 2021-12-02 10:22:39 +01:00
Matthias
004687a29f
test implementation checks 2021-12-02 10:14:04 +01:00
Matthias
eb5a87c530
rename test 2021-12-02 10:05:12 +01:00
Matthias
c2a6a8a30c
PEP fix 2021-12-02 10:01:20 +01:00
Matthias
1b9ca41b46
added setup function to notification method
and added calls to deliver_method
2021-12-02 09:52:30 +01:00
Matthias
803936130c
doc spell fixing 2021-12-02 09:46:50 +01:00
Matthias
4e29fed164
spell fixing 2021-12-02 09:46:12 +01:00
Matthias
7ed18c1bfd
spell fixing 2021-12-02 09:44:35 +01:00
Matthias
61b6590f52
raise if not implemented 2021-12-02 09:42:50 +01:00
Matthias Mair
cf3d2d0df9
Merge branch 'inventree:master' into load-minified-fa 2021-12-02 09:23:13 +01:00
Matthias Mair
11e527a02a
Merge branch 'inventree:master' into plugin-2037 2021-12-02 09:23:05 +01:00
Matthias Mair
fcf7f615aa
Merge branch 'inventree:master' into webhooks 2021-12-02 09:22:48 +01:00
Matthias
0379498ee3
merge master in 2021-12-02 09:17:57 +01:00
Matthias
970cec590b
only values starting with int possible -> only positive values 2021-12-02 09:06:58 +01:00