inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-27 19:37:39 +00:00
Code Activity
17,115 Commits 7 Branches 132 Tags
bddcef9c348acd74fa72b7a8b5bdfa0160865fd8
Commit Graph

17115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters
79e0f972e7 Merge remote-tracking branch 'inventree/master' 2019-05-02 17:47:17 +10:00
Oliver
2f7c02133e Merge pull request #201 from SchrodingersGat/part-attachments 
Part attachments
 2019-05-02 17:46:58 +10:00
Oliver
eccad94bd6 Merge pull request #200 from SchrodingersGat/price-display 
SupplierPart detail page now splits details into two columns
 2019-05-02 17:46:45 +10:00
Oliver Walters
03eb6f7ef1 Exclude migration files from PEP 2019-05-02 17:44:01 +10:00
Oliver Walters
6e8c1bcc84 Add views to Create / Edit / Delete a PartAttachment 
- Buttons to edit or delete existing attachments
- Button to add a new attachment
- Fixed conflicting migrations
 2019-05-02 17:29:21 +10:00
Oliver Walters
08b429fdb8 SupplierPart detail page now splits details into two columns 
- Price details in right-hand column
 2019-05-02 01:15:26 +10:00
Oliver Walters
505191089f Added buttons to edit and delete attachments 2019-05-02 01:06:06 +10:00
Oliver Walters
9614ac2958 Move attachments list to attachments tab 2019-05-02 01:06:06 +10:00
Oliver Walters
ad6f4e19b1 Add 'comment' field to part attachment model 2019-05-02 01:06:06 +10:00
Oliver Walters
2181c82a31 Add 'attachments' tab for Part 2019-05-02 01:05:32 +10:00
Oliver Walters
255d754045 Merge remote-tracking branch 'inventree/master' 2019-05-02 01:05:08 +10:00
Oliver
88cc3b7bc2 Merge pull request #199 from SchrodingersGat/migration-test 
Testing Travis migration checker
 2019-05-02 01:04:48 +10:00
Oliver Walters
385c13148d Merge branch 'migration-test' 2019-05-02 01:03:08 +10:00
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