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
2,638 Commits 6 Branches 99 Tags 484 MiB
abbd0bb16a
Commit Graph

2638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters
abbd0bb16a Bug fix in supplier-part table rendering 2020-04-28 09:05:06 +10:00
Oliver Walters
5727e27ae6 Filter by 'in stock' items when auto-allocating to build 2020-04-28 08:44:10 +10:00
Oliver Walters
4fd7b24e3c Update buttons for part BOM view 2020-04-28 08:36:13 +10:00
Oliver
c621780a2a
Merge pull request #748 from SchrodingersGat/sales-order 
Sales order [WIP]
 2020-04-27 22:14:45 +10:00
Oliver Walters
394a9208a1 Merge remote-tracking branch 'inventree/master' into sales-order 
# Conflicts:
#	InvenTree/InvenTree/version.py
 2020-04-27 22:04:05 +10:00
Oliver Walters
79836c77ef Bumped version thing 2020-04-27 22:03:15 +10:00
Oliver Walters
db9970e5df Add some further unit tests for the Build model 2020-04-27 21:44:59 +10:00
Oliver Walters
cb3fe0fc35 Add some more unit testing for the builds 2020-04-27 21:28:44 +10:00
Oliver Walters
35f48ed899 Delete BuildItem objects once a Build has been completed 
- Much more complicated template for build allocation page!
- This will require some refactoring at some point ...
 2020-04-27 20:46:34 +10:00
Oliver Walters
489dfa1823 Bug fix for a code path which resulted in a form failing validation but not showing any errors! 
This one has been here for a while!
 2020-04-27 20:45:01 +10:00
Oliver Walters
2b99cf353a Fix for build complete form 2020-04-27 20:16:41 +10:00
Oliver Walters
646dd65d27 Re-enable auto-allocation for build 2020-04-27 20:05:02 +10:00
Oliver Walters
3685ca4b95 Add some unit testing for the SalesOrder model 2020-04-27 11:32:20 +10:00
Oliver Walters
5e309a62f7 Display "Fulfilled" items 
- Once a salesorder has been marked as "shipped" then the table is displayed differently
- The sub rows show stock items which have been fulfilled against the sales order
 2020-04-27 10:31:38 +10:00
Oliver Walters
9b882f4d17 Update to latest version of django-qr-code 2020-04-27 09:17:17 +10:00
Oliver Walters
5167117067 Calculate 'fulfilled' quantity once a sales order is marked as shipped 
- This allows us to delete the SalesOrderAllocation objects from the database
 2020-04-27 08:58:18 +10:00
Oliver Walters
3c5ba75d27 PEP fixes 2020-04-26 16:44:35 +10:00
Oliver Walters
e768ada83b More work 
- Consolidated "in_stock" filter to single code location
- Improve 'limit_choices_to' for BuildItem and SalesOrderAllocation
- Various template improvements etc
 2020-04-26 16:38:29 +10:00
Oliver Walters
4147163418 Improve status code label rendering 2020-04-26 15:29:21 +10:00
Oliver
48c51151c8
Merge pull request #756 from SchrodingersGat/moar-migration-fixes-plz 
Remove the problematic migration entirely
 2020-04-26 09:00:23 +10:00
Oliver Walters
ae4717401f Add "sudo" to makefile 2020-04-26 08:56:36 +10:00
Oliver Walters
1f4bd95d75 Remove the problematic migration entirely 
- The thumbnail check code is run every time the server is started anyway!
 2020-04-26 08:50:37 +10:00
Oliver Walters
0892b160c6 "Fixes" for completing a build 
- This will require a lot of unit testing to get right
 2020-04-26 00:32:09 +10:00
Oliver Walters
72c43d0c2d Bug fix for build completion form 2020-04-25 23:59:28 +10:00
Oliver Walters
50dbebdf59 Improve rendering of BuildComplete template 2020-04-25 23:44:03 +10:00
Oliver Walters
81f789d857 Add link to parent build 2020-04-25 23:26:56 +10:00
Oliver Walters
4f0efec39f PEP and unit testing fixes 2020-04-25 23:24:00 +10:00
Oliver Walters
77361bd0a2 Update templates 2020-04-25 23:20:55 +10:00
Oliver Walters
01a68270ea Add verbose names for multiple Build model fields 
- Improve methods for different models
 2020-04-25 23:17:07 +10:00
Oliver Walters
181d1d6b91 Factor out function to calculate total allocations 2020-04-25 21:31:58 +10:00
Oliver Walters
912a3c4b99 Update progress bar based on sum of allocated quantities 2020-04-25 21:21:52 +10:00
Oliver Walters
b0891c921c Working towards better build allocation: 
- Improve data serialization in API
- Javascript bug fixes
- Load the build allocation table using jQuery
 2020-04-25 21:13:38 +10:00
Oliver Walters
c11b433d94 Make Build object into a MPTT tree model 
- Builds can have child builds
 2020-04-25 15:25:17 +10:00
Oliver Walters
2f0bbecc3d Refactored status code label generation 
- Larger style available
 2020-04-25 15:13:55 +10:00
Oliver Walters
4e40d92db7 PEP fix 2020-04-25 13:31:42 +10:00
Oliver Walters
66b6036827 Add two new "build orders" tab to the "sales order" view 2020-04-25 13:29:18 +10:00
Oliver Walters
d5f3498238 Add a "sales_order" reference to the Build model 
- If a build order is made to fulfil a sales order
- Add sales_order filtering to the Build API
- Pass initial information through to the BuildCreate view
 2020-04-25 13:15:45 +10:00
Oliver Walters
b351976ae9 Mark a SalesOrder as "shipped" 
- Option to hide non-stock items from stock list
- Update models with new feature
 2020-04-25 08:46:28 +10:00
Oliver Walters
c5b93e2392 Update pillow version 
- Addresses a security patch requirement
 2020-04-24 20:40:56 +10:00
Oliver Walters
41a4033427 Selective display of sales order ilne buttons 2020-04-24 17:18:18 +10:00
Oliver Walters
429bb688d0 Template fixes 2020-04-24 13:03:38 +10:00
Oliver Walters
9d25ed335c Rebuild the "PurchaseOrder" detail 
- Use AJAX and bootstrap-table
- Display progress bar
 2020-04-24 12:52:08 +10:00
Oliver Walters
ba1d2063af Remove some debug messages and fix PIP 2020-04-24 10:22:33 +10:00
Oliver Walters
77471cb89c Form for shipping a SalesOrder 
- Returns "False" for now
 2020-04-24 10:20:56 +10:00
Oliver Walters
b45fec221c Expose more status code data to the templates 
- Status codes are now exposed globally to every page
- Much simplified so wow
- https://stackoverflow.com/questions/3221592/how-to-pass-common-dictionary-data-to-every-page-in-django
 2020-04-24 09:27:42 +10:00
Oliver Walters
2c9b112562 PEP fixes 2020-04-23 21:48:39 +10:00
Oliver Walters
e5fa94b4f8 Add functionality to cancel a sales order 2020-04-23 21:38:40 +10:00
Oliver Walters
e384f9e94c Order date adjustment 
Sales order now has a "shipment date"
 2020-04-23 20:42:59 +10:00
Oliver Walters
435c13cf7c Separate concept of "OrderStatus" into "SalesOrderStatus" and "PurchaseOrderStatus" 2020-04-23 20:38:09 +10:00
Oliver Walters
7f020cbbf6 Enbiggen a whole lotta buttons 2020-04-23 19:41:14 +10:00