inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-08-03 12:13:02 +00:00
Code Activity
1,337 Commits 7 Branches 165 Tags
0b54baf6db3bc2982605df00721cf4027d4acdbb
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Oliver Walters 4011d66b6f Display sub-location information 2019-05-28 18:08:50 +10:00
Oliver Walters 7120b940f0 Pre-collapse grouped columns 2019-05-28 17:51:02 +10:00
Oliver Walters 4218cf8b45 Client-side grouping 
- Cusomizations made to bootstrap-table-group-by.js
- Group by part name
- Display total stock count per group
- Only group if there are more than 1 item in the group
- Groups send checkbox signals through appropriately!
 2019-05-28 17:21:29 +10:00
OliverandGitHub 28a226d08d Merge pull request #374 from SchrodingersGat/build-allocated-view 
Switch between display and edit mode for build allocations
 2019-05-27 23:52:20 +10:00
Oliver Walters 64403f824a And deltaco some code that went along with it 2019-05-27 22:46:17 +10:00
Oliver Walters 7de4ee80f1 Deltaco some dead code 2019-05-27 22:44:38 +10:00
Oliver Walters 5a9c19492b Design an aggregation filter for stock items 
- If 'aggregate=1' is sent to the stock API, aggregate the returned stock items by part and location
- Suprisingly this actually works right out of the gate
 2019-05-27 22:44:13 +10:00
Oliver Walters a305301b95 Switch between display and edit mode for build allocations 2019-05-27 08:07:38 +10:00
OliverandGitHub 59fa59f760 Merge pull request #372 from SchrodingersGat/variant-improvements 
Variant improvements
 2019-05-26 16:08:47 +10:00
Oliver Walters 4d518f4512 PEP 2019-05-26 16:05:54 +10:00
Oliver Walters 8715e29c31 Add ability to make variant from template 2019-05-26 16:00:27 +10:00
Oliver Walters 91a5a7f051 Simplify part model 
- Remove 'varian't or ''revision' field
- Part name must be unique across database
 2019-05-26 12:16:57 +10:00
Oliver Walters 1312148721 Filter parts by template or variant status (in API) 2019-05-26 11:15:41 +10:00
OliverandGitHub 2bd2ffed62 Merge pull request #370 from SchrodingersGat/variants 
Part templates / variants
 2019-05-26 00:48:14 +10:00
Oliver Walters 41eb195940 Thanks, PEP 2019-05-26 00:42:40 +10:00
Oliver Walters e5bb6284db Add variant-of to part detail view 2019-05-26 00:41:24 +10:00
Oliver Walters 2138977b07 Include template attachments in attachment count 2019-05-26 00:39:36 +10:00
Oliver Walters d563e873ed Change some icons 2019-05-26 00:35:52 +10:00
Oliver Walters f3b17b2164 Add some form fields (might have to remove later) 2019-05-26 00:32:18 +10:00
Oliver Walters 21dd893c01 Display templated parts as italic in the part list 2019-05-26 00:29:17 +10:00
Oliver Walters 6603d6e9ed PEP fixes 2019-05-26 00:22:05 +10:00
Oliver Walters 75b21bdd8f Visual tweaks 2019-05-26 00:20:03 +10:00
Oliver Walters 7881a67db4 Calculate stock based on variant stock if part is a template 2019-05-26 00:01:01 +10:00
Oliver Walters c45a506a10 Rename field part.has_variants to part.is_template 2019-05-25 23:58:31 +10:00
Oliver Walters c3d75deb16 More 'limit_choices_to' limitations for template parts 2019-05-25 23:55:16 +10:00
Oliver Walters 9c1c008f33 Show attachments for the Template part under attachments tab 2019-05-25 23:50:24 +10:00
Oliver Walters 08ac7e2a36 Rendering tweaks 2019-05-25 23:45:26 +10:00
Oliver Walters 3d57483f0e Add a 'new varian't button 2019-05-25 23:43:06 +10:00
Oliver Walters bbe66472ee Display list of part variants 2019-05-25 23:40:59 +10:00
Oliver Walters 39c4611598 Add a tab for part variants 2019-05-25 23:31:23 +10:00
Oliver Walters 75d38489d7 Add ability to filter stock by variants for a templated part 2019-05-25 23:26:46 +10:00
Oliver Walters 0e684071fa Display message if a part is a template or a variant 2019-05-25 23:21:38 +10:00
Oliver Walters d70110690b Validate uniqueness for StockItems 
- If the Part is a variant of a template, ensure that the serial numbers are unique across all instances of the template
- Prevent instantiation of a StockItem for a part which has variants
 2019-05-25 23:09:04 +10:00
Oliver Walters bc778c1451 Prevent a Part from both having variants and being a variant of something else 2019-05-25 22:43:47 +10:00
Oliver Walters 1a2fb9e170 Add 'has_variants' and 'variant_of' field for Part 
- StockItem cannot point to a part which is a template part
 2019-05-25 22:27:36 +10:00
OliverandGitHub 1ac1c472c7 Merge pull request #369 from SchrodingersGat/null-fix 
Null fix
 2019-05-25 22:08:19 +10:00
Oliver Walters 9f4105e2e4 PEP fix 2019-05-25 22:02:36 +10:00
Oliver Walters 2760efac18 Fix similar error for Build object 2019-05-25 22:01:30 +10:00
Oliver Walters ecfde46838 Fix error in BomItem creation 2019-05-25 21:57:59 +10:00
OliverandGitHub 970257d423 Merge pull request #367 from SchrodingersGat/search-page 
Search page
 2019-05-24 21:38:54 +10:00
Oliver Walters add601e296 Display supplier part results on search page 2019-05-24 21:34:00 +10:00
Oliver Walters d5da93b9d0 Make supplier part list API searchable 2019-05-24 21:33:45 +10:00
OliverandGitHub 632be8f04f Merge pull request #364 from SchrodingersGat/bom-footer 
Display total part quantity in BOM footer
 2019-05-23 23:23:52 +10:00
Oliver Walters 2bf80efc09 Display total part quantity in BOM footer 
- https://stackoverflow.com/questions/45190917/bootstrap-table-footer-functions-not-working-data-footer-formatter
 2019-05-23 23:18:35 +10:00
OliverandGitHub aeaf4e7dc9 Merge pull request #363 from SchrodingersGat/rest-simplify 
Rest simplify
 2019-05-23 23:03:39 +10:00
Oliver Walters c2ca5a24f8 PEP 2019-05-23 22:59:56 +10:00
OliverandGitHub d287c0e8d3 Merge pull request #362 from SchrodingersGat/api-fixes 
Api fixes
 2019-05-23 22:58:36 +10:00
Oliver Walters 5664fc5472 Detail in StockItem API now optional 2019-05-23 22:57:45 +10:00
Oliver Walters 9052ccc181 Make 'part_detail' field in SupplierPart serializer optional 2019-05-23 22:44:37 +10:00
Oliver Walters cf5b8d0249 Optional part_detail and sub_part_detail for BOM API 
- Significant speed boost on request
- Request the relevent information at the right place
 2019-05-23 22:36:19 +10:00
Oliver Walters d386c2a6f9 Include total stock in PartBrief serializer 2019-05-23 21:51:27 +10:00
Oliver Walters a6f95c70aa Add detail view for Build model 2019-05-23 21:36:54 +10:00
OliverandGitHub 8f3fe94ff4 Merge pull request #361 from SchrodingersGat/tweakies 
Tweakies
 2019-05-23 00:45:50 +10:00
Oliver Walters 4d35841233 Consolidate on 'pk' as the ID field in the API 2019-05-23 00:31:27 +10:00
Oliver Walters 27f956bffa Part detail rendering improvements 2019-05-22 23:27:43 +10:00
Oliver Walters cd7bc6cce5 Include pricing information in part supplier view 
Also some CSS tweaks to secondary modal buttons
 2019-05-22 22:11:27 +10:00
OliverandGitHub 49425efef9 Merge pull request #358 from SchrodingersGat/bom-pricing 
Bom pricing
 2019-05-21 16:33:45 +10:00
Oliver Walters d3a5661dbd Serializer fix 2019-05-21 15:42:52 +10:00
Oliver Walters d1dfad591d Pepperoni 2019-05-21 15:38:22 +10:00
Oliver Walters 988a35d237 Serialize BOMItem pricing information 
- Account for quantity
- Prefetch required items
 2019-05-21 15:15:54 +10:00
OliverandGitHub 74479a7d52 Merge pull request #357 from SchrodingersGat/price-testing 
Price testing
 2019-05-21 14:12:56 +10:00
Oliver Walters 2817e6ca31 Added further part pricing 2019-05-21 14:08:40 +10:00
Oliver Walters cdcc4f9ca1 Simple tests for price breaks 2019-05-21 13:53:25 +10:00
Oliver Walters 6f73c379c2 Remove 'minimum' order from SupplierPart 
- This can be handled using the 'PriceBreak' set
 2019-05-21 13:51:43 +10:00
Oliver Walters 357bfdae3f Add some test fixtures for Company app 2019-05-21 13:33:05 +10:00
OliverandGitHub e9f681e736 Merge pull request #355 from SchrodingersGat/speed2 
Don't serialize 'available_stock' in PartSerializer
 2019-05-21 08:57:37 +10:00
Oliver Walters f19d4eec79 Improve query speed for supplierpart api 2019-05-21 08:19:16 +10:00
Oliver Walters 9d5b938ced Don't serialize 'available_stock' in PartSerializer 2019-05-21 07:57:44 +10:00
OliverandGitHub 2439d9edde Merge pull request #353 from SchrodingersGat/api-speed 
Optimizing db queries
 2019-05-21 00:57:57 +10:00
Oliver Walters ca9d6e6e25 PEP fixes 2019-05-21 00:54:48 +10:00
Oliver Walters 49ed17db56 Add a line 2019-05-21 00:52:17 +10:00