Oliver 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						ac2797c7a1 
					 
					
						
						
							
							Improved API endpoint for category parameter templates  
						
						
						
						
							
						
					 
					
						2020-11-16 16:10:00 -05:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						d8e7c2a932 
					 
					
						
						
							
							Update version.py  
						
						
						
						
							
						
					 
					
						2020-11-15 16:53:27 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						20f6964b1f 
					 
					
						
						
							
							Update version.py  
						
						
						
						
							
 
						
					 
					
						2020-11-15 16:51:50 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								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