inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-17 12:13:49 +00:00
Code Activity
5,985 Commits 9 Branches 164 Tags
628e365c6a0f141831b94ed467a7d23b75b10f8c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
OliverandGitHub 604c136b00 Update version.py 2021-06-27 21:00:01 +10:00
OliverandGitHub 786e994e19 Update version.py 
0.2.4
 2021-06-27 20:58:24 +10:00
OliverandGitHub 42ed95c936 Merge pull request #1588 from matmair/part-import 
Part import
 2021-06-27 09:24:10 +10:00
OliverandGitHub 9e720ea620 Merge pull request #1700 from SchrodingersGat/api-default-values 
Unit testing for default values
 2021-06-27 09:01:01 +10:00
Oliver Walters 34a374ce9a Add try/except around callable default 2021-06-27 01:18:09 +10:00
Oliver Walters 0cc999410b More unit test fixes 2021-06-27 01:03:54 +10:00
Oliver Walters 7505d7b3c5 Unit test fixes 2021-06-27 00:47:12 +10:00
Oliver Walters d3e9803fd4 Remove debug statement 2021-06-27 00:25:49 +10:00
Oliver Walters 232899e0c4 Simpler implementation 2021-06-27 00:25:23 +10:00
Oliver Walters 8913b74f41 Typo fixes 2021-06-27 00:12:10 +10:00
Oliver Walters ae1a1e139f Further fixes for default API values 
- Account for callable defaults
- Extra check in is_valid()
 2021-06-27 00:01:40 +10:00
Oliver a0390f0821 PEP style fixes 2021-06-26 21:14:47 +10:00
Oliver b2aa38fefa Override get_initial() rather than is_valid() 2021-06-26 21:14:10 +10:00
Oliver ddbf863617 Merge remote-tracking branch 'inventree/master' into api-default-values 
# Conflicts:
#	InvenTree/InvenTree/serializers.py
 2021-06-26 21:04:41 +10:00
Oliver ba1c70e86b Intercept is_valid() method to set default values 2021-06-26 20:48:09 +10:00
OliverGitHubgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 		3f1aca9e94 Translation merge (#1724) 
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* New Crowdin updates (#1670)

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2021-06-26 20:18:25 +10:00
OliverandGitHub 76ec51a93b Merge pull request #1722 from matmair/internal-price-op 
full Internal price coverage
 2021-06-25 07:37:06 +10:00
OliverandGitHub be85de4a7b Merge pull request #1719 from SchrodingersGat/test-results-fix 
Fixes table data nesting
 2021-06-24 13:40:09 +10:00
Oliver a12790d5ca Fixes table data nesting 
Sometimes you just need a quick break
 2021-06-24 13:23:12 +10:00
OliverandGitHub fcbb4c593b Merge pull request #1715 from SchrodingersGat/tweaks 
Change some warnings to infos
 2021-06-23 19:50:07 +10:00
Oliver f0db9bc3d5 Live update of Company image 2021-06-23 19:29:41 +10:00
Oliver 70a073be21 Live update part image 2021-06-23 19:28:23 +10:00
Oliver 2e1ad0c245 Change some warnings to infos 2021-06-23 18:54:01 +10:00
OliverandGitHub 5e338dca3f Merge pull request #1710 from SchrodingersGat/inventree-api-image-upload 
Allow direct upload of images via the API
 2021-06-23 11:54:01 +10:00
Oliver 36e6b9f164 Set allow_null flag on image fields 2021-06-23 11:40:37 +10:00
Oliver 5ba7aeaa27 Fixes: 
- Use DRF ImageField, not FileField
- Ensure that permissions get updated correctly in 'test' mode
- Allow file upload in the APITester class
 2021-06-23 10:28:21 +10:00
Oliver a866001ffe Bump API version to 6 2021-06-23 08:40:51 +10:00
Oliver 878f26c770 Enable upload of company image via the API 2021-06-23 08:39:06 +10:00
Oliver f199feb8d9 Use the part detail API for uploading a new image 2021-06-23 08:34:45 +10:00
Oliver b8e4b58df0 Catch potential error updating image that does not exist... 2021-06-22 22:23:27 +10:00
Oliver 2fc7c3d883 fix typo 2021-06-22 22:16:11 +10:00
Oliver e29594811b Allow direct upload of images via the API 2021-06-22 22:09:30 +10:00
OliverandGitHub 962badc36d Merge pull request #1682 from matmair/order-modal-show-price 
Order modal show price
 2021-06-22 21:27:59 +10:00
OliverandGitHub 37cbb6f6b8 Merge pull request #1709 from SchrodingersGat/python-ci-fixes 
Fixes for python integration
 2021-06-22 21:15:30 +10:00
Oliver 3884ab0df2 Change workflow target 2021-06-22 20:58:29 +10:00
Oliver 691888ec1e Fixes for python integration 2021-06-22 20:49:49 +10:00
OliverandGitHub e0301c56fb Merge pull request #1708 from SchrodingersGat/python-ci 
Add workflow to build python bindings
 2021-06-22 20:40:59 +10:00
Oliver fcd38c16d8 Add workflow to ensure that the python bindings build whenever there's a push to master 2021-06-22 20:26:55 +10:00
OliverandGitHub da311fbab7 Merge pull request #1707 from SchrodingersGat/order-api-fixes 
Fixes for order API interface
 2021-06-22 17:23:50 +10:00
Oliver 1456868d03 Add default values for line item serializers 
- Once https://github.com/inventree/InvenTree/issues/1687 is fixed, remove default values
 2021-06-22 17:03:21 +10:00
Oliver 4fe6562d29 PEP fixes 2021-06-22 16:43:49 +10:00
Oliver 26dd9c10a4 Fixes for SalesOrder API 2021-06-22 16:43:38 +10:00
Oliver 3fa3ce06a1 Fixes for PurchaseOrder API interface 
- Allow DELETE endpoint for PurchaseOrder
- Remove 'read_only' attribute for 'reference' field
- Add extra functionality to API test class
- Add unit testing
 2021-06-22 16:28:42 +10:00
OliverandGitHub 061a120af2 Merge pull request #1705 from SchrodingersGat/part-validation 
API Validation fixes
 2021-06-22 13:39:05 +10:00
Oliver 979ef674d6 Update data for unit test fixtures 2021-06-22 13:24:03 +10:00
Oliver eae9ff7d1d More unit test fixes 2021-06-22 11:54:18 +10:00
OliverandGitHub df7b0c961d Merge pull request #1706 from SchrodingersGat/build-item-sorting 
Bug fix for build order allocation sorting
 2021-06-22 11:08:31 +10:00
Oliver 650d31ae32 Remove debug statements 2021-06-22 10:43:00 +10:00
Oliver 6d2cd78d29 Fixes for unit tests 2021-06-22 10:36:04 +10:00
Oliver 6886570d0f Bug fix for build order allocation sorting 2021-06-22 10:30:15 +10:00
Oliver 9475af62ae Style fixes 2021-06-22 10:12:44 +10:00
Oliver c62ba5eb12 Perform a "full_clean" on serialized model 
- DRF does not by deault run validate_unique on the model
- Need to check if we are "creating" or "updating" a model
- Catch and re-throw errors in the correct format
- Unit tests
 2021-06-22 10:09:19 +10:00
Oliver c3fc04e872 Unit testing for part duplication 2021-06-22 09:35:34 +10:00
Oliver a38835022a Better management of unique constraint for Part 2021-06-22 09:33:07 +10:00
Oliver 40fcfe1f47 Reduce noise in logs 2021-06-22 09:32:36 +10:00
OliverandGitHub ba8d5fa3f4 Merge pull request #1701 from atwalsh/supplier-part-no-mfr 
Fix supplier part view/edit without a manufacturer
 2021-06-22 08:26:41 +10:00
Oliver 8fd41f5ecf Unit testing for default values 2021-06-21 21:46:22 +10:00
OliverandGitHub f90730d866 Merge pull request #1699 from SchrodingersGat/purchase-price-migration 
Data migration to copy missing purchase price information to stock items
 2021-06-21 20:57:23 +10:00
Oliver 02540edd58 Copy purchase price information across in the data migration 2021-06-21 20:30:15 +10:00
Oliver ff33cc43bd Create initial migration file 2021-06-21 17:28:41 +10:00
OliverandGitHub 044650ca10 Merge pull request #1698 from SchrodingersGat/po-stock-pricing 
Displays "purchase order" column in StockItem table
 2021-06-21 17:19:38 +10:00
Oliver 6d29418364 Prevent "rebuild" command from running certain things 2021-06-21 17:03:00 +10:00
Oliver e6598b5115 Displays "purchase order" column in StockItem table 2021-06-21 16:58:39 +10:00
OliverandGitHub 5e5fc35655 Merge pull request #1688 from SchrodingersGat/supplier-part-parameters 
Adds "parameters" for manufacturer parts
 2021-06-21 16:39:15 +10:00
Oliver e0e560352e Add forms / views for ManufacturerPartParameter CRUD 2021-06-21 16:14:58 +10:00
Oliver 04b216253d Ok, that was a bad idea. 2021-06-21 11:30:20 +10:00
Oliver 908039e1db Perform unique checks for InvenTreeModelSerializer in DRF 
- Prevents ValidationError from throwing in the wrong spot and not being handled
 2021-06-21 11:10:29 +10:00
OliverandGitHub 32385f709b Create RELEASE.md 2021-06-21 10:52:40 +10:00
Oliver 5198c5f9fa Fix for delete-data command 2021-06-21 10:38:50 +10:00
Oliver 8e9e04b400 Adds invoke task for deleting all database records 2021-06-21 10:23:53 +10:00
Oliver 213e4dccc5 Add model to permission set 2021-06-21 08:35:54 +10:00
OliverandGitHub 637033cf7d Merge pull request #1692 from matmair/part-table-cat-sort 
Support sorting by category in part-table
 2021-06-21 08:33:09 +10:00
OliverandGitHub b7a5a7f524 Merge pull request #1691 from matmair/purchase-price-zero 
Purchase price zero
 2021-06-21 08:26:42 +10:00
OliverandGitHub 44b9328cf7 Merge pull request #1690 from matmair/bug-timezone-waning 
fix for timezone warning on heartbeat
 2021-06-21 07:36:38 +10:00
Oliver 8a8b310195 Add some more inlines in the admin interface 2021-06-21 00:46:15 +10:00
Oliver 70b6a3c13f Display table of parameters 2021-06-21 00:39:18 +10:00
Oliver a00441a1c0 Adds API endpoints for ManufacturerPartParameter mdoel 2021-06-21 00:28:28 +10:00
Oliver bea7ab7175 Add python version information to the "about" window 2021-06-21 00:25:27 +10:00
Oliver 0013eb4c23 Adds inline for SupplierPart 2021-06-21 00:03:16 +10:00
Oliver 8188ba86a7 Adds tabular inline class for ManufacturerPartParameter 
- Super cool!
 2021-06-21 00:00:55 +10:00
Oliver 3fcb552759 Register admin class for ManufacturerPartParameter 2021-06-20 23:54:03 +10:00
Oliver 310f369394 Adds admin interface for ManufacturerPart 2021-06-20 23:49:44 +10:00
Oliver 2473318828 Add ManufacturerPartParameter model 2021-06-20 17:50:07 +10:00
Oliver 847d946fa4 Bug fixes 2021-06-20 17:39:00 +10:00
OliverandGitHub fa5f155c72 Merge pull request #1686 from SchrodingersGat/demo-dataset 
Demo dataset
 2021-06-20 17:27:51 +10:00
Oliver 5a2227862a Exclude authtoken 2021-06-20 16:36:39 +10:00
Oliver 7cc1c84b4b exclude exchange rate info from import / export tasks 2021-06-20 16:13:07 +10:00
OliverandGitHub 05142d977a Merge pull request #1684 from SchrodingersGat/rebuild-command 
Adds a management command to rebuild MPTT models
 2021-06-18 22:08:43 +10:00
Oliver 9a4ccedf5c Adds a management command to rebuild MPTT models 
- Important to do after importing records / fixtures!
- Otherwise very strange things might happen especially when you try to use the API...
 2021-06-18 21:53:15 +10:00
OliverandGitHub e36414b312 Merge pull request #1316 from SchrodingersGat/part-allocation-display 
Part allocation display
 2021-06-18 20:10:28 +10:00
Oliver e68a4abdf2 Error: wrong error 2021-06-18 19:51:54 +10:00
Oliver 3fb57abe66 Error catching 2021-06-18 19:39:06 +10:00
Oliver 34c34487b5 PEP style fix 2021-06-18 19:21:46 +10:00
Oliver 778aa0314d Load and display build order allocation items via AJAX 2021-06-18 19:18:35 +10:00
Oliver 245c9bfd28 Enhancement for the BuildItem API / serializer 
- Add optional "part_detail" information
- Add optional "build_detail" information
- Add optional "location_detail" information
 2021-06-18 19:08:54 +10:00
Oliver 10ecddf9b4 Fixes after rebase 2021-06-18 17:25:24 +10:00
Oliver Walters 0b8a50cd92 Add 'location_detail' filter 2021-06-18 16:51:34 +10:00
Oliver Walters caf52c6ce5 Add optional detail elements to SOAllocation API 2021-06-18 16:49:56 +10:00
Oliver Walters ad8dbb5900 Add API LIST endpoint for SalesOrderAllocations 2021-06-18 16:48:32 +10:00
OliverandGitHub 43478a0be7 Merge pull request #1634 from matmair/internal-price 
Internal price
 2021-06-18 10:36:29 +10:00