Oliver Walters 
							
						 
					 
					
						
						
							
						
						fe0d356675 
					 
					
						
						
							
							pops the purchase_price field instead of using a HiddenInput  
						
						 
						
						... 
						
						
						
						Using a HiddenInput on a MoneyFormField causes a validation error, for some reason... 
						
						
					 
					
						2021-01-03 13:13:14 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								eeintech 
							
						 
					 
					
						
						
							
						
						3ff76fbdab 
					 
					
						
						
							
							Merging master and resolved conflict  
						
						 
						
						
						
						
					 
					
						2020-12-18 17:08:37 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						8e13a7b470 
					 
					
						
						
							
							Add "overdue sales orders" to index page  
						
						 
						
						
						
						
					 
					
						2020-12-18 12:45:42 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						c34196538b 
					 
					
						
						
							
							Filter API by overdue status  
						
						 
						
						
						
						
					 
					
						2020-12-18 12:40:47 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						b21c6f0b99 
					 
					
						
						
							
							Add overdue filter for salesorder table  
						
						 
						
						
						
						
					 
					
						2020-12-18 12:27:08 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						c6134b54ab 
					 
					
						
						
							
							Add "overdue" status to SalesOrder serializer  
						
						 
						
						
						
						
					 
					
						2020-12-18 12:26:58 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								eeintech 
							
						 
					 
					
						
						
							
						
						bcae1d09a8 
					 
					
						
						
							
							Fixed category parameter templates settings view  
						
						 
						
						
						
						
					 
					
						2020-12-17 17:25:10 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						7df25df2af 
					 
					
						
						
							
							Merge pull request  #1168  from SchrodingersGat/order-date  
						
						 
						
						... 
						
						
						
						Build Order Target Date 
						
						
					 
					
						2020-12-16 19:36:10 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						6ef4325eac 
					 
					
						
						
							
							Javascript formatting  
						
						 
						
						
						
						
					 
					
						2020-12-16 15:55:42 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						1a07ae0936 
					 
					
						
						
							
							Render link rather than just text  
						
						 
						
						
						
						
					 
					
						2020-12-16 15:48:41 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						17d23fa47c 
					 
					
						
						
							
							Add overdue builds to the index page  
						
						 
						
						
						
						
					 
					
						2020-12-15 23:34:28 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						c8c50af54b 
					 
					
						
						
							
							Filter builds by "overdue" status  
						
						 
						
						
						
						
					 
					
						2020-12-15 23:31:19 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						f11348c965 
					 
					
						
						
							
							Improve rendering for login page  
						
						 
						
						
						
						
					 
					
						2020-12-15 22:39:57 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								eeintech 
							
						 
					 
					
						
						
							
						
						de1dfdcc38 
					 
					
						
						
							
							Improved naming of new setting and variables  
						
						 
						
						
						
						
					 
					
						2020-12-02 13:38:53 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								eeintech 
							
						 
					 
					
						
						
							
						
						c66ac2579e 
					 
					
						
						
							
							Updated StockItem create/edit view with ownership control  
						
						 
						
						
						
						
					 
					
						2020-12-02 13:25:33 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								eeintech 
							
						 
					 
					
						
						
							
						
						8dac6bb982 
					 
					
						
						
							
							Updated template stock item logic and added to stock locations  
						
						 
						
						
						
						
					 
					
						2020-12-01 17:41:03 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								eeintech 
							
						 
					 
					
						
						
							
						
						2c38be2d13 
					 
					
						
						
							
							Added global setting and updated stock item templates  
						
						 
						
						
						
						
					 
					
						2020-12-01 15:54:05 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						a5e6ac2300 
					 
					
						
						
							
							Merge pull request  #1148  from SchrodingersGat/order-parts  
						
						 
						
						... 
						
						
						
						Order parts 
						
						
					 
					
						2020-11-27 12:28:04 +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 
							
						 
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
							
						
						e3231bbedb 
					 
					
						
						
							
							Hide "pricing" information in the BOM table  
						
						 
						
						
						
						
					 
					
						2020-11-24 20:58:18 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						24fd520ec3 
					 
					
						
						
							
							Smallt tweaks for the Stock table  
						
						 
						
						
						
						
					 
					
						2020-11-18 15:03:51 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						534f43872f 
					 
					
						
						
							
							Bug fix for SupplierPart table  
						
						 
						
						
						
						
					 
					
						2020-11-12 20:14:10 +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 Walters 
							
						 
					 
					
						
						
							
						
						b7187c5e06 
					 
					
						
						
							
							Fixes for purchase order table displays  
						
						 
						
						
						
						
					 
					
						2020-11-12 12:27:01 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Francois 
							
						 
					 
					
						
						
							
						
						a7444a9926 
					 
					
						
						
							
							Merge branch 'master' into categories_parameters  
						
						 
						
						
						
						
					 
					
						2020-11-11 06:40:11 -05: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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						a6028f027a 
					 
					
						
						
							
							Add setting to allow or prohibit duplicate IPN values  
						
						 
						
						
						
						
					 
					
						2020-11-10 09:03:26 +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 
							
						 
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								eeintech 
							
						 
					 
					
						
						
							
						
						1c14c2237a 
					 
					
						
						
							
							Moved category templates processing to Part save() method  
						
						 
						
						
						
						
					 
					
						2020-11-04 09:52:26 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								eeintech 
							
						 
					 
					
						
						
							
						
						72b5a105f8 
					 
					
						
						
							
							Made all categories accessible for parameter templates configuration  
						
						 
						
						
						
						
					 
					
						2020-11-03 14:45:53 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Francois 
							
						 
					 
					
						
						
							
						
						b1885138de 
					 
					
						
						
							
							Merge branch 'master' into categories_parameters  
						
						 
						
						
						
						
					 
					
						2020-11-03 07:01:56 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ac03dab8de 
					 
					
						
						
							
							Tweaks  
						
						 
						
						
						
						
					 
					
						2020-11-03 20:37:33 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								eeintech 
							
						 
					 
					
						
						
							
						
						34b784d1e4 
					 
					
						
						
							
							Added setting, checkbox (PartCreateView only) and hook to create part parameters from category templates  
						
						 
						
						
						
						
					 
					
						2020-11-02 13:14:31 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						05613b9642 
					 
					
						
						
							
							Further build tweaks / improvements  
						
						 
						
						
						
						
					 
					
						2020-11-02 23:47:36 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						500da8099b 
					 
					
						
						
							
							Add forms / views for creating a new build output, and completing the build  
						
						 
						
						... 
						
						
						
						- Also some refactoring of how forms are handled and saved 
						
						
					 
					
						2020-11-02 22:56:26 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						b02c87ea50 
					 
					
						
						
							
							Lots of work towards multiple build output  
						
						 
						
						
						
						
					 
					
						2020-11-02 01:24:31 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								eeintech 
							
						 
					 
					
						
						
							
						
						3a347fba21 
					 
					
						
						
							
							Added edit/delete for category parameter templates  
						
						 
						
						
						
						
					 
					
						2020-10-31 12:55:52 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								eeintech 
							
						 
					 
					
						
						
							
						
						2a563d7370 
					 
					
						
						
							
							Added category list of parameter templates table to settings  
						
						 
						
						
						
						
					 
					
						2020-10-31 09:18:33 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								eeintech 
							
						 
					 
					
						
						
							
						
						3e5d8d2b2d 
					 
					
						
						
							
							Added form to select category in settings and update context data  
						
						 
						
						
						
						
					 
					
						2020-10-31 08:35:47 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								eeintech 
							
						 
					 
					
						
						
							
						
						5310ce8465 
					 
					
						
						
							
							First step into managing Category Parameters to InvenTree settings  
						
						 
						
						
						
						
					 
					
						2020-10-30 17:17:18 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						3a702266e6 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master' into build-fixes  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	InvenTree/InvenTree/views.py
#	InvenTree/build/views.py
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/order/views.py
#	InvenTree/part/api.py
#	InvenTree/part/views.py
#	InvenTree/templates/js/bom.js 
						
						
					 
					
						2020-10-30 22:44:25 +11:00