inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 12:36:11 +00:00
Code Activity
4,000 Commits 9 Branches 164 Tags
9fa718e58dec8ccf73d67188711a23f561dab753
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
OliverandGitHub 9fa718e58d Merge pull request #1130 from eeintech/api_category_parameters 
Improved API endpoint for category parameter templates
 2020-11-17 09:36:34 +11:00
OliverandGitHub d8e7c2a932 Update version.py 2020-11-15 16:53:27 +11:00
OliverandGitHub 20f6964b1f Update version.py 2020-11-15 16:51:50 +11:00
OliverandGitHub 771efecaa2 Merge pull request #1127 from SchrodingersGat/settings-view-unit-test 
Extra unit testing for settings forms / views
 2020-11-14 09:19:31 +11:00
Oliver Walters 2e842503e6 Fix try statement 2020-11-14 07:39:51 +11:00
Oliver Walters b738f8b143 Try transaction.atomic 2020-11-13 22:22:02 +11:00
Oliver Walters aae1400929 Mayyyyyyyyyyyyybe? 2020-11-13 21:37:39 +11:00
Oliver Walters 5f9758e85f More fixes 2020-11-13 21:01:30 +11:00
Oliver Walters 03e852f957 Remove custom save method 2020-11-13 20:22:28 +11:00
OliverandGitHub 0bb8c0a1e3 Merge pull request #1128 from SchrodingersGat/settings-improvements 
Improve settings.py
 2020-11-13 15:32:48 +11:00
Oliver Walters f0777ead92 Removed eprint statements 2020-11-13 14:39:28 +11:00
Oliver Walters 0f42916521 Improve settings.py 
- Load database config from either config.yaml or environment variables
- Mix and match, if you want!
- Move to use logging module rather than just printing stuff
- Error if required database parameters are not required
 2020-11-13 13:38:01 +11:00
Oliver Walters ee70e27f7d Change function name 2020-11-13 13:21:43 +11:00
Oliver Walters 01ff562dcd Extra unit testing for settings forms / views 2020-11-13 11:50:58 +11:00
OliverandGitHub 1d4b826d03 Merge pull request #1124 from eeintech/fix_nocategory_templates_error 
Check that category was selected before fetching templates
 2020-11-13 10:41:51 +11:00
OliverandGitHub d777549a1a Merge pull request #1123 from eeintech/fix_form_errors 
Fixed disabling of form errors messing-up with global settings validation
 2020-11-13 09:59:57 +11:00
OliverandGitHub 3130b672b4 Merge pull request #1117 from SchrodingersGat/currency-support 
Currency support
 2020-11-13 09:13:55 +11:00
Oliver Walters 362437e75e PEP fixes 2020-11-13 07:28:21 +11:00
Oliver Walters f239c8f8c8 Add missing migration file 2020-11-12 22:04:50 +11:00
Oliver Walters ae7fbd6112 Add PEP8-naming extension for flake 
- Enforcing python naming checks
 2020-11-12 21:53:04 +11:00
Oliver Walters 47cbf3071d Add option to add a single-quantity price-break when creating a new SupplierPart object 
- Add unit testing!
 2020-11-12 21:36:32 +11:00
Oliver Walters 534f43872f Bug fix for SupplierPart table 2020-11-12 20:14:10 +11:00
Oliver Walters fd79f1ea0e Fixes for 'single pricing' for SupplierPart 2020-11-12 19:46:19 +11:00
Oliver Walters 7879c7565e More fixes to .travis.yml 
Database in a strange location?
 2020-11-12 19:11:12 +11:00
Oliver Walters 6e7224ee7c Add "purchase price" field to PurchaseOrderLineItem table 2020-11-12 18:05:24 +11:00
Oliver Walters 0988040172 Catch exception where InvenTree setting object is referenced but the database is not migrated yet 2020-11-12 18:04:50 +11:00
Oliver Walters cb3c86f87a Merge remote-tracking branch 'inventree/master' into currency-support 
# Conflicts:
#	InvenTree/InvenTree/settings.py
#	InvenTree/InvenTree/urls.py
#	InvenTree/templates/InvenTree/settings/tabs.html
#	InvenTree/users/models.py
#	requirements.txt

IMPORTANT: Had to merge some migration files due to different migrations applied on the part model tables
 2020-11-12 17:24:48 +11:00
OliverandGitHub 265a29fa1a Merge pull request #1122 from SchrodingersGat/import-export-fix 
Fixes for import / export of data
 2020-11-12 17:06:50 +11:00
Oliver Walters 4765065eb0 Make sure to run database migrations first! (DUH) 2020-11-12 16:41:43 +11:00
Oliver Walters 563bfe9bf5 Further fixes to tasks.py 2020-11-12 16:10:00 +11:00
Oliver Walters 96ef5e1bde Travis fixes 2020-11-12 15:37:21 +11:00
Oliver Walters fe9749ba4f Add missing fixture for settings 2020-11-12 14:54:03 +11:00
Oliver Walters 21315096d4 Further unit testing fixes 2020-11-12 14:53:49 +11:00
Oliver Walters 1738df9042 Update unit tests 2020-11-12 14:48:57 +11:00
Oliver Walters ec8d8e5a64 Add more invoke commands: 
- export-records: Exports all database records to external file
- import-records: Imports database records from external file
- import-fixtures: Fills the database with dummy records
 2020-11-12 13:31:27 +11:00
Oliver Walters 4a8170079e Remove code which automatically created settings objects on server launch 2020-11-12 12:31:03 +11:00
Oliver Walters b7187c5e06 Fixes for purchase order table displays 2020-11-12 12:27:01 +11:00
Oliver Walters 391eeb0e46 Specify default currency when creating a new stock item 2020-11-12 11:50:59 +11:00
Oliver Walters 51d2d85c26 When creating a new price break for a supplier part, default to using the currency code specified for the supplier company 2020-11-12 11:14:50 +11:00
Oliver Walters 1532be9c1e Add 'currency' option for company 
- e.g. an external supplier might have a default currency
- Adds a form input which only allows selection of allowed currency codes
- Add unit testing for currency validation
 2020-11-12 11:02:10 +11:00
OliverandGitHub 643589b4a9 Merge pull request #1096 from eeintech/categories_parameters 
Categories parameter templates
 2020-11-12 09:32:01 +11:00
OliverandGitHub 4430098e98 Merge pull request #1120 from SchrodingersGat/used-in-fix 
A little whoopsie-doo:
 2020-11-11 16:47:34 +11:00
Oliver Walters 039a7badd1 A little whoopsie-doo: 
- Part.clean() was incorrectly referencing a BomItem when it should have been referencing BomItem.part
 2020-11-11 16:09:14 +11:00
OliverandGitHub 6d5bdaadbd Merge pull request #1118 from SchrodingersGat/log-viewer 
Add requirement for django-error-report
 2020-11-11 16:00:48 +11:00
Oliver Walters 56765d3f5a Fix for unit testing 2020-11-11 15:19:15 +11:00
Oliver Walters 6c667937c5 Add requirement for django-error-report 
- Provides an error log viewer in the admin interface at /admin/error_report/error/
- Allows viewing of error logs even in a remote production environment (i.e. no access to command line)
 2020-11-11 14:10:12 +11:00
Oliver Walters ebac06ebee Add 'single_pricing' form to the EditSupplierPartForm 
- Idea here is to automatically create a unit-pricing price-break when a new SupplierPart is created
 2020-11-11 13:55:25 +11:00
Oliver Walters fc89501a62 Fix for SQL cursor query 
- What works in SQLite don't necessarily fly with the big boys
 2020-11-11 08:06:14 +11:00
Oliver Walters 5567ad07fd Update tests and translations 2020-11-11 00:31:39 +11:00
Oliver Walters a19cf1f27a PEP fixes 2020-11-11 00:26:59 +11:00
Oliver Walters 4dff18e4a6 Remove common_currency model entirely 
- A lot of views / pages / etc needed to be updated too
- Now uses django-money fields entirely
- Create a manual rate exchange backend (needs more work!)
 2020-11-11 00:21:06 +11:00
Oliver Walters 1fc2ef5f18 Custom migration for PartSellPriceBreak 2020-11-10 22:31:46 +11:00
Oliver Walters 83582ae87f Add custom migration for the part_supplierpricebreak model 
- Copies across existing pricing data
- Yikes
 2020-11-10 22:25:05 +11:00
Oliver Walters e4f2eecb3b Remove defunct 'build_order' field from StockItem model 
- This is now handled by the new-and-improved build system, no longer required
 2020-11-10 20:12:39 +11:00
Oliver Walters 978fd7c683 Implement default currency selection 
- Add 'choices' option to InvenTreeSetting class
- Add support for ChoiceField in InvenTreeSetting form
 2020-11-10 17:08:08 +11:00
Oliver Walters 48c20c600a List supported currencies in the configuration template 2020-11-10 16:28:55 +11:00
Oliver Walters 734436b02e Add integration of django-money 
- Proper currency support
- Add PurchasePrice field to StockItem model
- This keeps track of both the price and the currency
- Display purchase price on the stockitem detail page
 2020-11-10 16:22:42 +11:00
OliverandGitHub 9d9ef5fc9c Merge pull request #1116 from SchrodingersGat/duplicate-ipn 
Add setting to allow or prohibit duplicate IPN values
 2020-11-10 10:52:30 +11:00
OliverandGitHub 9ac334ddd2 Merge pull request #1115 from eeintech/fix_form_errors 
Fix for #1111 (missing logic to check for model errors)
 2020-11-10 10:25:09 +11:00
Oliver Walters a6028f027a Add setting to allow or prohibit duplicate IPN values 2020-11-10 09:03:26 +11:00
OliverandGitHub eead52a5dd Merge pull request #1114 from SchrodingersGat/part_options 
Part options
 2020-11-10 08:28:23 +11:00
Oliver Walters 7286281a06 Fix for unit testing 2020-11-10 07:14:38 +11:00
Oliver Walters c4296ad4f1 Update migrations and translation 2020-11-09 23:47:31 +11:00
Oliver Walters c95f124578 Add some helper magic for setting objects 
- If the setting is defined as a "bool" then the returned value is automatically cast to a bool
- Add some more unit testing
 2020-11-09 23:44:54 +11:00
Oliver Walters 75ab7b247b Push part settings into part/settings.py 
- Use the user-configurable defaults in the database model itself
- This means they are observed even when using the API / etc
 2020-11-09 23:16:04 +11:00
Oliver Walters e1b70ff68f Add default values for create part form 2020-11-09 22:52:32 +11:00
Oliver Walters 8149759852 Add some more part options which set the default values for the following fields: 
- Purchaseable
- Salable
- Trackable
 2020-11-09 20:26:19 +11:00
OliverandGitHub 826c471179 Merge pull request #1107 from eeintech/fix_postgres_migration 
Fix PostGreSQL migration (permissions handler)
 2020-11-06 07:58:56 +11:00
OliverandGitHub dadf4d4c13 Merge pull request #1110 from eeintech/order_save_fix 
Fixed saving of purchase and sales order create forms
 2020-11-06 07:53:41 +11:00
OliverandGitHub d23444a86a Merge pull request #1111 from eeintech/disable_crispy_form_errors 
Disable crispy form errors
 2020-11-06 07:53:11 +11:00
OliverandGitHub 15ea73a448 Merge pull request #1106 from SchrodingersGat/build-tabs 
Rename tabs for build order
 2020-11-05 20:39:25 +11:00
Oliver Walters a35c4a5a95 Rename tabs for build order 2020-11-05 20:07:23 +11:00
OliverandGitHub 7e4b84f016 Merge pull request #1105 from SchrodingersGat/build-fix-fixes 
Set the specified location of a build output
 2020-11-05 18:25:00 +11:00
Oliver Walters 2591d34260 Fixed bug where "New output" button stopped working 
- Build status was changing from "PENDING" to "PRODUCTION"
- Created new check for active builds
 2020-11-05 15:57:46 +11:00
Oliver Walters d44092b209 Fix issue with shadowed form field 
- Rename "quantity" to "output_quantity" to address this
 2020-11-05 15:52:38 +11:00
Oliver Walters 8b7789cdb3 Set the specified location of a build output 2020-11-05 15:46:42 +11:00
OliverandGitHub 6c89a2aaeb Merge pull request #1099 from eeintech/fix_related_parts 
Fix PartRelated (based on updated AjaxCreateView class)
 2020-11-05 09:51:06 +11:00
OliverandGitHub dc626ed68b Merge pull request #1103 from SchrodingersGat/image-upload-fixes 
Bug fix: Part thumbnail API list was not working
 2020-11-04 16:24:04 +11:00
Oliver Walters f560be1a9a Bug fix: Part thumbnail API list was not working 
- Part images could not be selected from grid
 2020-11-04 15:41:17 +11:00
OliverandGitHub ede7d6dbde Merge pull request #1102 from SchrodingersGat/coveralls-fix 
Updated to latest version of coverage and coveralls
 2020-11-04 14:12:57 +11:00
Oliver Walters 5f6f722d6c Change from python-coveralls to coveralls 2020-11-04 13:30:17 +11:00
Oliver Walters f8da15287c Updated to latest version of coverage and coveralls 2020-11-04 09:35:43 +11:00
OliverandGitHub fc99086c8f Merge pull request #1101 from SchrodingersGat/delete-on-deplete-fix 
Logic fix for editing stock item creation form
 2020-11-04 09:33:52 +11:00
Oliver Walters 56b287b2c8 Logic fix for editing stock item creation form 2020-11-04 08:29:09 +11:00
OliverandGitHub 1e844c642f Merge pull request #1063 from SchrodingersGat/build-fixes 
Build system updates
 2020-11-03 22:58:38 +11:00
Oliver Walters 2e1a5a85a3 Bug fix for unit testing 2020-11-03 22:14:02 +11:00
Oliver Walters 3ea671986c Merge conflicting migration files 2020-11-03 21:29:25 +11:00
Oliver Walters 083dac1300 Merge remote-tracking branch 'inventree/master' into build-fixes 2020-11-03 21:26:39 +11:00
OliverandGitHub 1c503adced Merge pull request #1026 from eeintech/user_unique_group_validation 
Added check for multiple groups assigned to user
 2020-11-03 21:21:08 +11:00
OliverandGitHub ef2c04baa8 Merge pull request #1048 from eeintech/related_parts 
Related Parts
 2020-11-03 21:18:27 +11:00
Oliver Walters 897d9b4831 Update translation files 2020-11-03 21:02:31 +11:00
Oliver Walters 5988e847ce Add serial number suggestions 2020-11-03 21:01:14 +11:00
Oliver Walters 8d0845d92b Mark a build as "production" whenever a build output is created 2020-11-03 20:43:49 +11:00
Oliver Walters ac03dab8de Tweaks 2020-11-03 20:37:33 +11:00
Oliver Walters 2b91f69c7d Fix unit tests 2020-11-03 20:19:24 +11:00
Oliver Walters b936f67d87 Various form fixes 
- Updating forms, a lot has changed!
 2020-11-03 16:21:40 +11:00
Oliver Walters 152801f06f Dramatic speed improvements for build completion 
- Might still need to be a background task at some point..
 2020-11-03 15:56:20 +11:00
Oliver Walters 3f03adba72 Bug fix for stock table 
- Grouped rows were not displaying the part name
 2020-11-03 15:05:13 +11:00
Oliver Walters 05613b9642 Further build tweaks / improvements 2020-11-02 23:47:36 +11:00
Oliver Walters f5d0d54ded Improve modal error message 2020-11-02 23:02:02 +11:00