2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-11 01:25:40 +00:00
Commit Graph

3728 Commits

Author SHA1 Message Date
a0ad95ab28 Save the date of Build cancellation 2019-05-02 21:23:53 +10:00
b91de1af7b Separate active / complete / cancelled builds 2019-05-02 21:16:35 +10:00
6482b54bc9 Merge pull request #205 from SchrodingersGat/qr-codes
Qr codes
2019-05-02 21:15:34 +10:00
9f70fff813 Added docstring 2019-05-02 20:58:33 +10:00
5a234a1070 Added barcode for Part object 2019-05-02 20:57:53 +10:00
592a009b36 Merge pull request #203 from SchrodingersGat/front-page
Improvements for the index/landing page
2019-05-02 20:51:22 +10:00
c901294a48 Add more information to the Barcode
- API endpoint URL
- Add barcode generation for StockLocation
2019-05-02 20:50:20 +10:00
d49ce465e5 Removed UUID field from StockItem
- QR code is now created based on a JSON object
- This will make it extensible to other things such as StockLocation
- Created a helper function to make Barcode objects
2019-05-02 20:40:56 +10:00
194a0962f3 PEP fixes 2019-05-02 20:19:08 +10:00
38100520df Add 'to_order' and 'to_build' collapsible panels 2019-05-02 20:18:34 +10:00
4d7ac870e0 Use the collapse template for the stock location list view 2019-05-02 19:02:03 +10:00
fbb120da53 Use collapse template in allocation page 2019-05-02 18:53:03 +10:00
18c5ad7a6e Add template for collapsible item 2019-05-02 18:46:39 +10:00
79e0f972e7 Merge remote-tracking branch 'inventree/master' 2019-05-02 17:47:17 +10:00
2f7c02133e Merge pull request #201 from SchrodingersGat/part-attachments
Part attachments
2019-05-02 17:46:58 +10:00
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
03eb6f7ef1 Exclude migration files from PEP 2019-05-02 17:44:01 +10:00
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
08b429fdb8 SupplierPart detail page now splits details into two columns
- Price details in right-hand column
2019-05-02 01:15:26 +10:00
505191089f Added buttons to edit and delete attachments 2019-05-02 01:06:06 +10:00
9614ac2958 Move attachments list to attachments tab 2019-05-02 01:06:06 +10:00
ad6f4e19b1 Add 'comment' field to part attachment model 2019-05-02 01:06:06 +10:00
2181c82a31 Add 'attachments' tab for Part 2019-05-02 01:05:32 +10:00
255d754045 Merge remote-tracking branch 'inventree/master' 2019-05-02 01:05:08 +10:00
88cc3b7bc2 Merge pull request #199 from SchrodingersGat/migration-test
Testing Travis migration checker
2019-05-02 01:04:48 +10:00
385c13148d Merge branch 'migration-test' 2019-05-02 01:03:08 +10:00
e852393c1d Remoe error for now, just list untracked files 2019-05-02 01:02:29 +10:00
20cfa71db2 Added migration file 2019-05-02 00:59:59 +10:00
22f8c1d8c7 Adjust model field (haven't run make migrate yet) 2019-05-02 00:57:44 +10:00
4de3445c58 Merge remote-tracking branch 'inventree/master' 2019-05-02 00:56:42 +10:00
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
ad7201cf5c Look at git output 2019-05-02 00:53:38 +10:00
8a8de2b78f Add migration file
- Should pass this time
2019-05-02 00:49:30 +10:00
25e29521ba Shoud fail this time 2019-05-02 00:46:59 +10:00
7e149f817c Small change to uuid should trigger migrations 2019-05-02 00:41:29 +10:00
a2314074d3 Merge remote-tracking branch 'inventree/master' 2019-05-02 00:30:17 +10:00
dde8657612 Merge pull request #189 from SchrodingersGat/build-allocation
Build allocation
2019-05-02 00:28:07 +10:00
460ff571e4 Merge remote-tracking branch 'inventree/master' 2019-05-02 00:26:34 +10:00
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
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
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
29f7b1a32b Revert "More intelligent passing of context data in AjaxView"
This reverts commit fbb9a708f5.
2019-05-01 22:52:33 +10:00
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
7f63a94f15 Cancel build function now works 2019-05-01 22:22:14 +10:00
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
ad1d75c259 Improve table formatting when no allocation items found 2019-05-01 18:54:54 +10:00
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
7dd960a299 PEP fixes 2019-05-01 08:19:57 +10:00
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
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