inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-20 21:53:05 +00:00
Code Activity
1,242 Commits 9 Branches 164 Tags
f19d4eec79b69dba6b23e9fe8088d5052ad4006c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Oliver Walters ae865d1de1 Commit 2019-05-21 00:40:42 +10:00
Oliver Walters 4b41766312 And mode 2019-05-21 00:31:34 +10:00
Oliver Walters 72aba30e81 More hungry fetching 2019-05-21 00:16:00 +10:00
Oliver Walters 157919f47a More prefetching 
-
 2019-05-21 00:06:57 +10:00
Oliver Walters 6ae48d07c4 Cleanup pricing algorithms 2019-05-20 23:53:39 +10:00
Oliver Walters 8adb4f6c20 Further query reduction 
- Also improved query reporting middleware
 2019-05-20 23:26:27 +10:00
Oliver Walters d15b09a5f4 Don't serialize pricing 
- Saves MANY queries and provides drastic speedup
 2019-05-20 23:03:19 +10:00
Oliver Walters 18ff80312b Fixes 2019-05-20 22:53:01 +10:00
Oliver Walters 4bde00d925 AND AGAIN 
Use --fake to force the migration
 2019-05-20 22:24:18 +10:00
Oliver Walters ee2ddbf512 Reduce some database queries by using aggregate Sum 2019-05-20 21:47:30 +10:00
Oliver Walters dd5de91c23 Add middleware to report response time (and number of queries) 2019-05-20 21:46:50 +10:00
Oliver Walters 70be052c74 Rebuilt migrations again (arrrrrrrrrrrrrrrrrrrrrrrrrrgh never do this) 2019-05-20 21:45:37 +10:00
Oliver Walters 34620b22b0 Add a middleware to count queries 
- https://www.dabapps.com/blog/logging-sql-queries-django-13/
 2019-05-20 18:51:57 +10:00
Oliver Walters fc75ab7420 Reduce response time for stock list 
Initial time - 6.2s
After prefetch - 4.3s
 2019-05-20 08:44:52 +10:00
Oliver Walters 5055226490 Reduce BOM listing time to ~1.8s 2019-05-20 08:31:03 +10:00
Oliver Walters cee1062b51 Prefetch locations - 2.6s 
However the 'total_stock' and 'available_stock' fields are still the majority of the response time
 2019-05-20 08:24:05 +10:00
Oliver Walters 6766063c8b Reducing request time for PartList API 
- Initial query time = 5.91s
- Prefetch related part categories = 3.64s
 2019-05-20 08:13:22 +10:00
Oliver Walters 73041a3fe6 Fix div-by-zero for part pricing 2019-05-20 07:53:23 +10:00
OliverandGitHub 2e2c51b271 Merge pull request #350 from SchrodingersGat/part-pricing 
Part pricing
 2019-05-19 00:14:02 +10:00
Oliver Walters 9ddedc6915 Restart migrations 
- Easier to delete all the migrations and start again :'(
 2019-05-19 00:11:41 +10:00
Oliver Walters a8846dc515 Hopefully fix the thingy 2019-05-18 23:52:22 +10:00
Oliver Walters f88e26cd5c Remove backup database file 2019-05-18 23:48:03 +10:00
Oliver Walters a54760b219 Improve pricing display 2019-05-18 23:44:43 +10:00
Oliver Walters ffda5a1b29 Add warning if no pricing data available 2019-05-18 23:13:18 +10:00
Oliver Walters 368193d397 Fix formatting 2019-05-18 23:09:12 +10:00
Oliver Walters dcf79338c1 Add pop-up pricing window for part 
- Cost to purchase from suppliers
- Cost to build from BOM
 2019-05-18 23:09:08 +10:00
Oliver Walters 54ccf6c7b3 PEP 2019-05-18 23:09:04 +10:00
Oliver Walters b64a29b897 Display build pricing information 2019-05-18 23:09:00 +10:00
Oliver Walters 2b098942b0 Fix pricing bug 
- Include BOM item pricing in API
 2019-05-18 23:08:56 +10:00
Oliver Walters 2a1fd2b03b More complex pricing calculations 
- Calculate BOM price for a part
- Calculate total pricing for a part (build or purchase)
- Display pricing information in BOM table
 2019-05-18 23:08:51 +10:00
Oliver Walters 4c82714777 Allow 5 decimal places for pricing info 2019-05-18 23:08:47 +10:00
Oliver Walters cdc55bb5d3 PEP fixes 2019-05-18 23:08:42 +10:00
Oliver Walters a3d1591929 Display part pricing in Part view 
- Calculate min_price and max_price based on provided supplier information
 2019-05-18 23:08:38 +10:00
Oliver Walters 0cfb243eb3 Move SupplierPart and SupplierPriceBreak to the 'Company' app 
- https://docs.djangoproject.com/en/2.2/ref/models/options/#django.db.models.Options.db_table
- https://stackoverflow.com/questions/3519143/django-how-to-specify-a-database-for-a-model
- And others, presumably
 2019-05-18 23:08:34 +10:00
Oliver Walters 5043c354b1 Set default value for SupplierPriceBreak 
Edit or Delete a SupplierPriceBreak
 2019-05-18 23:08:30 +10:00
Oliver Walters fc3072a459 Form for creating a new price break for a supplier part 2019-05-18 23:08:25 +10:00
Oliver Walters 1163f60b23 Return price breaks in the correct order 2019-05-18 23:08:21 +10:00
Oliver Walters a3cd54875c Update validator for supplier price break 2019-05-18 23:08:17 +10:00
Oliver Walters 92632b2ef7 PartAttachment attachment file is actually required! 2019-05-18 23:08:13 +10:00
Oliver Walters a1461de297 Add supplierpricebreak model to the admin interface 2019-05-18 23:08:09 +10:00
Oliver Walters 613c96e093 Part attachment comment field is required 2019-05-18 23:08:04 +10:00
Oliver Walters a2dbdfe794 Remove 'single_price' field from supplier part 
- Instead we will rely entirely on the SupplierPriceBreak model
 2019-05-18 23:07:58 +10:00
OliverandGitHub 3a0f60930e Merge pull request #348 from SchrodingersGat/build-page 
Build page
 2019-05-18 15:40:22 +10:00
Oliver Walters 001dacc14e Display 'no stock available' warning 2019-05-18 13:24:15 +10:00
Oliver Walters 04420b7f6b Improve display of allocation page 2019-05-18 13:06:19 +10:00
Oliver Walters a95e77c429 Pre-fill allocation count 2019-05-18 12:17:57 +10:00
Oliver Walters 34d1ef7d8d Change label size for build status 2019-05-18 09:44:16 +10:00
Oliver Walters 0ce5240361 More UI stuff for the Build page 2019-05-17 16:35:23 +10:00
Oliver Walters a2eeb7e946 Bug fix for part/stock 
- Re-introduce the button to create a new stock item
 2019-05-17 16:35:16 +10:00
Oliver Walters 3a3662ae14 Add part image 2019-05-17 00:31:35 +10:00
Oliver Walters 489d5de9c4 UI tweaks 2019-05-17 00:23:08 +10:00
Oliver Walters 2da3a022bf Add allocation tab 2019-05-17 00:20:48 +10:00
Oliver Walters bf987f23f3 Add 'tabbed' page set for Build app 2019-05-17 00:14:29 +10:00
OliverandGitHub 183871f3cc Merge pull request #345 from SchrodingersGat/stocktake-confirmation 
Stocktake confirmation
 2019-05-16 23:14:45 +10:00
Oliver Walters b77b6d2256 Display number of supplier parts in supplier list 2019-05-16 22:29:39 +10:00
Oliver Walters 5ebc7b040a Show current quantity in stocktake form 2019-05-16 22:23:31 +10:00
Oliver Walters 117fd701cd Refactor some code 2019-05-16 22:19:49 +10:00
Oliver Walters 0a1887477c Create template for stock table 2019-05-16 22:15:44 +10:00
Oliver Walters b8f5c8cca7 Add confirmation box to stocktake form 2019-05-16 22:12:13 +10:00
OliverandGitHub 283bd0e3ad Merge pull request #343 from SchrodingersGat/filter-by-supplier 
Filter by supplier
 2019-05-16 21:33:14 +10:00
Oliver Walters 7ef448d205 PEP 2019-05-16 21:26:53 +10:00
Oliver Walters 64a82389a2 Add ability for Company model to count stock sourced from that supplier 2019-05-16 21:26:12 +10:00
Oliver Walters 1b06cd23af Add 'stock' tab for supplier page 2019-05-16 21:16:19 +10:00
Oliver Walters c1224048ad Add ability to filter stock by supplier 2019-05-16 21:01:34 +10:00
OliverandGitHub 3959dd40b0 Merge pull request #342 from SchrodingersGat/tweaks 
Tweaks
 2019-05-16 20:54:37 +10:00
Oliver Walters b4df96aaee Simplify extended filters 2019-05-16 19:14:43 +10:00
Oliver Walters e1558a7a96 Add ability to filter stock items by part category 
- Using the REST API
- Add &category=x to the query string
- Add &include_child_categories to include child categories
 2019-05-16 18:54:14 +10:00
Oliver Walters 387711a9a1 Fix help string 2019-05-16 18:08:37 +10:00
Oliver Walters fae44c3002 Bug fix for part deep-copy 
- Don't copy an image if an image doesn't exist
 2019-05-15 09:21:31 +10:00
OliverandGitHub b57c2d2050 Merge pull request #336 from SchrodingersGat/bom-overage 
Add 'overage' field to BOM item
 2019-05-15 08:11:07 +10:00
Oliver Walters 292e29e95e Add some more secondary modals 2019-05-15 07:50:54 +10:00
Oliver Walters a1d587b7f4 Rename 'Company' to 'Suppliers' in front-end 2019-05-15 07:44:13 +10:00
Oliver Walters c6331255de Fixes 2019-05-15 07:23:55 +10:00
Oliver Walters 8c92c2c2a1 Display overage values in BOM table 2019-05-15 07:23:02 +10:00
Oliver Walters 68ae38a7d7 Calculate total quantity required for a build (including overages) 2019-05-15 00:36:02 +10:00
Oliver Walters a80c11f3ce Add function to infer default_supplier for a Part 2019-05-15 00:22:10 +10:00
Oliver Walters f6baf5d2ae Add 'overage' field to BOM item 
- Accepts absolute or percentage numbers
- Default = blank
- Now with custom validator! (for limited time only, limit one per customer)
 2019-05-15 00:16:34 +10:00
OliverandGitHub 35d32fd2ff Merge pull request #333 from SchrodingersGat/secondary-modals 
Provide an after_render callback
 2019-05-14 23:52:54 +10:00
Oliver Walters f979edef8e Prevent double loading of stock.js 2019-05-14 23:47:15 +10:00
Oliver Walters 2e5b3bfdf9 Prevent multiple loads of part.js 2019-05-14 23:44:33 +10:00
Oliver Walters 58cc1cda77 Only load api.js once 2019-05-14 23:43:16 +10:00
Oliver Walters 0ffe2666b3 Added some missing help text 2019-05-14 23:36:22 +10:00
Oliver Walters 505b7941b1 Add link to delete a part 
- Part must first be deactivated
 2019-05-14 23:33:25 +10:00
Oliver Walters 76e6094977 Add secondary modal to BOM 2019-05-14 23:30:32 +10:00
Oliver Walters 9d50f2a6ac Toot toot all aboard the refactor tractor 
- launchModalForm now accepts a 'secondary' parameter which is a list of secondary modals to attach
 2019-05-14 23:27:45 +10:00
Oliver Walters 97c4e5acbf Add some secondary buttons to the part-create form 2019-05-14 23:19:56 +10:00
Oliver Walters be1b458634 Upon successful creation (in a secondary modal) update the field in the primary modal 2019-05-14 23:04:49 +10:00
Oliver Walters a316681ec8 Pass object data back to modal when creating new object 2019-05-14 23:04:00 +10:00
Oliver Walters 21c238e96a Secondary modal is slightly smaller than primary 
- So that the primary modal is still visible underneath
 2019-05-14 22:44:57 +10:00
Oliver Walters 226644e59a Open a secondary modal over the top of a primary one 2019-05-14 22:37:45 +10:00
Oliver Walters dc3abec899 Add a secondary modal in modals.html 2019-05-14 22:30:24 +10:00
Oliver Walters a96cd2240c Function to insert a 'create new' button into a form 
- Look for a label like <label for="id_<field>">
 2019-05-14 22:12:22 +10:00
Oliver Walters 0cc2e71843 Provide an after_render callback 
- User callback after the form data are rendered
 2019-05-14 19:00:59 +10:00
OliverandGitHub 57645486cc Merge pull request #332 from SchrodingersGat/improvements 
Improvements
 2019-05-14 18:36:55 +10:00
Oliver Walters 2164cac28a PEP 2019-05-14 18:32:20 +10:00