4684 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Oliver	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
Oliver	3130b672b4	Merge pull request #1117 from SchrodingersGat/currency-support ... Currency support	2020-11-13 09:13:55 +11:00
eeintech	d4ac35b9aa	Check that category was selected before fetching templates	2020-11-12 16:52:22 -05:00
eeintech	80b70fd2df	Fixed disabling of form errors messing-up with global settings	2020-11-12 16:38:35 -05: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
Oliver	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
Oliver	643589b4a9	Merge pull request #1096 from eeintech/categories_parameters ... Categories parameter templates	2020-11-12 09:32:01 +11:00
eeintech	b4fa56fd96	Fixed PART_CATEGORY_PARAMETERS duplicate (bad merging... oopsy)	2020-11-11 12:40:03 -05:00
eeintech	bfdda847c4	Updated part migration reference in 0054	2020-11-11 11:18:10 -05:00
Francois	a7444a9926	Merge branch 'master' into categories_parameters	2020-11-11 06:40:11 -05:00
Oliver	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
Oliver	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
Oliver	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
Oliver	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