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
824 Commits 9 Branches 164 Tags
09b7846310aa2daf2ee96465e93b14f9e7ffcc46
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 09b7846310 Improve edit form for BuildItem 
- Hide the build field
- Limit the choices for StockItem (don't let user change the allocation!)
 2019-05-02 00:25:19 +10:00
Oliver Walters a4aec425be Render better build description in complete form 
- List of items to be removed from stock
- Detail of what will be created
 2019-05-02 00:12:28 +10:00
Oliver Walters 905d78e25c Complete build now works 
- Marks build as complete
- Deletes temporary BuildItem objects
- Preselects the part's default_location if there is one
- Creates a new stockitem in the selected location
 2019-05-02 00:04:39 +10:00
Oliver Walters 29f7b1a32b Revert "More intelligent passing of context data in AjaxView" 
This reverts commit fbb9a708f5.
 2019-05-01 22:52:33 +10:00
Oliver Walters fbb9a708f5 More intelligent passing of context data in AjaxView 
- If context is not explicitly supplied, use default get_context_data() function
 2019-05-01 22:45:41 +10:00
Oliver Walters 7f63a94f15 Cancel build function now works 2019-05-01 22:22:14 +10:00
Oliver Walters 98109bb1a1 Make build allocation much more intuiitive 
- Display current allocation + total allocation requirement
- Color code results
- Required custom 'multiply' template tag
 2019-05-01 22:12:34 +10:00
Oliver Walters ad1d75c259 Improve table formatting when no allocation items found 2019-05-01 18:54:54 +10:00
Oliver Walters 7c11d917de Bug fixes 
- Part creation form was setting a field as HiddenInput() rather than its widget
- Added 'comment' file to FileAttachment model
 2019-05-01 09:40:49 +10:00
Oliver Walters 7dd960a299 PEP fixes 2019-05-01 08:19:57 +10:00
Oliver Walters 436d158cfe Merge remote-tracking branch 'inventree/master' into build-allocation 
# Conflicts:
#	InvenTree/company/templates/company/tabs.html
 2019-05-01 08:15:58 +10:00
Oliver Walters fc42cca10e Automatically allocate parts when a Build is created 
- If there is only one StockItem to choose from, allocate parts from that StockItem
 2019-05-01 08:08:50 +10:00
Oliver Walters b6becbc570 Rework build allocation 
- Each item renders as a collapsible panel with overview data at the top
 2019-05-01 07:48:46 +10:00
Oliver Walters 7e7ac60a1a Tweaks 
- Can't edit build status directly
- Refresh BOM table on reload
- Hide Company tabs that are not yet functional
 2019-04-30 20:55:28 +10:00
Oliver Walters fb89574c42 Skeleton code for Build cancel() and complete() functions 
- BuildComplete view
 2019-04-30 20:39:01 +10:00
Oliver Walters d518739643 PEP fixes 2019-04-30 19:17:54 +10:00
Oliver Walters 11d3975860 Build javascript improvements 
- Alter 'no records found' text
- Reload allocation table on edit or delete
 2019-04-30 19:08:13 +10:00
Oliver Walters d061250a9a Changed delete form close button to "Cancel" 2019-04-30 18:57:37 +10:00
Oliver Walters efbef251b6 Added views / forms to edit and delete BuildItem objects 
- Alter stock allocation
- remove (unallocate) stock from a build
 2019-04-30 18:51:05 +10:00
Oliver Walters 24ed6f393b When adding new item allocations, filter the available stock items 
- Must match the appropriate part
- Remove items that are already allocated
 2019-04-30 16:38:09 +10:00
Oliver Walters 6961d1ec68 Catch BuildItem errors in clean() 2019-04-30 16:35:55 +10:00
Oliver Walters fbd5a2a270 Register BuildItem in admin interface 2019-04-30 16:35:40 +10:00
Oliver Walters db5521f02e Limit available choicse in form 
- Only allow selection of StockItem which matches the correct part
 2019-04-30 15:48:26 +10:00
Oliver Walters 0208c6efe6 New Form and View to create a new BuildItem object 
- Allocates stock to a build
 2019-04-30 15:35:35 +10:00
Oliver Walters 1b32f9d650 Removed unused function 2019-04-30 15:14:59 +10:00
Oliver Walters b192deb465 Calculate total allocation data per-row 2019-04-30 14:54:42 +10:00
Oliver Walters aa491e336d Move javascript for Build allocation to build.js 2019-04-30 14:42:48 +10:00
Oliver Walters a3d4c81939 Display and edit build URL field 2019-04-30 14:04:43 +10:00
Oliver Walters 395db4df38 Pepe fixes 2019-04-30 00:18:58 +10:00
Oliver Walters 8ec4101edd Reduce items presented in BOM creation list 
- Don't allow selection of parts that are already in the BOM!
 2019-04-30 00:16:20 +10:00
Oliver Walters 5c5411132a First pass at build allocation table 
- Uses bootstrap-table "detailView" function
 2019-04-29 23:56:02 +10:00
Oliver Walters 192f604b76 Override get_queryset for BuildItem API view 
- Special management to allow filtering by part
 2019-04-29 23:45:05 +10:00
Oliver Walters c29827e45a Add API endpoint and serializer for BuildItem model 2019-04-29 22:59:42 +10:00
Oliver Walters 17d9d25fb9 Require Build and StockItem to be unique_together in BuildItem class 2019-04-29 22:56:40 +10:00
Oliver Walters f42116c0d9 Renamed 'stock' to 'stock_item' 2019-04-29 22:33:39 +10:00
Oliver Walters e25579141e Rename BuildItemAllocation to BuildItem 2019-04-29 22:30:21 +10:00
Oliver Walters 6326d6d050 Fixed spelling mistake 2019-04-29 22:21:18 +10:00
Oliver Walters 989611cae2 Added BuildItemAllocation Model 
- Used to link stock items to a build
 2019-04-29 22:19:13 +10:00
OliverandGitHub c02b7c9dc5 Merge pull request #188 from SchrodingersGat/tweaky-twoos 
Small fixes
 2019-04-29 18:58:54 +10:00
Oliver Walters e471313435 PEP fix 2019-04-29 18:43:44 +10:00
Oliver Walters 3b838d29ec Small fixes 
- Hide some tabs that aren't functional yet
- Hide fields instead of marking them as disabled
- Default behaviour is to allow all hosts
 2019-04-29 18:35:16 +10:00
OliverandGitHub 99b386fb95 Merge pull request #185 from SchrodingersGat/active-part 
Inactive part
 2019-04-29 00:04:26 +10:00
OliverandGitHub e7a73e2dd9 Merge pull request #186 from SchrodingersGat/supplier-part-limit 
Supplier part limit
 2019-04-29 00:02:03 +10:00
Oliver Walters 07fbaa9dd9 Test fix 
- Part list API handles 'category' filtering a bit differently
- Probably need to address this
 2019-04-29 00:01:57 +10:00
Oliver Walters 05333e7e7d PEP fixes 2019-04-28 23:58:14 +10:00
Oliver Walters 87411293cf docstring improvements 2019-04-28 23:57:29 +10:00
Oliver Walters bc12af5994 Remove the 'supplier_part' field when first creating a Part object 
- As the Part does not yet exist, there are no matching SupplierPart objects
 2019-04-28 23:55:21 +10:00
Oliver Walters 4e3702384b Limit SupplierPart option in Part edit form 
- Only allow selection of SupplierPart that match the Part being edited
 2019-04-28 23:50:35 +10:00
Oliver Walters 6612e91aec Remove ability to delete part via API 2019-04-28 23:41:47 +10:00
Oliver Walters 73f672495d Use API to mark part as active/inactive 2019-04-28 23:40:26 +10:00
Oliver Walters 492d705b39 Hide inactive parts in parts list 2019-04-28 23:22:54 +10:00
Oliver Walters 1a66a12d57 Enable Part API to filter by active status 2019-04-28 23:15:30 +10:00
Oliver Walters 495d414d54 Hide some options if a part is not active 2019-04-28 23:12:59 +10:00
Oliver Walters 260d890052 If a part is not active, display an INACTIVE Message on part page 2019-04-28 23:08:54 +10:00
Oliver Walters c2a35b6656 Add 'active' field to Part model 2019-04-28 23:00:38 +10:00
OliverandGitHub 13756751c3 Update README.md 2019-04-28 21:28:08 +10:00
OliverandGitHub 760ca0f800 Merge pull request #184 from SchrodingersGat/pip-doc 
Comments for pip requirements.txt
 2019-04-28 19:44:05 +10:00
Oliver Walters 32bbbbd404 Comments for pip requirements.txt 2019-04-28 19:41:03 +10:00
OliverandGitHub 77f4717479 Merge pull request #183 from SchrodingersGat/tweaks 
Some small tweaks
 2019-04-28 19:34:25 +10:00
Oliver Walters 2f7f49c116 PEP fix 2019-04-28 11:54:40 +10:00
Oliver Walters a9224445b6 Added docstring 2019-04-28 11:54:08 +10:00
Oliver Walters ba49b080b0 Some small tweaks 2019-04-28 11:46:53 +10:00
OliverandGitHub e5e6480099 Merge pull request #181 from SchrodingersGat/supplier-parts 
Supplier parts
 2019-04-28 11:28:32 +10:00
Oliver Walters 1171953e65 Limit SupplierPart options in CreateBomItem form 
- If Part is selected, limit the options in supplier_part field
- Only allow supplier_parts which map back to the same part
 2019-04-28 11:24:26 +10:00
Oliver Walters a9fbbc3a37 Remove references to get_object_or_404 
- Properly handle DoesNotExist errors
 2019-04-28 11:09:19 +10:00
Oliver Walters 624c5094c5 Prevent editing of SupplierPart fields if initial values are provided 2019-04-28 10:57:32 +10:00
Oliver Walters 101ce53cd3 Update docstrings for InvenTree/views.py 2019-04-28 10:46:07 +10:00
Oliver Walters ff068de16d Simplify AjaxDeleteView 2019-04-28 10:41:54 +10:00
Oliver Walters 72ff25e0c1 Simplify AjaxUpdateView 
- Using get_form() is MUCH simpler
 2019-04-28 10:39:46 +10:00
Oliver Walters 96a15453c4 Simplify AjaxCreateView 
- Screams in reading the documentation
 2019-04-28 10:35:17 +10:00
Oliver Walters cd438f0569 Add generic method for retriving GET or POST params 2019-04-28 09:53:42 +10:00
OliverandGitHub cb02be3c80 Merge pull request #179 from SchrodingersGat/make-fix 
Update makefile
 2019-04-28 09:44:35 +10:00
Oliver Walters e5fc43a00f Fix improper references to template_name for ajax forms 
- Should be ajax_template_name
 2019-04-28 09:00:54 +10:00
Oliver Walters 9b77340782 Change field ordering for SupplierPart form 
- Import fields first!
 2019-04-28 08:55:29 +10:00
Oliver Walters 2108ee2eb7 Update makefile 2019-04-28 08:42:17 +10:00
OliverandGitHub bf76a6024e Update README.md 
Much improve so better
 2019-04-28 08:39:41 +10:00
OliverandGitHub 5b6ba0bb8b Merge pull request #178 from SchrodingersGat/toc-url-fix 
Remove absolute URL encoding
 2019-04-28 08:12:08 +10:00
Oliver Walters 7c45f8dc24 Remove absolute URL encoding 
- Should now work on RTD
 2019-04-28 08:11:29 +10:00
OliverandGitHub b52fe8810c Merge pull request #176 from SchrodingersGat/doc-fix 
Fix for autoapi-dirs
 2019-04-28 01:17:53 +10:00
Oliver Walters e512bc6536 Fix for autoapi-dirs 2019-04-28 01:17:28 +10:00
OliverandGitHub 9d9d755b4e Merge pull request #175 from SchrodingersGat/doc-improvements 
Doc improvements
 2019-04-28 01:13:41 +10:00
Oliver Walters d55ea1a982 PEP fixes 2019-04-28 01:09:48 +10:00
Oliver Walters aa04941bf1 Add module-level docstrings for each app 2019-04-28 01:05:45 +10:00
Oliver Walters b0487b33dc Change documentation root url to 'docs' 2019-04-28 00:58:59 +10:00
Oliver Walters 3a43a8ba72 Add custom links to app documentation 2019-04-28 00:57:29 +10:00
Oliver Walters c87166a49a Prevent auto-addition of toc by autoapi 
- Also fix links in sidebar
 2019-04-28 00:37:20 +10:00
Oliver Walters 0d8f14d3e2 Add index and modindex to sidebar 
- https://stackoverflow.com/questions/25243482/how-to-add-sphinx-generated-index-to-the-sidebar-when-using-read-the-docs-theme
 2019-04-28 00:20:27 +10:00
Oliver Walters 4aef8eecea Force TOC to appear in sidebar for each page 
- https://stackoverflow.com/questions/18969093/how-to-include-the-toctree-in-the-sidebar-of-each-page#19007358
 2019-04-28 00:03:19 +10:00
Oliver Walters a499fd325e Docstring for Stock app 2019-04-27 22:49:16 +10:00
Oliver Walters ed3ae30248 Documentation for Part app 2019-04-27 22:18:07 +10:00
Oliver Walters 5e6d49102d Add docstring documentation to the main InvenTree app 2019-04-27 21:21:58 +10:00
Oliver Walters c3f0570926 Add docstring to Company app 2019-04-27 20:43:27 +10:00
Oliver Walters d9169a0dd1 Add docstrings for Build app 2019-04-27 20:35:14 +10:00
OliverandGitHub 6147ac3f06 Update README.md 
Added documentation badge
 2019-04-27 18:00:08 +10:00
OliverandGitHub 87c4a9b1e9 Merge pull request #172 from SchrodingersGat/rtd 
Update the .readthedocs.yml file
 2019-04-27 17:57:49 +10:00
Oliver Walters 850e445fc2 Update the .readthedocs.yml file 2019-04-27 17:57:00 +10:00
OliverandGitHub cad5b4276c Merge pull request #171 from SchrodingersGat/documentation 
Configure automated documentation
 2019-04-27 17:46:00 +10:00
Oliver Walters 22bfd970cc Use v2 of readthedocs 2019-04-27 17:45:40 +10:00
Oliver Walters 6395894798 Add some more .gitignore stuff 2019-04-27 17:41:17 +10:00
Oliver Walters 0c573684fc Add readthedocs configuration file 2019-04-27 17:35:45 +10:00