inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 04:33:48 +00:00
Code Activity
1,216 Commits 9 Branches 164 Tags
f88e26cd5cff24e5b6886ddffbd161cdcbc46773
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Oliver Walters 46ab6e40eb Bug fix for build allocation 
- If the part did not have an image file the template failed to render
 2019-05-14 18:31:19 +10:00
Oliver Walters 9986df2074 Add confirmation to cancel a build 2019-05-14 18:20:54 +10:00
Oliver Walters e87f545d75 Render zero stock as 'No Stock' in BOM table 2019-05-14 18:12:17 +10:00
Oliver Walters d1de6eb1f9 Copy across default tags when creating a new part 2019-05-14 17:32:29 +10:00
Oliver Walters 0842bd5833 Add 'default_keywords' field to a category 2019-05-14 17:30:24 +10:00
Oliver Walters 02033c2157 Add 'keywords' field to Part 
- Shows up in search results
 2019-05-14 17:23:20 +10:00
Oliver Walters 7447561f77 Fix link for part stock in BOM table 2019-05-14 17:12:06 +10:00
Oliver Walters 74c8b6768d BOM table fixes 
- Reorder columns
- Allow proper part name filtering
 2019-05-14 15:43:16 +10:00
Oliver Walters df227a375c Allow some more chars in part names 2019-05-14 15:42:53 +10:00
OliverandGitHub d98976679f Merge pull request #323 from SchrodingersGat/user-setings 
User setings
 2019-05-14 14:15:34 +10:00
Oliver Walters ba1e24cce8 PEP 2019-05-14 13:59:10 +10:00
Oliver Walters b996c03f61 Add a 'set password' form 2019-05-14 13:58:23 +10:00
Oliver Walters 0032ea3409 Add a form to edit basic user settings 
- First / last name
- Email address
 2019-05-14 13:33:47 +10:00
Oliver Walters 3c6d5756c5 Create a simple user settings view 2019-05-14 13:21:20 +10:00
OliverandGitHub 5a81372ead Merge pull request #319 from SchrodingersGat/confirm-delete 
Add a generic DeleteForm and update AjaxDeleteView
 2019-05-13 23:06:47 +10:00
Oliver Walters 069cebb669 PEP 2019-05-13 23:03:37 +10:00
Oliver Walters edc2cc49c2 Fix deletion form for BuildItem 2019-05-13 23:03:32 +10:00
Oliver Walters 06e95819c9 Update form for deleting a BOM item 2019-05-13 23:00:04 +10:00
Oliver Walters d679ee9971 Update form for deleting stock location 2019-05-13 22:58:42 +10:00
Oliver Walters 00b37b62db Updated form to delete part category 2019-05-13 22:55:40 +10:00
Oliver Walters ffa5a25fa9 Updated form for deleting part attachments 2019-05-13 22:53:58 +10:00
Oliver Walters fcdddf6bb6 Cleaup for delete supplier part form 2019-05-13 22:52:20 +10:00
Oliver Walters 0e0096467c Update delete form for Company objects 2019-05-13 22:50:05 +10:00
Oliver Walters a78106526a Remove launchDeleteForm JS function 
- All should be consolidated upon launchModalForm
- StockItem delete now uses this
 2019-05-13 22:47:36 +10:00
Oliver Walters e35a9284eb Add a generic DeleteForm and update AjaxDeleteView 2019-05-13 22:46:47 +10:00
OliverandGitHub 4860b88927 Merge pull request #318 from SchrodingersGat/deep-part-copy 
Deep part copy
 2019-05-13 22:03:18 +10:00