Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,291 Commits 6 Branches 99 Tags 484 MiB
88fce1e813
Commit Graph

10291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver
88fce1e813 Unit test fixes 2021-12-03 18:42:36 +11:00
Oliver
d7c87300c6 Merge remote-tracking branch 'inventree/master' into partial-shipment 2021-12-03 17:31:27 +11:00
Oliver
9511a66634
Merge pull request #2411 from SchrodingersGat/status-colors 
Use different colors for "pending" orders status
 2021-12-03 15:43:01 +11:00
Oliver
7362162764 Use different colors for "pending" orders status 2021-12-03 15:20:49 +11:00
Oliver
6b29e60494 Fixes for migration tests 2021-12-03 11:12:49 +11: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
Oliver
eca3aaa0b2
Merge pull request #2402 from matmair/matmair/issue2400 
Fix to big / small references
 2021-12-02 22:48:00 +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
29cd2ee9bd
prefix version in package 2021-12-02 11:33:02 +01:00
Matthias
fba80e1dea
remove cache 2021-12-02 11:28:30 +01:00
Matthias
0bf986c58b
remove package json 2021-12-02 11:27:10 +01:00
Matthias
22bb048d2b
try fixing jsavascript testing 2021-12-02 11:26:35 +01:00
Matthias
567a0b1c8b
use caching 2021-12-02 11:23:07 +01: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
117772a91e
so the previous thing was dump 2021-12-02 11:13:17 +01:00
Matthias
ac6eba8de1
try another ordering 2021-12-02 11:11:29 +01:00
Matthias
48f28ad5bb
move package.json 2021-12-02 11:03:24 +01:00
Matthias
695999282d
add package json 2021-12-02 11:01:37 +01:00
Oliver
5eccc828fa Revert "Re-add package.json" 
This reverts commit 9a9f3118ed.
 2021-12-02 20:59:26 +11:00
Matthias
db98006db8
remove cahce option 2021-12-02 10:58:43 +01:00
Matthias
d92b314dd4
fix npm version in workflow 2021-12-02 10:57:42 +01:00
Oliver
9a9f3118ed Re-add package.json 2021-12-02 20:53:07 +11: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
c2a6a8a30c
PEP fix 2021-12-02 10:01:20 +01:00
Matthias Mair
cf3d2d0df9
Merge branch 'inventree:master' into load-minified-fa 2021-12-02 09:23:13 +01:00
Matthias
970cec590b
only values starting with int possible -> only positive values 2021-12-02 09:06:58 +01:00
Matthias
7992755b37
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2400 2021-12-02 09:04:10 +01:00
Oliver
8c6b82d2c0
Merge pull request #2405 from SchrodingersGat/jump-to-sn 
Jump to sn
 2021-12-02 16:26:21 +11:00
Oliver
e96ff7fbba Add lookup-by-sn on part page, too 2021-12-02 16:01:28 +11:00
Oliver
98bbee8159 Adds function to lookup stock item by serial number 2021-12-02 15:55:00 +11:00
Oliver
bae0495ff4
Merge pull request #2404 from matmair/matmair/issue2403 
Add MPN to search
 2021-12-02 11:55:24 +11:00
Matthias
c4f1a81c9c
fix permissions for test 2021-12-02 01:18:45 +01:00
Matthias
b8cdcab10d
fix validation 2021-12-02 01:03:30 +01:00
Oliver
514d5662ea Serial number button CSS tweaks 2021-12-02 11:02:17 +11:00
Matthias
3bff676047
beginner mistake 
it is a referenced part so use related_name as prefix
 2021-12-02 00:24:36 +01:00
Matthias
8c3b4badfb
and cleanup again 2021-12-02 00:08:46 +01:00