Oliver Walters 
							
						 
					 
					
						
						
							
						
						d0fb69e67d 
					 
					
						
						
							
							Add option to enable / disable stock expiry feature  
						
						... 
						
						
						
						- Simply hides fields in form views 
						
						
					 
					
						2021-01-05 08:50:07 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						1335c85de1 
					 
					
						
						
							
							Edit new stock settings on settings page  
						
						
						
						
					 
					
						2021-01-05 00:59:10 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						855098e30b 
					 
					
						
						
							
							Merge conflicting migration files  
						
						
						
						
					 
					
						2021-01-05 00:58:48 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e715ea5d79 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master' into stock-expiry  
						
						... 
						
						
						
						# Conflicts:
#	InvenTree/common/models.py 
						
						
					 
					
						2021-01-05 00:58:32 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						213d6550d3 
					 
					
						
						
							
							Add new setock settings  
						
						
						
						
					 
					
						2021-01-05 00:54:05 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						9a30108b75 
					 
					
						
						
							
							Auto-update the expiry date in the StockItem form when switching Part selection  
						
						
						
						
					 
					
						2021-01-05 00:37:42 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						9dc9c0fcb7 
					 
					
						
						
							
							Auto-populate expiry date for stockitem when created via the API  
						
						... 
						
						
						
						(Now with unit testing!) 
						
						
					 
					
						2021-01-05 00:21:26 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						da02ab3eac 
					 
					
						
						
							
							Add unit testing for view  
						
						
						
						
					 
					
						2021-01-05 00:01:44 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						7d7d5d24cc 
					 
					
						
						
							
							Pre-fill stockitem expiry date in CreateStockItem form  
						
						
						
						
					 
					
						2021-01-04 23:40:51 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						37dcf1c1cf 
					 
					
						
						
							
							Add "default_expiry" field to Part model  
						
						
						
						
					 
					
						2021-01-04 23:36:11 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						692cee113c 
					 
					
						
						
							
							Display "expiry date" column in stock table  
						
						
						
						
					 
					
						2021-01-04 23:11:35 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						4d7c60a130 
					 
					
						
						
							
							Add "expired stock" table to index page  
						
						
						
						
					 
					
						2021-01-04 09:46:14 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						d1ce0f062e 
					 
					
						
						
							
							Improve unit testing for StockItem API  
						
						
						
						
					 
					
						2021-01-04 01:22:43 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						a0c95579b4 
					 
					
						
						
							
							Display expiry status on StockItem page  
						
						... 
						
						
						
						- Also adds ability to filter Stock table by expired status 
						
						
					 
					
						2021-01-04 00:21:47 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						39b9dcfec9 
					 
					
						
						
							
							Add 'expired' flag to StockItem serializer  
						
						
						
						
					 
					
						2021-01-04 00:21:21 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						1a930f7f80 
					 
					
						
						
							
							Add ability to edit expiry_date for StockItem  
						
						
						
						
					 
					
						2021-01-04 00:20:02 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						6d4c81e68b 
					 
					
						
						
							
							Add ability to filter by 'expired' status in API  
						
						
						
						
					 
					
						2021-01-04 00:19:48 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						07cda765f0 
					 
					
						
						
							
							Add "expiry_date" field to StockItem model  
						
						... 
						
						
						
						- Also adds "is_expired" function 
						
						
					 
					
						2021-01-03 23:56:35 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						bc72cd612e 
					 
					
						
						
							
							Merge pull request  #1201  from SchrodingersGat/settings  
						
						... 
						
						
						
						Settings Improvements 
						
						
					 
					
						2021-01-03 23:47:35 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						0f9c4703cf 
					 
					
						
						
							
							Update unit testing  
						
						
						
						
					 
					
						2021-01-03 23:33:47 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						b05504e1c4 
					 
					
						
						
							
							Add PART_VIRTUAL setting  
						
						
						
						
					 
					
						2021-01-03 23:13:58 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						fe3d4a9867 
					 
					
						
						
							
							Merge pull request  #1200  from SchrodingersGat/supplier-part-import  
						
						... 
						
						
						
						SupplierPart import/export fixes 
						
						
					 
					
						2021-01-03 23:08:05 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						0aeeba808c 
					 
					
						
						
							
							PEP fixes  
						
						
						
						
					 
					
						2021-01-03 23:07:21 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						6c7b648133 
					 
					
						
						
							
							Implement global settings for assembly and template values of Part model  
						
						
						
						
					 
					
						2021-01-03 23:06:51 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						9fa37a9156 
					 
					
						
						
							
							Improve visualisation of global settings  
						
						
						
						
					 
					
						2021-01-03 22:57:39 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						8e9c976e99 
					 
					
						
						
							
							Update translations  
						
						
						
						
					 
					
						2021-01-03 22:18:08 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2a91bb0c87 
					 
					
						
						
							
							Update SupplierPart model to allow data importing  
						
						... 
						
						
						
						- django-import-export plugin seems to require null=True for char fields
- yes, this goes against django "best practice"
- Hopefully a better solution can be found 
						
						
					 
					
						2021-01-03 22:16:32 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						bdc3a9ef02 
					 
					
						
						
							
							Merge pull request  #1198  from SchrodingersGat/stock-item-form-fix  
						
						... 
						
						
						
						Fix for StockItem create / edit forms 
						
						
					 
					
						2021-01-03 14:15:56 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2ad090c224 
					 
					
						
						
							
							pop purchase_price field for StockItemEdit form  
						
						
						
						
					 
					
						2021-01-03 13:15:42 +11:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						11c6248b06 
					 
					
						
						
							
							Merge pull request  #1197  from SchrodingersGat/bom-fix  
						
						... 
						
						
						
						Fix variable scope issue 
						
						
					 
					
						2021-01-03 10:30:47 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						298e9cae65 
					 
					
						
						
							
							Fix variable scope issue  
						
						
						
						
					 
					
						2021-01-03 10:07:38 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						2dfa4d1acd 
					 
					
						
						
							
							Merge pull request  #1196  from SchrodingersGat/target-date-optional  
						
						... 
						
						
						
						Target date optional 
						
						
					 
					
						2021-01-03 09:00:46 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						725a70327a 
					 
					
						
						
							
							Add some unit testing  
						
						
						
						
					 
					
						2021-01-02 22:21:37 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						b2a732197b 
					 
					
						
						
							
							Fix target date form field for SalesOrder  
						
						
						
						
					 
					
						2021-01-02 21:54:07 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2b57ffeb08 
					 
					
						
						
							
							Custom date picker field  
						
						... 
						
						
						
						- Prevents picker from being "required" by the form 
						
						
					 
					
						2021-01-02 21:50:10 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						03276629c2 
					 
					
						
						
							
							CSS tweaks  
						
						
						
						
					 
					
						2021-01-02 21:41:47 +11:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						3ff76fbdab 
					 
					
						
						
							
							Merging master and resolved conflict  
						
						
						
						
					 
					
						2020-12-18 17:08:37 -05:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						7560b7e167 
					 
					
						
						
							
							Merge pull request  #1177  from SchrodingersGat/sales-order-overdue  
						
						... 
						
						
						
						Sales order overdue 
						
						
					 
					
						2020-12-18 20:06:48 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						08a8556fe7 
					 
					
						
						
							
							Fix unit testing  
						
						
						
						
					 
					
						2020-12-18 19:46:02 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						13e924cc05 
					 
					
						
						
							
							Fix default value for PO and SO codes  
						
						
						
						
					 
					
						2020-12-18 16:10:55 +11: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 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						000348f70f 
					 
					
						
						
							
							Add 'target_date' field to SalesOrder model  
						
						
						
						
					 
					
						2020-12-18 12:19:16 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						8bb4683bbe 
					 
					
						
						
							
							Merge pull request  #1175  from eeintech/fix_stock_template  
						
						... 
						
						
						
						Keep 'stock actions' button enabled when on children tab 
						
						
					 
					
						2020-12-18 12:02:39 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						d38d9b21a9 
					 
					
						
						
							
							Merge pull request  #1174  from eeintech/fix_category_parameter_url  
						
						... 
						
						
						
						Fixed category parameter templates settings view 
						
						
					 
					
						2020-12-18 12:00:51 +11:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						1a48405491 
					 
					
						
						
							
							Keep 'stock actions' button enabled when on children tab  
						
						
						
						
					 
					
						2020-12-17 17:37:54 -05:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						bcae1d09a8 
					 
					
						
						
							
							Fixed category parameter templates settings view  
						
						
						
						
					 
					
						2020-12-17 17:25:10 -05:00