inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-08-02 19:52:59 +00:00
Code Activity
1,408 Commits 7 Branches 165 Tags
d8d41c6effc344ddcbfa1c348b711d3ea0ffd8bb
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Oliver Walters a9ba419503 Fix testing code 2019-06-05 00:00:05 +10:00
Oliver Walters c49b8546f0 Index page for showing all purchase orders 2019-06-04 23:59:15 +10:00
Oliver Walters 4f1acddb5d Fix some build status code thingies 2019-06-04 23:42:48 +10:00
Oliver Walters f731c45ce8 Replace other choice fields with commonized status code 2019-06-04 23:38:52 +10:00
Oliver Walters 8d70d2f28a Fix rendering of purchase order status codes 2019-06-04 23:14:57 +10:00
Oliver Walters 76a72be926 Add order status field 
- Display status field in PurchaseOrder list view
 2019-06-04 23:09:51 +10:00
Oliver Walters da53de844a Add page for detailing company purchase orders 2019-06-04 22:39:46 +10:00
Oliver Walters c45d8a5782 Add 'purchase orders' tab for company 2019-06-04 22:35:34 +10:00
Oliver Walters cc2e3351ff Search for company 2019-06-04 22:34:58 +10:00
Oliver Walters 0e29f9b88c Fix related name 2019-06-04 22:26:40 +10:00
Oliver Walters 54b1ccd585 Allow blank PO description and add URL field 2019-06-04 22:26:19 +10:00
Oliver Walters 68d514d478 Limit choices for supplier in PurchaseOrder 2019-06-04 22:20:49 +10:00
Oliver Walters d840b44f7a Create initial models for 'Order' 
- PurchaseOrder
- PurchaseOrderLineItem

(These are based on some abstract model classes)
 2019-06-04 22:19:04 +10:00
OliverandGitHub 937763f961 Merge pull request #384 from SchrodingersGat/build-allocation-fixes 
Build allocation fixes
 2019-06-03 22:14:27 +10:00
Oliver Walters 60f5160d24 Show total stock rather than taking allocation into account 2019-06-03 22:04:48 +10:00
Oliver Walters 782ad57f52 Re-enable image hovering where appropriate 2019-06-03 22:03:22 +10:00
Oliver Walters 8e0e2979b5 Rename parts tab in build view 2019-06-03 22:01:23 +10:00
Oliver Walters 68e4adda48 Simplified build allocation view 2019-06-03 21:59:15 +10:00
Oliver Walters 7a3b186a0c Fix double loading of modals.html 2019-06-03 21:51:59 +10:00
Oliver Walters 7a244f48ae Solve weird collapse bug 
- HTML is so gross
- Disable image hover seems to work...
 2019-06-03 21:35:40 +10:00
Oliver Walters bb5ed0b9fe Fix bug for BuildItem with no part image 
- Can't request a field what don't exist
 2019-06-03 21:25:37 +10:00
OliverandGitHub aff4124d97 Merge pull request #382 from SchrodingersGat/tweeeek 
Remove defunct 'roadmap' document
 2019-06-03 14:18:33 +10:00
Oliver Walters 151731c376 Remove defunct 'roadmap' document 2019-06-03 13:54:33 +10:00
OliverandGitHub efaf38c583 Merge pull request #381 from SchrodingersGat/assorted-fixes 
Assorted fixes
 2019-06-02 20:42:11 +10:00
Oliver Walters 219c438b82 Part name uniqueness is case insensitive 2019-06-02 20:37:59 +10:00
Oliver Walters 64d541f453 Hide result types which return no results 2019-06-02 20:28:17 +10:00
Oliver Walters 0b88953706 Form field rearrangement 2019-06-02 20:07:30 +10:00
Oliver Walters ba26acd487 Rename some fields 
- Oops didn't think that through, gotta go through and fix the data now...
 2019-06-02 19:46:30 +10:00
Oliver Walters fd2e2a71f9 Add search results for part-category and stock-location 2019-06-02 19:15:05 +10:00
Oliver Walters 3427f81a34 Improve part information display 
- Better terminology
 2019-06-02 14:47:40 +10:00
Oliver Walters 6e7f354a23 Add a 'LOST' status code for stockitem 2019-06-02 13:53:54 +10:00
Oliver Walters 013a85e6f7 Better dispaly of stock status 
- Send status text in JSON
- Only display status if it is not "OK"
 2019-06-02 13:53:11 +10:00
OliverandGitHub 82f3773aa1 Merge pull request #380 from SchrodingersGat/server-side-stock-forms 
Server side stock forms
 2019-06-02 12:50:41 +10:00
Oliver Walters 6982b2f0c2 Making PEP happy 2019-06-02 12:47:40 +10:00
Oliver Walters 802ff35cf3 Remove some now unused forms / views / etc 2019-06-02 12:45:44 +10:00
Oliver Walters 5177b7f836 Remove some defunct javascript 2019-06-02 12:24:40 +10:00
Oliver Walters 2ee35ec062 Stock counting now works 2019-06-02 12:20:26 +10:00
Oliver Walters d365d7cc44 remove from stock now works 2019-06-02 12:15:44 +10:00
Oliver Walters 1b3ffada6d Add-stock is now working 2019-06-02 12:13:22 +10:00
Oliver Walters 8dd9034563 Remove 'destination' field if we are not moving stock 
- Allow different stock adjustment actions
 2019-06-02 12:00:39 +10:00
Oliver Walters d1ff115f74 Simplifiy js and improve template / form 2019-06-02 11:47:21 +10:00
Oliver Walters c7503b4f9f Consolidated form/view into single 'stock-adjust' endpoint 2019-06-02 11:37:04 +10:00
Oliver Walters fe31205017 Stock movement now works! 2019-06-02 11:27:03 +10:00
Oliver Walters 0b54baf6db POST the stock adjustment method back as a hidden form input 2019-06-02 11:15:12 +10:00
Oliver Walters 1b7762470d catch a ValueError 2019-06-02 11:14:56 +10:00
Oliver Walters 96f6f6068e Return message on succses 2019-06-02 11:05:40 +10:00
Oliver Walters 20963f83d9 Better error reporting for quantity 2019-06-02 11:00:28 +10:00
Oliver Walters c228a4998c Extract stock items from POST and return to form 2019-06-02 10:25:19 +10:00
Oliver Walters e278bdbb90 Improve filtering for stock items 2019-06-02 09:14:45 +10:00
Oliver Walters 011f5a5efd Delete rows interactively from stock adjustment form 2019-06-01 22:04:03 +10:00
Oliver Walters 6a04c8cbd3 Update stock_move form template 2019-06-01 21:16:59 +10:00
Oliver Walters 8214aef0db Add template for hover_image 2019-06-01 21:13:51 +10:00
Oliver Walters 3869bc27c9 Whoops, that form was being used. 
Created a copy of the form for multiple-item-stock-movements
 2019-05-30 09:01:16 +10:00
Oliver Walters 56821abd09 CSS tweaks for modals 2019-05-29 23:13:26 +10:00
Oliver Walters d321947026 Add stock item fields for each item passed to the form 2019-05-29 22:38:42 +10:00
Oliver Walters 0e3f74ef31 Pass list of selected stock items to the view 2019-05-29 22:24:22 +10:00
Oliver Walters 0ce6c5f7d5 Redirect non-ajax forms to / 2019-05-29 22:24:17 +10:00
Oliver Walters 2b4cb4d3e0 Beginning to move the stocktake forms server side 2019-05-29 22:24:11 +10:00
OliverandGitHub da4f68e5a5 Merge pull request #375 from SchrodingersGat/group-stock-items 
Group stock items
 2019-05-29 01:05:57 +10:00
Oliver Walters 6a30485a4e Initial work toward fixing stock issues 2019-05-29 01:03:21 +10:00
Oliver Walters d512232aac Readable css 2019-05-29 00:54:00 +10:00
Oliver Walters ea03205c50 Don't need to detach and re-attach rows any more!! 2019-05-29 00:47:36 +10:00
Oliver Walters 2ccb014d9e FINALLY sorting is working well 
- Wrote a custom sorter which takes group rows into account
 2019-05-29 00:45:35 +10:00
Oliver Walters ecde201bb0 Update to newest bootstrap-table script 2019-05-29 00:20:01 +10:00
Oliver Walters 729968e65d Better message for no stock found 2019-05-28 22:05:30 +10:00
Oliver Walters 1232a6cf17 PEP fixes 2019-05-28 22:01:52 +10:00
Oliver Walters 8c583750a2 Update the stock list API 
- Custom data serialization is MUCH faster (~400ms compared to 3s)
- Cache location queries
- Flatten related field data
- Update stock table javascript to match
 2019-05-28 21:45:27 +10:00
Oliver Walters f7d521ca97 Reorder stock table columns 2019-05-28 19:13:46 +10:00
Oliver Walters 7ac52d4d9f Optionally select which column gets grouped 
- Allow grouping by numerical values
 2019-05-28 19:12:10 +10:00
Oliver Walters e4acca2951 Display stock item serial number (if it exists)! 2019-05-28 18:29:12 +10:00
Oliver Walters 807798810b Color sub-group rows slightly differently 2019-05-28 18:17:16 +10:00
Oliver Walters 8255332950 Remove some debug messages 2019-05-28 18:12:47 +10:00