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,045 Commits 9 Branches 164 Tags
2bdd1305ed73e15ec6fa30c98a38ac6ada28c971
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
OliverandGitHub 9dae7c1566 Merge pull request #1154 from SchrodingersGat/build-delete-fix 
Change delete behaviour for parent build item
 2020-12-01 12:36:24 +11:00
Oliver Walters 47d38e1cca Change delete behaviour for parent build item 
- was causing database integrity errors when a parent build existed
 2020-12-01 10:24:51 +11:00
OliverandGitHub 28a5ee32c4 Merge pull request #1152 from elmo2k3/fix-stocklist-sidebar 
Fix sidenav in stocklist
 2020-12-01 08:56:41 +11:00
OliverandGitHub a8f605c2e6 Merge pull request #1149 from SchrodingersGat/bom-upload-speed 
Vastly improved speed of BOM upload
 2020-11-27 15:25:46 +11:00
Oliver Walters ea2f5009c8 Vastly improved speed of BOM upload 
- Was calculating the stock levels for *every* part, for *every* drop down
- Many many many calls were being made
- Just remove stock count entirely from the drop-down menus
 2020-11-27 14:40:30 +11:00
OliverandGitHub a5e6ac2300 Merge pull request #1148 from SchrodingersGat/order-parts 
Order parts
 2020-11-27 12:28:04 +11:00
OliverandGitHub b150c9c6bc Merge pull request #1147 from SchrodingersGat/form-fixes 
Fixes for 'non field' errors in forms
 2020-11-27 12:27:53 +11:00
Oliver Walters 50a88e4826 Revert "Add extra context to SupplierPartCreate form" 
This reverts commit 5f8f0232a9.
 2020-11-27 11:19:16 +11:00
Oliver Walters 6c68197e61 Allow part ordering from build view 2020-11-27 11:18:58 +11:00
Oliver Walters 7068f70811 Fixes for 'order parts' form 
- Sometimes the part pk was not being retrieved properly
 2020-11-27 11:18:45 +11:00
Oliver Walters 607cc90ce0 Add extra context to SupplierPartCreate form 
(cherry picked from commit 5f8f0232a9)
 2020-11-27 11:18:23 +11:00
Oliver Walters 5f8f0232a9 Add extra context to SupplierPartCreate form 2020-11-27 11:17:55 +11:00
Oliver Walters 56f05e2604 Fixes for 'non field' errors in forms 
- Fixes issue where non-model fields would not show error text
 2020-11-27 10:42:01 +11:00
OliverandGitHub aacc7119bd Merge pull request #1144 from SchrodingersGat/bom-fixes 
Bom fixes
 2020-11-24 22:28:20 +11:00
Oliver Walters 083d7671d0 Bug fix for BOM table 
If the BOM for part included a BomItem with the same PK as the top-level part,
the bootstrap-tree-grid library borked

Probably for good reason, too!

So we now ensure that the top-level key is unique
 2020-11-24 21:19:19 +11:00
Oliver Walters 28333c1a21 Add a simple "shell" task 2020-11-24 21:18:00 +11:00
Oliver Walters e3231bbedb Hide "pricing" information in the BOM table 2020-11-24 20:58:18 +11:00
OliverandGitHub 3ff0759bb9 Merge pull request #1142 from SchrodingersGat/bom-form-fixes 
Bom form fixes
 2020-11-24 14:23:04 +11:00
Oliver Walters b5d75d6e6a PEP fixes 2020-11-24 11:56:51 +11:00
Oliver Walters ce82579930 Cleanup getRequiredParts function 2020-11-24 10:18:07 +11:00
Oliver Walters 371ec582e1 Cleanup queryset for BomItemEdit view 2020-11-24 09:43:49 +11:00
Oliver Walters 3391db506a Cleanup queryset for BomItemCreate view 2020-11-24 09:43:32 +11:00
Oliver Walters af9b88de11 Fix for BomItem clean function 
Handle the case where the sub_part does not exist
 2020-11-24 09:33:26 +11:00
OliverandGitHub 73259c0bcb Merge pull request #1140 from SchrodingersGat/request-frequency 
Reduce duplicate function calls in custom context parser
 2020-11-20 11:40:10 +11:00
OliverandGitHub a0168515c3 Merge pull request #1139 from eeintech/fix_supplierpart_edit_form 
Fix for SupplierPart edit form validation
 2020-11-20 09:40:00 +11:00
Oliver Walters 20e8161038 Reduce duplicate function calls in custom context parser 2020-11-20 08:29:06 +11:00
OliverandGitHub 6b104fbb8b Merge pull request #1136 from SchrodingersGat/warning-icon 
Add framework for "health checks"
 2020-11-19 13:30:17 +11:00
Oliver Walters 4049c8e915 Adds framework for "server health" display 
- Adds global context object "system_healthy" (boolean)
- Framework for running system health checks
- Updated system info forms
- Displays warning next to user menu if system health errors exist

(cherry picked from commit ce6d626ab39147fc389de90815ca8baae2385d82)
 2020-11-19 12:36:54 +11:00
OliverandGitHub e55f4a2798 Merge pull request #1135 from SchrodingersGat/quoth-the-raven 
Fixes for custom SQL queries
 2020-11-19 10:34:53 +11:00
Oliver Walters 599220a931 Fixes for custom SQL queries 
- Don't use double quotes!
- NO NO NO!
- Single quotes only
 2020-11-19 09:15:16 +11:00
OliverandGitHub 0594ebaef7 Merge pull request #1133 from SchrodingersGat/stock-table-fix 
Smallt tweaks for the Stock table
 2020-11-18 15:24:06 +11:00
Oliver Walters 24fd520ec3 Smallt tweaks for the Stock table 2020-11-18 15:03:51 +11:00
OliverandGitHub 4daf291619 Merge pull request #1131 from SchrodingersGat/purchase-price-fix 
Fix for StockItem creation form
 2020-11-17 16:07:31 +11:00
Oliver Walters 6144d7e209 Fix for StockItem creation form 
- purchase_price field was required (should not be!)
- Fixed some validation issues
- Cleaned up form implementation
 2020-11-17 15:29:44 +11:00
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