inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-21 14:13:06 +00:00
Code Activity
1,571 Commits 10 Branches 164 Tags
1b43f151dfdb3becb6a99a4ac4f856903644b847
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 1b43f151df Merge remote-tracking branch 'inventree/master' 2019-06-17 23:28:35 +10:00
OliverandGitHub c6b1a80703 Merge pull request #398 from SchrodingersGat/delete-wip 
Delete some unused models
 2019-06-17 23:26:21 +10:00
Oliver Walters 7fbc1b71bc Delete some unused models 2019-06-17 23:22:51 +10:00
OliverandGitHub b58982d212 Merge pull request #397 from SchrodingersGat/bug-build 
Squashed a bug
 2019-06-17 23:17:02 +10:00
Oliver Walters 008a55d3d7 Squashed a bug 2019-06-17 23:02:44 +10:00
OliverandGitHub e347f2ce80 Merge pull request #396 from SchrodingersGat/can-has-tests 
Implementing some more unit testing
 2019-06-17 22:56:52 +10:00
Oliver Walters a147a704bf Pepper 2019-06-17 22:45:48 +10:00
Oliver Walters eb1d534ebd Ignore some more files 2019-06-17 22:45:01 +10:00
Oliver Walters 760d08608f Minor test addition for builds 2019-06-17 22:41:44 +10:00
Oliver Walters 38ef9b2b13 Tests for helper functions 2019-06-17 22:36:17 +10:00
Oliver Walters 08358f6961 Run tests on custom validators 2019-06-17 22:18:00 +10:00
Oliver Walters b9dc4a0c2f Further tests for order 2019-06-17 22:10:37 +10:00
Oliver Walters 9c29976511 More tests for order module 
- Also fixed some bugs along the way!
 2019-06-17 21:55:51 +10:00
Oliver Walters 0857ec61fd Add a test fixture for orders 2019-06-17 19:47:16 +10:00
Oliver Walters 78bfc0b6a8 Improve the 'creation date' for order 
- Automatically set on first save
 2019-06-17 19:44:36 +10:00
OliverandGitHub 477ac68aa0 Merge pull request #394 from SchrodingersGat/receive-order 
Receive order
 2019-06-15 20:08:35 +10:00
Oliver Walters 93667f942f Add button to remove line items from the 'receive' form 2019-06-15 19:47:16 +10:00
Oliver Walters 3405fb93a9 Peppy fixes 2019-06-15 19:42:09 +10:00
Oliver Walters 1290e7f289 Implement POST for receiving items 
- Create new StockItem in the correct location
 2019-06-15 19:39:57 +10:00
Oliver Walters c7ca9a3d8f Display table of outstanding line items 2019-06-15 17:29:33 +10:00
Oliver Walters e28a435c07 Add entry point for order documentation 2019-06-15 17:13:28 +10:00
Oliver Walters bbd6b15089 Add a VIew for receiving purchase order 2019-06-15 17:09:25 +10:00
Oliver Walters 11d9312c45 Improve rendering of purchase order table 2019-06-15 15:33:10 +10:00
Oliver Walters 0fa8e3809e Limit PO selection to only those which are PENDING 2019-06-15 15:33:03 +10:00
Oliver Walters 6b5bed7786 Merge remote-tracking branch 'inventree/master' 2019-06-13 23:07:54 +10:00
OliverandGitHub 26f56c188b Merge pull request #393 from SchrodingersGat/stock-endpoint 
Allow quantity editing via /api/stock/ endpoint
 2019-06-13 23:07:27 +10:00
Oliver Walters c906cbe2c2 Merge branch 'stock-endpoint' 2019-06-13 23:06:08 +10:00
Oliver Walters ff6df9741f Perform model validation on API serializers 
If you have a class, why not subclass it?!
 2019-06-13 23:03:58 +10:00
Oliver Walters 222c9f1876 Allow quantity editing via /api/stock/ endpoint 
- Allows creation of a new StockItem with a specified quantity
 2019-06-13 22:58:02 +10:00
Oliver Walters 1dea5f1624 Merge remote-tracking branch 'inventree/master' 2019-06-13 22:54:10 +10:00
OliverandGitHub 51ef46bd80 Merge pull request #389 from SchrodingersGat/order-stuff 
Working towards semi-automated part ordering
 2019-06-13 22:53:41 +10:00
Oliver Walters 5aac603d63 Satisfying the frog 2019-06-13 22:43:31 +10:00
Oliver Walters a424a805e4 Bump version string 2019-06-13 22:39:57 +10:00
Oliver Walters 1b06d86f59 Export purchase order to CSV 2019-06-13 22:38:10 +10:00
Oliver Walters 73b9881dc5 Improve table rendering for build allocation view 2019-06-13 22:18:27 +10:00
Oliver Walters 38001b5358 Peppy fixes 2019-06-13 22:16:27 +10:00
Oliver Walters c9cddd2a19 Add ability to edit and delete a purchase order line item 2019-06-13 22:13:22 +10:00
Oliver Walters fe5bb23d13 Add notes field to purchase order line item 2019-06-13 21:57:35 +10:00
Oliver Walters d860336060 Add some pretty buttons to the purchase order detail table 2019-06-13 21:44:09 +10:00
Oliver Walters a37a2120fa Add some context data to build views 2019-06-13 21:32:37 +10:00
Oliver Walters 2b74a0ed2c Don't show zero-quantity items when ordering against a build 2019-06-13 21:28:01 +10:00
Oliver Walters 771a008e84 Printable string for PurchaseOrderLineItem 2019-06-13 21:21:22 +10:00
Oliver Walters 52b7051060 Automatically add line items to an order 2019-06-13 21:17:06 +10:00
Oliver Walters f52aa0af21 Create a new purchase order directly from the "Order Parts" form wizard 2019-06-13 20:42:09 +10:00
Oliver Walters 915395e676 Create a new supplier part directly from the order form 2019-06-13 20:35:15 +10:00
Oliver Walters 4be82a31ce Remove rows from order form 2019-06-13 20:26:53 +10:00
Oliver Walters 3bb76060d9 Extract supplier purchase order selection information 2019-06-13 20:17:36 +10:00
Oliver Walters 3f809a9001 List active purchase orders for each selected supplier 2019-06-13 19:35:38 +10:00
Oliver Walters 7049ab1d8c Collate parts by supplier and present a purchase-order form 2019-06-13 19:30:18 +10:00
Oliver Walters 2fffd874a3 Use integer ordering for part quantity 2019-06-13 19:12:34 +10:00
Oliver Walters 15432fd6b7 Handle list of parts sent back to the order-parts form 
- Eliminate parts which are zero quantity
- Display an error message when no supplier is selected
 2019-06-13 19:10:31 +10:00
Oliver Walters c9b946655c Add some more data to Part serializer 2019-06-13 18:33:15 +10:00
Oliver Walters a41a6c52ca Peppy fixes 2019-06-12 00:39:33 +10:00
Oliver Walters f0796327b3 Improve display of part base page 2019-06-12 00:29:47 +10:00
Oliver Walters b138a4bd5f Order parts directly from a build 2019-06-12 00:21:18 +10:00
Oliver Walters 74327d3094 Order from supplier 'parts list' page 2019-06-12 00:10:39 +10:00
Oliver Walters e4f5cc8ccd Order from a part page 2019-06-12 00:04:20 +10:00
Oliver Walters 3460a48b63 Extra form info 2019-06-11 23:58:00 +10:00
Oliver Walters 1cb6c67086 Launch order dialog from the 'Parts' table 2019-06-11 23:55:20 +10:00
Oliver Walters 0ca01fb0e7 Template improvements 2019-06-11 23:47:09 +10:00
Oliver Walters 0bc8190e8c Style supplier-part selection as 'select2' 2019-06-11 23:41:15 +10:00
Oliver Walters bc05146e72 First pass at 'order parts' fom 
- Select parts in modal form window
 2019-06-11 23:37:32 +10:00
Oliver Walters 8e82488f70 Display 'net stock' value on front page 2019-06-11 21:58:20 +10:00
Oliver Walters 50bab299c5 Add hover image to 'parts to order' table 2019-06-11 21:52:43 +10:00
Oliver Walters 0fea7f2a22 Merge remote-tracking branch 'inventree/master' 2019-06-11 08:57:14 +10:00
OliverandGitHub 5fc6617713 Merge pull request #388 from SchrodingersGat/django-secure 
Updated to django 2.2.2
 2019-06-11 08:56:40 +10:00
Oliver Walters 0644c29a96 Updated to django 2.2.2 2019-06-11 08:44:36 +10:00
Oliver Walters 45d19e3a4e Merge remote-tracking branch 'inventree/master' 2019-06-11 08:40:11 +10:00
OliverandGitHub 0b6fb9e2e4 Merge pull request #387 from SchrodingersGat/python3 
Change requirements file to explicity use python3
 2019-06-11 08:22:06 +10:00
Oliver Walters faf51c615b Change requirements file to explicity use python3 2019-06-10 23:23:25 +10:00
Oliver Walters 8a46dda07f Merge remote-tracking branch 'inventree/master' 2019-06-10 23:22:04 +10:00
OliverandGitHub 5f2e3dbbda Merge pull request #386 from SchrodingersGat/order 
Order
 2019-06-10 23:21:43 +10:00
Oliver Walters d8d41c6eff PEP fixes 2019-06-10 23:08:08 +10:00
Oliver Walters 3954b33fb7 Use 'on_order' count in calculation for parts we need to order 2019-06-10 23:05:14 +10:00
Oliver Walters 04a9b1a980 Create a new purchase order from a company page 2019-06-10 22:56:34 +10:00
Oliver Walters c132f275f5 Split display of purchase orders by company view 2019-06-10 22:43:09 +10:00
Oliver Walters b8bcc5ce0c Separate display of open and closed purchase orders (per part) 2019-06-10 22:31:19 +10:00
Oliver Walters 228bf4e1da Business logic 2019-06-10 22:17:19 +10:00
Oliver Walters ec669dd670 Ability to 'issue' a purchase order 2019-06-10 22:14:23 +10:00
Oliver Walters 9efdd836f4 Tweak the 'on_order' calculation 2019-06-10 21:56:50 +10:00
Oliver Walters 351c5fb7d0 Fix for 'on_order' calculation 
- Handle null results
 2019-06-07 09:54:36 +10:00
Oliver Walters 31ad31365a Calculate parts on order for a Part / SupplierPart 2019-06-07 08:37:25 +10:00
Oliver Walters 4af1f6ca9f Update a TODO comment 2019-06-06 21:56:20 +10:00
Oliver Walters 4048091c2b Prevent user from inputting a 'blank' supplier part into a line item 2019-06-06 21:55:02 +10:00
Oliver Walters 7b139a7f05 Form / view for creating a new purchase order 2019-06-06 21:39:04 +10:00
Oliver Walters c1f3bddf45 Secondary modal for creating a new stock location when moving stock 2019-06-06 19:28:52 +10:00
Oliver Walters ad5c6630bd Bug fix in Build.completeBuild 2019-06-06 10:43:34 +10:00
Oliver Walters 96eb4086cf Add form / view to edit purchase order details 
- Cannot edit the COMPANY if there are line items already
 2019-06-05 22:24:18 +10:00
Oliver Walters bcc08f982b Set default ajax form template 2019-06-05 22:08:22 +10:00
Oliver Walters eced012ece PEP fixes 2019-06-05 21:56:52 +10:00
Oliver Walters 04abe2b3d1 Display list of purchase orders against a particular supplier par 2019-06-05 21:50:11 +10:00
Oliver Walters 67248ec4dd List purchase orders for a given part 2019-06-05 21:47:22 +10:00
Oliver Walters 9b2b2841d9 Hide 'order' input 2019-06-05 21:19:41 +10:00
Oliver Walters 8aa5452dd4 Add secondary modal to create a new supplier part 2019-06-05 21:17:29 +10:00
Oliver Walters aee1ea9e35 Limit queryset 
- Only parts from the supplier
- Exclude parts already in the order
 2019-06-05 21:13:08 +10:00
Oliver Walters f4abfc158f Improve rendering of purchase order list 2019-06-05 21:02:51 +10:00
Oliver Walters be6b1ae2f8 Updates for purchase order line items 
- Display list of line items
- Add a form to create a new line item
 2019-06-05 20:59:30 +10:00
Oliver Walters e199ed2281 PEP fixes 2019-06-05 00:21:19 +10:00
Oliver Walters c82d5482aa Add a detail view for purchase orders 2019-06-05 00:17:25 +10:00
Oliver Walters 7bca9cc7af Improve display of list of purchase orders 2019-06-05 00:02:34 +10:00