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,698 Commits 6 Branches 99 Tags 484 MiB
45fc8ce6bd
Commit Graph

2159 Commits

Author SHA1 Message Date
Oliver Walters
4fd7b24e3c Update buttons for part BOM view 2020-04-28 08:36:13 +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
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 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
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
Oliver Walters
426aa9258c URL cleanup 2020-04-23 17:37:53 +10:00
Oliver Walters
5d71cf85cc Add separate 'quantity' and 'allocated' columns in sales order view 2020-04-23 16:00:09 +10:00
Oliver Walters
c9ea33e22e Fix order of javascript table events 2020-04-23 10:58:26 +10:00
Oliver Walters
d59c6711bb Update translations 2020-04-23 09:20:25 +10:00
Oliver Walters
1a0f091e0c Improve progress bar rendering 2020-04-23 09:20:18 +10:00
Oliver Walters
a803f21e0c Add buttons to create new builds or orders for sales order parts 
- Need to pre-fill the forms a bit better
 2020-04-22 23:34:27 +10:00
Oliver Walters
6112be2df0 Add forms for editing and deleting a SalesOrderAllocation item 2020-04-22 23:21:54 +10:00
Oliver Walters
2a4e903785 Add button to delete a SalesOrderLineItem 2020-04-22 22:36:55 +10:00
Oliver Walters
26d1a25f31 PEP style fixes 2020-04-22 22:24:06 +10:00
Oliver Walters
fd42149f67 More stuff 2020-04-22 22:22:22 +10:00
Oliver Walters
6ab03bd05a Add form for creating a new StockItem allocation 2020-04-22 21:26:38 +10:00
Oliver Walters
2972aec759 Cleverer rendering of sales order allocations 2020-04-22 20:26:05 +10:00
Oliver Walters
b70e79b778 Optionally add all SalesOrderAllocations to the SalesOrderLineItem serializer 2020-04-22 20:10:23 +10:00
Oliver Walters
5d1754ec32 Better display of where a StockItem is allocated 2020-04-22 17:39:59 +10:00
Oliver Walters
eb7b49784b StockItem serializer now includes the allocated quantity 2020-04-22 15:24:11 +10:00
Oliver Walters
d9698b10cc PEP fixes 2020-04-22 13:21:45 +10:00
Oliver Walters
1373425c29 Update definition for StockItemAllocation model 
- Limit foreignkey choices
- Error checking
- Check if a StockItem is over-allocated
- Fix API serialization and filtering
 2020-04-22 13:11:19 +10:00
Oliver Walters
2cb1b076f6 Create "SalesOrderAllocation" object 
- Links multiple StockItem objects to a single SalesOrderLineItem
 2020-04-22 12:12:48 +10:00
Oliver Walters
3a71a4f63a Fix for StockItem model 
- Allow sales_order_line to be blank
 2020-04-22 10:16:54 +10:00
Oliver Walters
6dd79af0b6 Expose "is_allocated" parameter on StockItem API 2020-04-22 10:11:40 +10:00
Oliver Walters
12daf15406 Update build page 2020-04-22 09:53:11 +10:00
Oliver Walters
372958d939 Migrate more pages to the two_column template 2020-04-22 09:50:10 +10:00
Oliver Walters
808a636484 Move "Company" view to new two-column template 2020-04-22 09:01:52 +10:00
Oliver Walters
79ea744280 Supplier part rendering fix 2020-04-21 22:39:47 +10:00
Oliver Walters
09ccd6c5e2 PEP style fixes 2020-04-21 22:37:35 +10:00
Oliver Walters
b75c343236 Add action buttons to the sales order page 2020-04-21 22:02:17 +10:00
Oliver Walters
15166c7797 Add a custom "id" to the progress bar 2020-04-21 21:43:04 +10:00
Oliver Walters
4979c690d9 Prevent BOM price calculation from becoming too recursive 2020-04-21 21:38:22 +10:00
Oliver Walters
cb636e000d Display a sub-list of stock items which are allocated to a SalseOrderLineItem 2020-04-21 21:38:04 +10:00
Oliver Walters
b40234e403 UI tweaks 2020-04-21 20:05:15 +10:00
Oliver Walters
399dcafede Use the existing bootstrap CSS for progress bars 2020-04-21 18:14:02 +10:00
Oliver Walters
2c6e8da90e Ability to filter StockItemList API by sales_order or sales_order_line 2020-04-21 17:33:02 +10:00
Oliver Walters
0d1919f10b Display an alert on a stock item page if that stock item is allocated to a salesorder 2020-04-21 16:59:14 +10:00
Oliver Walters
89ede3e103 Fix for SalesOrderLineItem allocation calculation 
Also function to render a progress bar
 2020-04-21 16:45:44 +10:00
Oliver Walters
a1376eeb9e The 'StockItem' model now has a reference to a SalesOrderLineItem 2020-04-21 15:04:21 +10:00
Oliver Walters
8052a1989c Serialize the allocated quantity for a purchase-order line item 2020-04-21 11:41:08 +10:00
Oliver Walters
7385099194 Add a model to map multiple StockItem objects to a single SalesOrderLineItem 2020-04-21 10:14:55 +10:00
Oliver Walters
19cd0707a2 Add / edit / delete attachments for SalesOrder 2020-04-21 09:42:11 +10:00
Oliver Walters
a06595c152 Add line numbering to SalesOrderLineItem table 2020-04-21 09:20:44 +10:00
Oliver Walters
22c96ad2b7 Add ability to filter SalesOrder list by part 2020-04-21 09:17:50 +10:00
Oliver Walters
3d2e907d5e Add a 'sales order' view for each part 2020-04-21 09:15:01 +10:00
Oliver Walters
b204618e79 Button / view / form to create a new SalesOrderLineItem 2020-04-21 09:02:10 +10:00
Oliver Walters
617fbf2f02 Moar stuffs: 
- Expose part_detail and order_detail to SOLineItem serializer
- Update SalesOrder line item table
 2020-04-21 08:57:13 +10:00
Oliver Walters
a2c0c7c76a Add "part" reference to SalesOrderLineItem model 2020-04-21 08:33:32 +10:00
Oliver Walters
34d3dca8b7 Add ability to filter parts by "purchasable" status 2020-04-20 22:40:52 +10:00
Oliver Walters
9e4d09343c Add ability to filter parts list by "salable" status 2020-04-20 22:39:00 +10:00
Oliver Walters
0c56079b41 Create missing tabs for sales orders 
- Attachments
- Notes
 2020-04-20 22:33:49 +10:00
Oliver Walters
e12824df2e Add form to edit a SalesOrder 2020-04-20 22:20:03 +10:00
Oliver Walters
ce1dd88129 Form for creating a new SalesOrder 2020-04-20 22:13:07 +10:00
Oliver Walters
ebbcff3c7f Render a table of line items 2020-04-20 21:22:34 +10:00
Oliver Walters
b2569d5cba Expose SalesOrderLineItem objects to the REST API 2020-04-20 21:11:59 +10:00
Oliver Walters
47ada25315 Add detail view for SalesOrder 2020-04-20 20:59:14 +10:00
Oliver Walters
1ebf26ab7c Add page for displaying all sales orders 2020-04-20 20:40:45 +10:00
Oliver Walters
627c50e465 Render a table of sales orders 2020-04-20 20:27:52 +10:00
Oliver Walters
c7fd22924f Register salesorder classes in the admin interface 2020-04-20 20:27:35 +10:00
Oliver Walters
9f97d81e83 API endpoint for serializing SalesOrder objects 2020-04-20 20:11:21 +10:00
Oliver Walters
5901b21e78 UI elements 
- Add a "sales order" menu item to the main navbar
- Add a "sales order" tab to customer detail page
 2020-04-20 19:47:29 +10:00