bkinnightskytw
/
InvenTree
mirror of https://github.com/inventree/InvenTree.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,214 Commits 6 Branches 163 Tags 808 MiB
Commit Graph

166 Commits

Author SHA1 Message Date
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 001dacc14e Display 'no stock available' warning 2019-05-18 13:24:15 +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 b8f5c8cca7 Add confirmation box to stocktake form 2019-05-16 22:12:13 +10:00
Oliver Walters 8c92c2c2a1 Display overage values in BOM table 2019-05-15 07:23:02 +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 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 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
Oliver Walters e87f545d75 Render zero stock as 'No Stock' in BOM table 2019-05-14 18:12:17 +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 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 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 fa7555e34b Fix part name display 2019-05-13 18:56:51 +10:00
Oliver Walters 1d36ea3e2e Add a 'full_name' field for Part 
- Combines IPN | Name | Variant
- Use this to display in most views
 2019-05-12 12:16:04 +10:00
Oliver Walters 8d5c4c521c Pass stock move quantity through per item 2019-05-11 00:04:45 +10:00
Oliver Walters 99c0921113 Add quantity selector to 'move items' modal form 2019-05-10 23:51:26 +10:00
Oliver 9ba91a9d80
Merge pull request #299 from SchrodingersGat/part-revision 
Part revision
 2019-05-10 23:26:28 +10:00
Oliver Walters 6c394728cd Modal dropdowns now implement a partial-match search 
- SO MUCH BETTER ZOMG
- https://select2.org/searching
 2019-05-10 23:06:38 +10:00
Oliver Walters f76f1f54ae Add 'variant' field to Part model 
- Display 'long_name' which is concatenation of name and variant
 2019-05-10 22:17:13 +10:00
Oliver Walters 932c07287b Button fixes 2019-05-10 08:38:50 +10:00
Oliver Walters b377efbbec Replaced button text with icons 2019-05-10 08:36:08 +10:00
Oliver 793b4f8063
Merge pull request #288 from SchrodingersGat/tree-badges 
Tree badges
 2019-05-09 23:06:32 +10:00
Oliver Walters d04f38c724 Improve CSS for main page 
- Breadcrumb now appears above sidenav tree
- Better margin / etc
 2019-05-09 22:23:43 +10:00
Oliver Walters bff0f30b13 Save tree state 'per tree' 
- Separate save state for Part and Stock tree
 2019-05-09 21:41:44 +10:00
Oliver Walters 45223fb607 Display count badges in sidenav tree 
Uses the 'tags' parameter as according to the docs - https://github.com/jonmiles/bootstrap-treeview

- Part
- Stock
 2019-05-09 20:30:23 +10:00
Oliver Walters d891c8d7ea Enable 'Submit' button for Move Stock form 2019-05-09 18:32:30 +10:00
Oliver b41ff3c42a
Merge pull request #266 from SchrodingersGat/side-bar-improvements 
Side bar improvements
 2019-05-09 00:43:57 +10:00
Oliver Walters 4c4df194fa BOM table improvements 
- Add part image
- Replace button text with icons
- Fix bug in BOM download
 2019-05-09 00:29:16 +10:00
Oliver Walters cc7fb31d6d Save and recall expansion state of tree 
- Save choices to sessionStorage
 2019-05-09 00:15:43 +10:00
Oliver 82eceac604
Merge pull request #264 from SchrodingersGat/build-image-fix 
Improved part thumbnails in build allocation
 2019-05-08 23:27:53 +10:00
Oliver Walters d971747404 Improved part thumbnails in build allocation 2019-05-08 23:03:28 +10:00
Oliver Walters 92d0af4291 Modal fixes 
- Increase width of modal dialog
- Select inputs inside modals are now 100% width
 2019-05-08 22:29:23 +10:00
Oliver Walters 8fbba6846f Display part description in stock table 2019-05-08 22:05:46 +10:00
Oliver Walters b4b9d1514e Mark 'inactive' parts in part list table 
- Fix part display in search results page
 2019-05-08 22:03:59 +10:00
Oliver Walters 0754afd5f5 Display icons in supplier_part list 
- Bug fix for part list API query
 2019-05-08 20:16:53 +10:00
Oliver Walters 88a1df75d2 Render part image in the stock location list display 2019-05-08 19:32:00 +10:00
Oliver Walters 0058207fad Functionalize loadPartTable 2019-05-08 19:31:43 +10:00
Oliver Walters 2a66224952 Part image hover preview working in part-category-list 
- Yay for CSS!
 2019-05-08 19:15:41 +10:00
Oliver Walters 6a04e8b059 Allow sorting by BOM notes 2019-05-08 14:14:46 +10:00
Oliver Walters d96989f640 Reorder BOM table 2019-05-08 13:42:20 +10:00
Oliver Walters dcbd5d819c Enable DnD for Company image 
- Can actually use the existing form to do partial upload!
- Generecise the drag-and-drop upload function
- Remove some (now unnecessary) Python View code
 2019-05-07 14:47:31 +10:00
Oliver Walters 0969edc431 Some tweaks 
- Add (unused) function to download an external file
- JS tweaks
 2019-05-07 08:07:33 +10:00
Oliver Walters fe4acd48a7 Add the ability to extract image URL information when drag-and-dropping image URL from a browser window 
- Can't do anything with it yet...
- Code is almost there but leaving for now
 2019-05-07 00:04:35 +10:00