inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-08-03 04:03:08 +00:00
Code Activity
2,590 Commits 7 Branches 165 Tags
e5fa94b4f80762ebf83ddf69b848511d20bba33a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Oliver Walters 974c98c95a Add "SalesOrder" concept 
- SalesOrder model
- SalesOrderLineItem
- SalesOrderAttachment
 2020-04-20 19:41:58 +10:00
OliverandGitHub 85e20041c7 Merge pull request #739 from SchrodingersGat/api-consolidation 
Api consolidation
 2020-04-20 09:55:16 +10:00
Oliver Walters ff3cc96e0e PEP fixes 2020-04-20 09:50:41 +10:00
Oliver Walters 746e9ab983 Fix rendering of PurchaseOrder table 2020-04-20 09:48:33 +10:00
Oliver Walters 99fcbcc646 Consolidation of PurchaseOrder API 2020-04-20 09:41:21 +10:00
Oliver Walters fee6246a8f PEP fix 2020-04-20 08:25:24 +10:00
Oliver Walters 4ec5e9a907 Consolidate StockItem serializer 2020-04-20 08:24:43 +10:00
Oliver Walters ef66a3b8f3 Make PartDetail view same as PartList view 2020-04-20 08:10:59 +10:00
OliverandGitHub 654f5d348e Merge pull request #738 from SchrodingersGat/stock-count-fix 
Stock count fix
 2020-04-20 01:26:42 +10:00
Oliver Walters f5c86bc457 "Fix" for unit tests 
- Not working in travis for some reason?
- But they are working locally...
 2020-04-20 01:23:05 +10:00
Oliver Walters 57fa69f6e6 Update version 
- Display django version in "about" dialog
 2020-04-20 01:20:09 +10:00
Oliver Walters c72fce0cc5 Add "tracking items" back in 2020-04-20 01:14:19 +10:00
Oliver Walters b2c40c91b7 PEP fixes 2020-04-20 01:11:25 +10:00
Oliver Walters 0334035e77 Simplify StockItem serializer 
- Some more work needed here to cut down on database hits
 2020-04-20 01:09:37 +10:00
Oliver Walters 4b1b9df193 Update stock table rendering 2020-04-20 01:02:19 +10:00
Oliver Walters 6a89e0089d Updates for stock serializer 2020-04-20 00:49:13 +10:00
Oliver Walters 5233281a24 Should have checked first :'( 
New tablib is broked (at least in the admin interface)
 2020-04-20 00:19:04 +10:00
Oliver Walters 468eba1759 Update PIP requirements 
- django-mptt required updating to fix a bug where tree was not being rebuild on item save
 2020-04-20 00:16:57 +10:00
Oliver Walters ff91c4ec53 Add a new verision of django-qr-code 
Official package does not (yet) support django 3.0
 2020-04-20 00:10:16 +10:00
Oliver Walters 3a64d0bc8f Fix display of part table 2020-04-20 00:00:14 +10:00
Oliver Walters 092215918c PEP fixes 2020-04-19 23:56:16 +10:00
Oliver Walters 2621c51a7e Further API cleanup 
- Perform a single call to get starred parts for current user and record results
- This provides significant speed improvements
- Remove old manual serializer
- More data prefetching
 2020-04-19 23:50:41 +10:00
Oliver Walters 69b8eed028 Fixes for aggregation issues 
- Ensure that "distinct=True" is set!
- ARRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
 2020-04-19 22:54:46 +10:00
Oliver Walters 85d1c585c0 Update to django3! 
- This is required to fix some issues with query aggregations as "distinct=True" cannot be set for Sum operations until django 3.0
- Multiple annotations on the same queryset were returning invalid results
- Ref: https://code.djangoproject.com/ticket/10060
- Ref: https://docs.djangoproject.com/en/3.0/topics/db/aggregation/#combining-multiple-aggregations
- django-dbbackup required updating for django3 support
- django-qr-code for now is disabled, a new solution needs to be worked out
 2020-04-19 22:44:16 +10:00
OliverandGitHub 9cb1af9587 Merge pull request #737 from SchrodingersGat/doc-updates 
Remove some docs pages
 2020-04-18 14:55:04 +10:00
Oliver Walters b580df0d30 Update README.md to point to the new docs 2020-04-18 14:37:51 +10:00
Oliver Walters d953f1a31e Remove some docs pages 
- These are now being consolidated on the inventree.github.io page
 2020-04-18 14:09:14 +10:00
OliverandGitHub a28b7df9d4 Merge pull request #736 from SchrodingersGat/config-file-fix 
Small fix for config template
 2020-04-18 13:26:43 +10:00
Oliver Walters 880655c141 Small fix for config template 2020-04-18 13:22:52 +10:00
OliverandGitHub 4f3f78f55a Merge pull request #735 from SchrodingersGat/token-auth-fix 
Improvements for token authentication
 2020-04-18 12:12:54 +10:00
Oliver Walters 6e3f603413 Improvements for token authentication 
- Do not POST username and password data
- This is already encoded in the Authorization: Basic headers
 2020-04-18 12:06:50 +10:00
OliverandGitHub 2b70b947ee Merge pull request #734 from SchrodingersGat/migration-fix 
Add error checking for thumbnail file migration
 2020-04-17 21:46:36 +10:00
Oliver Walters 37fcb810e4 Add error checking for thumbnail file migration 2020-04-17 19:23:43 +10:00
OliverandGitHub d6d891c16f Merge pull request #733 from SchrodingersGat/travis-fix 
Delete unused import
 2020-04-17 08:43:57 +10:00
Oliver Walters 75fed2ebdd Unit testing for barcode API endpoint 2020-04-17 08:40:59 +10:00
Oliver Walters 91012d2788 Delete unused import 2020-04-17 08:40:37 +10:00
OliverandGitHub cf5af4dc77 Merge pull request #722 from SchrodingersGat/barcode 
Create simple endpoint for barcode decode
 2020-04-16 21:55:24 +10:00
OliverandGitHub 4a99996be8 Merge pull request #732 from SchrodingersGat/search-fix 
Search fix
 2020-04-16 21:47:46 +10:00
Oliver Walters 0ee53758b4 Add same optio for stock table 2020-04-16 21:43:21 +10:00