inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 20:46:08 +00:00
Code Activity
917 Commits 9 Branches 164 Tags
86b5b8d16e8ea61d7bc6cd5ffab1f493e86cf258
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 86b5b8d16e Add PartStar model to the admin interface 2019-05-05 08:50:14 +10:00
Oliver Walters 919f04044b Enforce uniqueness constraint 2019-05-05 08:48:41 +10:00
Oliver Walters 9919bebaa2 Add PartStart model 
- Links parts to users
 2019-05-05 08:46:23 +10:00
Oliver Walters 16edcc4bd9 Add 'star' button to Part 2019-05-05 08:42:01 +10:00
Oliver Walters 8a6932e993 Improve QR code display 
- Pretty little glyphicon button!
 2019-05-05 08:39:16 +10:00
OliverandGitHub e63ae5e92f Merge pull request #229 from SchrodingersGat/fixes 
Fixes
 2019-05-05 01:07:18 +10:00
Oliver Walters a66bc2fe72 Reload after adjusting Part attachments 2019-05-05 00:53:42 +10:00
Oliver Walters ecb8e71d75 Fixed a missing form title 2019-05-05 00:46:11 +10:00
OliverandGitHub 33947df3b6 Merge pull request #226 from SchrodingersGat/modal-dismiss 
Bug fix for modal question box
 2019-05-05 00:39:18 +10:00
Oliver Walters c383b2b246 Bug fix for modal question box 2019-05-05 00:38:19 +10:00
OliverandGitHub ecb8995e3e Merge pull request #225 from SchrodingersGat/coverage-testing 
Coverage testing
 2019-05-05 00:27:00 +10:00
Oliver Walters 22afccd294 Add tests for the custom templates 2019-05-05 00:21:54 +10:00
Oliver Walters fcc83ca7c7 Part API test suite now uses test data fixtures 2019-05-05 00:15:25 +10:00
Oliver Walters e2ced18753 Added some more BomItem tests 2019-05-05 00:00:30 +10:00
Oliver Walters c0e3007e4f Add some BomItem tests 
- Add a bom fixture
 2019-05-04 23:50:24 +10:00
Oliver Walters 1f80e8c655 More tests for Part 
- barcode
- category_path
 2019-05-04 23:35:52 +10:00
Oliver Walters 3fda5a3925 Convert test_part to use fixture data 2019-05-04 23:30:41 +10:00
Oliver Walters 663cc269b4 Test recursive child count 2019-05-04 23:22:32 +10:00
Oliver Walters ab6673caa3 Add tests for default location traversal 2019-05-04 23:20:59 +10:00
Oliver Walters 6d803d48b5 Add fixtures to the part test 
- Make development of further tests much easier
 2019-05-04 22:58:55 +10:00
OliverandGitHub d6285643b6 Merge pull request #224 from SchrodingersGat/cat-default-location 
Cat default location
 2019-05-04 22:02:00 +10:00
Oliver Walters bc7f3f77de PEPEP 2019-05-04 21:57:43 +10:00
Oliver Walters 67eda51cd2 Add part category tree traversal 
- If a category doesn't have a default_location, look at the parent category
- And so on and so on
 2019-05-04 21:56:18 +10:00
Oliver Walters 71972f4454 Add function to get the default location for a part 
- If field not specified, look at the part category
 2019-05-04 19:06:39 +10:00
OliverandGitHub 1a967947d9 Merge pull request #222 from SchrodingersGat/tweaks 
Tweaks - A quantity thereof
 2019-05-04 19:03:44 +10:00
Oliver Walters f270375847 Add ability to edit default_location for a PartCategory 2019-05-04 19:03:32 +10:00
Oliver Walters 4ffaad3f1a Add a default_location to the PartCategory model 
- If a part does not specify a default location, look at the default location of  the category
 2019-05-04 19:00:11 +10:00
Oliver Walters 59987940c8 green frog memes 2019-05-04 18:47:54 +10:00
Oliver Walters 9aa1a70f18 QR code improvements 
- Display QR codes as links to served images
- The qr_code plugin caches these images in the background
- Make a qr_code template to push out as a modal form
- Create a QRCodeView to simplify display of QR codes
- Add option to launchModalForm() to disable the 'submit' button

Refactored QR code display for

- StockLocation
- StockItem
- Part
 2019-05-04 18:46:57 +10:00
Oliver Walters 8e65c0a120 Fixes for some broken views 2019-05-04 17:20:05 +10:00
Oliver Walters 4ef1e4fc78 Explicitly mark some CharField as non blank 2019-05-04 17:01:31 +10:00
Oliver Walters 1d9e31c229 Add a spinning loading icon to modal forms 2019-05-04 16:58:03 +10:00
Oliver Walters b6cace2681 Add 'options' drop-down for Part table in Category view 
- Doesn't do anything yet
 2019-05-04 16:41:45 +10:00
Oliver Walters b1cdb7833d Add confirmation modal to activate/deactivate a part 
- New question modal available
 2019-05-04 16:31:23 +10:00
OliverandGitHub cac281599a Merge pull request #220 from SchrodingersGat/about 
Add 'About InvenTree' modal
 2019-05-04 11:41:03 +10:00
Oliver Walters 7dc24e5a55 ARRH 2019-05-04 11:31:07 +10:00
Oliver Walters 4fe3b9d779 add docstrings 2019-05-04 11:28:23 +10:00
Oliver Walters 28600ebc79 There's always another PEP 2019-05-04 11:27:11 +10:00
Oliver Walters b32a9ed597 Add 'About InvenTree' modal 
- Accessible from the top-right dropdown menu
- Add InvenTree/version.py which contains helper functions
 2019-05-04 11:23:30 +10:00
OliverandGitHub 293b386286 Merge pull request #219 from SchrodingersGat/backup-restore 
Add django-dbbackup app
 2019-05-04 01:07:36 +10:00
Oliver Walters 517262b233 PEP fixes 2019-05-04 01:04:30 +10:00
Oliver Walters 6c7613ba2f Fix form title 2019-05-04 01:03:43 +10:00
Oliver Walters 5f6909d32a Add django-dbbackup app 
- https://github.com/un1t/django-cleanup
- Backup location defaults to temp directory
 2019-05-04 01:00:58 +10:00
OliverandGitHub 689445a9bd Merge pull request #218 from SchrodingersGat/image-upload-fix 
Fixed part image upload
 2019-05-04 00:41:21 +10:00
Oliver Walters 4af59f0ca9 Fixed part image upload 
- Image was being saved twice
- Don't call super().post in AjaxUpdateView
- Instead, handle properly
 2019-05-04 00:38:17 +10:00
OliverandGitHub b6d6b648ef Merge pull request #217 from SchrodingersGat/no-records-found 
Improved table rendering
 2019-05-04 00:21:36 +10:00
OliverandGitHub 4619cf91f7 Merge pull request #216 from SchrodingersGat/stock-item-fix 
Handle case where a new stock item is to be created without the part …
 2019-05-04 00:03:02 +10:00
Oliver Walters 2eb825b0e6 Improved table rendering 2019-05-04 00:02:53 +10:00
OliverandGitHub f286effd62 Merge pull request #215 from SchrodingersGat/modal-improvements 
Modal improvements
 2019-05-03 23:52:48 +10:00
Oliver Walters a116c3f191 Handle case where a new stock item is to be created without the part being specified 2019-05-03 23:52:30 +10:00
Oliver Walters 109b6b868c Cature all form AJAX errors 
- remove all references to alert()
- Display error modal instead
 2019-05-03 23:46:00 +10:00
Oliver Walters 2b3094eac4 Add error dialog box for forms 
- Display status message
- Display status code
- Display extended error message in collapsible section
 2019-05-03 23:41:31 +10:00
Oliver Walters bade13f3b8 Fixed stocktake form to match new scheme 2019-05-03 23:08:31 +10:00
Oliver Walters 11af4e5683 Disable form input unless the form is valid 
- Disable on first open until server responds
- Disable after form submission until next server response
 2019-05-03 23:00:05 +10:00
Oliver Walters 8d6a4415e5 Better documentation for the modal form jQuery code 2019-05-03 22:33:55 +10:00
OliverandGitHub 598ddaace9 Merge pull request #210 from SchrodingersGat/completed_by 
Add 'completed_by' field to Build
 2019-05-03 08:07:09 +10:00
Oliver Walters 9c4a5d10fa PEP fixes 2019-05-03 08:04:30 +10:00
Oliver Walters 019d5aa4ba Add 'completed_by' field to Build 
- On Complete() or Cancel() user field is filled in
 2019-05-03 07:58:46 +10:00
OliverandGitHub a70ec0b179 Merge pull request #207 from SchrodingersGat/build-list 
Split build list display
 2019-05-02 21:32:33 +10:00
Oliver Walters 0be4ee5d92 PEP fix 2019-05-02 21:29:27 +10:00
Oliver Walters 1295390b03 Rendering changes 2019-05-02 21:28:47 +10:00
Oliver Walters a0ad95ab28 Save the date of Build cancellation 2019-05-02 21:23:53 +10:00
Oliver Walters b91de1af7b Separate active / complete / cancelled builds 2019-05-02 21:16:35 +10:00
OliverandGitHub 6482b54bc9 Merge pull request #205 from SchrodingersGat/qr-codes 
Qr codes
 2019-05-02 21:15:34 +10:00
Oliver Walters 9f70fff813 Added docstring 2019-05-02 20:58:33 +10:00
Oliver Walters 5a234a1070 Added barcode for Part object 2019-05-02 20:57:53 +10:00
OliverandGitHub 592a009b36 Merge pull request #203 from SchrodingersGat/front-page 
Improvements for the index/landing page
 2019-05-02 20:51:22 +10:00
Oliver Walters c901294a48 Add more information to the Barcode 
- API endpoint URL
- Add barcode generation for StockLocation
 2019-05-02 20:50:20 +10:00
Oliver Walters 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
Oliver Walters 194a0962f3 PEP fixes 2019-05-02 20:19:08 +10:00
Oliver Walters 38100520df Add 'to_order' and 'to_build' collapsible panels 2019-05-02 20:18:34 +10:00
Oliver Walters 4d7ac870e0 Use the collapse template for the stock location list view 2019-05-02 19:02:03 +10:00
Oliver Walters fbb120da53 Use collapse template in allocation page 2019-05-02 18:53:03 +10:00
Oliver Walters 18c5ad7a6e Add template for collapsible item 2019-05-02 18:46:39 +10:00
OliverandGitHub 2f7c02133e Merge pull request #201 from SchrodingersGat/part-attachments 
Part attachments
 2019-05-02 17:46:58 +10:00
OliverandGitHub 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
OliverandGitHub 88cc3b7bc2 Merge pull request #199 from SchrodingersGat/migration-test 
Testing Travis migration checker
 2019-05-02 01:04:48 +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
OliverandGitHub 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
OliverandGitHub dde8657612 Merge pull request #189 from SchrodingersGat/build-allocation 
Build allocation
 2019-05-02 00:28:07 +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