Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,402 Commits 6 Branches 99 Tags 484 MiB
42ecb11dbc
Commit Graph

5402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters
e852393c1d Remoe error for now, just list untracked files 2019-05-02 01:02:29 +10:00
Oliver Walters
20cfa71db2 Added migration file 2019-05-02 00:59:59 +10:00
Oliver Walters
22f8c1d8c7 Adjust model field (haven't run make migrate yet) 2019-05-02 00:57:44 +10:00
Oliver Walters
4de3445c58 Merge remote-tracking branch 'inventree/master' 2019-05-02 00:56:42 +10:00
Oliver
c87af69628
Merge pull request #198 from SchrodingersGat/migration-check 
Travis check to see if there are any unstaged migration files
 2019-05-02 00:56:23 +10:00
Oliver Walters
ad7201cf5c Look at git output 2019-05-02 00:53:38 +10:00
Oliver Walters
8a8de2b78f Add migration file 
- Should pass this time
 2019-05-02 00:49:30 +10:00
Oliver Walters
25e29521ba Shoud fail this time 2019-05-02 00:46:59 +10:00
Oliver Walters
7e149f817c Small change to uuid should trigger migrations 2019-05-02 00:41:29 +10:00
Oliver Walters
a2314074d3 Merge remote-tracking branch 'inventree/master' 2019-05-02 00:30:17 +10:00
Oliver
dde8657612
Merge pull request #189 from SchrodingersGat/build-allocation 
Build allocation
 2019-05-02 00:28:07 +10:00
Oliver Walters
460ff571e4 Merge remote-tracking branch 'inventree/master' 2019-05-02 00:26:34 +10:00
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