inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-26 08:31:25 +00:00
Code Activity
1,107 Commits 7 Branches 164 Tags
6ffb6db2487277b22a21af258dc29feacb38b9dd
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 6ffb6db248 Merge remote-tracking branch 'inventree/master' 2019-05-10 08:52:45 +10:00
OliverandGitHub 7ba5f7869a Merge pull request #290 from SchrodingersGat/auto-allocation 
Auto allocation
 2019-05-10 08:52:21 +10:00
Oliver Walters 66b729d579 Moved 'complete build' button to the build detail page 2019-05-10 08:44:07 +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 Walters 05f5aa27c5 Add a 'Remove build allocation' function 
- Removes all parts allocated to a given build
 2019-05-10 08:33:54 +10:00
OliverandGitHub 3543bd0b63 Update README.md 2019-05-10 07:40:08 +10:00
Oliver Walters 345913bc90 Improve rendering of 'Complete Build' form 2019-05-09 23:59:39 +10:00
Oliver Walters 7835562396 Auto-allocation form now working 
- Displays a list of stock items which will be allocated
 2019-05-09 23:55:30 +10:00
OliverandGitHub e1fbd4611f Merge pull request #289 from SchrodingersGat/delete_on_empty 
Delete on empty
 2019-05-09 23:26:19 +10:00
Oliver Walters 9b0825739a Merge remote-tracking branch 'inventree/master' 2019-05-09 23:07:42 +10:00
OliverandGitHub 793b4f8063 Merge pull request #288 from SchrodingersGat/tree-badges 
Tree badges
 2019-05-09 23:06:32 +10:00
Oliver Walters 027e1cf130 Add ability to edit 'delete_on_deplete' field 2019-05-09 23:06:19 +10:00
Oliver Walters ac326c135f Auto delete stock items when they are depleted 2019-05-09 23:01:32 +10:00
Oliver Walters 61351a8f8d Renamed add_transaction_note to addTransactionNote 2019-05-09 22:52:38 +10:00
Oliver Walters 897c0b5261 Send item 'pk' in tree JSON 2019-05-09 22:42:43 +10:00
Oliver Walters 92930766c6 Tree view now supports root URL link 2019-05-09 22:23:56 +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 34225193fa Improve tree toggle icon 2019-05-09 21:46:11 +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
OliverandGitHub f4941d55ed Merge pull request #285 from SchrodingersGat/hide-supplier-part 
Hide supplier_part field if the part cannot be purchased
 2019-05-09 18:46:48 +10:00
Oliver Walters b42f7fce44 Merge remote-tracking branch 'inventree/master' 2019-05-09 18:44:29 +10:00
OliverandGitHub 41d237c0e4 Merge pull request #284 from SchrodingersGat/hide-fields 
Hide some fields from forms
 2019-05-09 18:43:30 +10:00
Oliver Walters 2c5bb6b126 Hide supplier_part field if the part cannot be purchased 2019-05-09 18:43:22 +10:00
OliverandGitHub a94f4baa55 Merge pull request #283 from SchrodingersGat/can-build 
If a part has no bom items, the 'can_build' function now returns zero
 2019-05-09 18:39:06 +10:00
Oliver Walters ef9fb5b018 Hide some fields from forms 2019-05-09 18:38:37 +10:00
OliverandGitHub 459699bcd6 Merge pull request #282 from SchrodingersGat/stock-form-fix 
Enable 'Submit' button for Move Stock form
 2019-05-09 18:36:06 +10:00
Oliver Walters 1a115104d2 If a part has no bom items, the 'can_build' function now returns zero 2019-05-09 18:35:55 +10:00
Oliver Walters 30f491795d Merge remote-tracking branch 'inventree/master' 2019-05-09 18:33:36 +10:00
OliverandGitHub 8bf09300bb Merge pull request #281 from SchrodingersGat/page-title 
Page title
 2019-05-09 18:33:03 +10:00
Oliver Walters d891c8d7ea Enable 'Submit' button for Move Stock form 2019-05-09 18:32:30 +10:00
Oliver Walters 55f7557b5e Merge remote-tracking branch 'inventree/master' 2019-05-09 18:30:49 +10:00
OliverandGitHub 26b9c14667 Merge pull request #279 from SchrodingersGat/visual-tweaks 
Visual tweaks
 2019-05-09 18:28:35 +10:00
Oliver Walters 6724717346 Added title for Index and Search pages 2019-05-09 18:28:19 +10:00
Oliver Walters 40ca468b51 Added title for 'Build' app 2019-05-09 18:27:16 +10:00
Oliver Walters ca6bd0a999 Add page title for company page 2019-05-09 18:17:28 +10:00
Oliver Walters a067d9f4cd Add page title for Part app 2019-05-09 18:13:54 +10:00
Oliver Walters b9b17f39d9 Override page title for Stock app 2019-05-09 18:11:13 +10:00
Oliver Walters 873bd182f0 Vertical alignment of button toolbars 2019-05-09 18:04:42 +10:00
Oliver Walters 37405f4ec8 Align navigation bar with rest of content 2019-05-09 18:01:45 +10:00
Oliver Walters 4f56abf312 Fix scaling for thumbnail icons 2019-05-09 17:49:41 +10:00
Oliver Walters 6c4b5731db Reduce padding 2019-05-09 17:49:05 +10:00
Oliver Walters 9fc6268558 Increase size of part image display 2019-05-09 17:47:38 +10:00
Oliver Walters 5a0de7088b Merge remote-tracking branch 'inventree/master' 2019-05-09 12:03:36 +10:00
OliverandGitHub e22ae21dc2 Merge pull request #271 from SchrodingersGat/typo 
Fix a typo
 2019-05-09 09:04:52 +10:00
Oliver Walters e91aa075b6 Fix a typo 2019-05-09 08:55:25 +10:00
Oliver Walters 9319b9f433 Merge remote-tracking branch 'inventree/master' 2019-05-09 00:53:20 +10:00
OliverandGitHub 0652b2fa1a Merge pull request #269 from SchrodingersGat/company-part-thumb 
Display company thumb in company index
 2019-05-09 00:52:38 +10:00
Oliver Walters 15cd93a773 Display company thumb in company index 2019-05-09 00:49:19 +10:00
Oliver Walters b8942acfed Merge remote-tracking branch 'inventree/master' 2019-05-09 00:44:19 +10:00
OliverandGitHub b41ff3c42a Merge pull request #266 from SchrodingersGat/side-bar-improvements 
Side bar improvements
 2019-05-09 00:43:57 +10:00
Oliver Walters a0d8fbede3 Merge remote-tracking branch 'inventree/master' 2019-05-09 00:42:50 +10:00
OliverandGitHub fa2bf947ab Merge pull request #267 from SchrodingersGat/bom-img 
BOM table improvements
 2019-05-09 00:42:33 +10:00
Oliver Walters 7ac4308c22 PEP fix 2019-05-09 00:40:44 +10:00
Oliver Walters 94ad378b9d Part and company images return the 'no image found' image if they do not have an image 2019-05-09 00:39:51 +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 8e8930d51f Merge branch 'help-text' 2019-05-09 00:20:31 +10:00
OliverandGitHub aafc4e367d Merge pull request #265 from SchrodingersGat/help-text 
Help text
 2019-05-09 00:15:55 +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 Walters 206720849c Reduce icon size in sidenav bar 2019-05-09 00:12:50 +10:00
Oliver Walters 09b7578c35 Merge remote-tracking branch 'inventree/master' 2019-05-08 23:33:55 +10:00
Oliver Walters f05e05664b PEP fix 2019-05-08 23:33:37 +10:00
Oliver Walters e9c904076f Added help text for model fields 2019-05-08 23:32:57 +10:00
OliverandGitHub 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 fdd4d09714 Merge remote-tracking branch 'inventree/master' 2019-05-08 23:05:49 +10:00
OliverandGitHub a7794394a3 Merge pull request #263 from SchrodingersGat/select2-fix 
Modal fixes
 2019-05-08 23:03:38 +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 0deb6e8bea Merge remote-tracking branch 'inventree/master' 2019-05-08 22:09:40 +10:00
OliverandGitHub dece4a9d31 Merge pull request #255 from SchrodingersGat/build-allocation 
Build allocation
 2019-05-08 22:08:55 +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 1f9aa7a8fc Display thumbnail in Part 'used_in' detail view 2019-05-08 20:26:39 +10:00
Oliver Walters 58e5b10d26 Display supplier logo in part suppliers list 
- Also add a background colour for popup image in case of transparent image file
 2019-05-08 20:23:54 +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 afffd06fb8 Limit choices for 'parent' field when editing StockLocation 2019-05-08 18:00:34 +10:00
Oliver Walters fb38ddb1b3 Limit choices for 'parent' field when editing PartCategory 2019-05-08 17:57:31 +10:00
Oliver Walters ab76525da2 Initially sort part list by 'name' 2019-05-08 15:53:03 +10:00
Oliver Walters 416b5c9820 Include part image URL in Part API 2019-05-08 15:25:28 +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 40d8332e7f Add 'allocated' status code to build 
- This means that parts have been taken from stock
 2019-05-08 07:48:39 +10:00
Oliver Walters cd514bf1db Mark who a build was completed by 2019-05-07 23:39:42 +10:00
Oliver Walters 85869c07f6 Add 'allocated' column to Build detail view 2019-05-07 23:31:41 +10:00
Oliver Walters 29b94c91f3 Display part images in build allocation list 
(CSS needs some work)
 2019-05-07 23:28:46 +10:00
Oliver Walters 7101d9cb7e Add part description to build allocation table 2019-05-07 23:09:36 +10:00
Oliver Walters 7dd7b68ed6 Improve functions 2019-05-07 23:03:05 +10:00
Oliver Walters 4f84febbd1 More intelligent BuildItem allocation 
- Set initial value for quantity based on how many parts are left to allocate
- Auto select the StockItem to take from (if there is only one)
 2019-05-07 22:46:37 +10:00
Oliver Walters e58bed41b0 Visual style improvements 2019-05-07 21:24:09 +10:00
Oliver Walters 7e81d9021f Auto-show the active build table 2019-05-07 21:24:09 +10:00
Oliver Walters c10ddab30c Improve display of Build index 2019-05-07 21:24:09 +10:00
Oliver Walters ff14b0b363 Ensure that a StockItem is not already allocated to a Build 2019-05-07 21:24:09 +10:00
Oliver Walters 7c70b31af4 Build no longer auto-allocates on creation 
- Provide 'auto allocation' function which can be run by the user
 2019-05-07 21:24:09 +10:00
Oliver Walters 586bad4876 Merge remote-tracking branch 'inventree/master' 2019-05-07 21:17:42 +10:00
OliverandGitHub 6bc08af67d Merge pull request #254 from SchrodingersGat/favicon 
Added favicon
 2019-05-07 21:16:03 +10:00
Oliver Walters 6ac3f58e97 Added favicon 
generated using https://www.favicon-generator.org/
 2019-05-07 20:24:27 +10:00