Matthias 
							
						 
					 
					
						
						
							
						
						c6b88c2f24 
					 
					
						
						
							
							Merge branch 'matmair/issue2279' of  https://github.com/matmair/InvenTree  into matmair/issue2279  
						
						
						
						
					 
					
						2021-12-10 00:22:49 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						023cd53b1a 
					 
					
						
						
							
							fix test that failing deliveries do not block  
						
						
						
						
					 
					
						2021-12-10 00:22:25 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias Mair 
							
						 
					 
					
						
						
							
						
						25e0324eb1 
					 
					
						
						
							
							Merge branch 'inventree:master' into matmair/issue2279  
						
						
						
						
					 
					
						2021-12-09 23:56:27 +01:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						2b27fab771 
					 
					
						
						
							
							Merge pull request  #2436  from SchrodingersGat/assign-to-customer  
						
						... 
						
						
						
						Assign to customer 
						
						
					 
					
						2021-12-09 10:41:57 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						fefe39b88d 
					 
					
						
						
							
							Fixes for unit tests  
						
						
						
						
					 
					
						2021-12-09 10:04:33 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						c1163b9f6b 
					 
					
						
						
							
							Adds missing semicolon  
						
						
						
						
					 
					
						2021-12-09 09:07:36 +11:00 
						 
				 
			
				
					
						
							
							
								Matthias Mair 
							
						 
					 
					
						
						
							
						
						cdcac90319 
					 
					
						
						
							
							Merge branch 'inventree:master' into matmair/issue2279  
						
						
						
						
					 
					
						2021-12-08 18:27:57 +01:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						4a453b0a35 
					 
					
						
						
							
							Assign multiple stock items to a customer at one  
						
						
						
						
					 
					
						2021-12-09 00:33:45 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						96a885e4e1 
					 
					
						
						
							
							client side form for assigning stock items to customers  
						
						
						
						
					 
					
						2021-12-09 00:20:45 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						c36687af22 
					 
					
						
						
							
							Add unit test for new API serializer  
						
						
						
						
					 
					
						2021-12-08 23:45:47 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						e0d52843a4 
					 
					
						
						
							
							Basic stock assignment serializer implementation  
						
						
						
						
					 
					
						2021-12-08 23:42:27 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						88840e6adb 
					 
					
						
						
							
							Merge pull request  #2435  from SchrodingersGat/old-session-fix  
						
						... 
						
						
						
						Remove old task to delete expired sessions 
						
						
					 
					
						2021-12-08 22:49:51 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						b19a7cc4fb 
					 
					
						
						
							
							Run at app startup, not as a migration  
						
						
						
						
					 
					
						2021-12-08 22:26:59 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						e4b6306ddb 
					 
					
						
						
							
							Merge pull request  #2434  from wengtad/issue2428  
						
						... 
						
						
						
						fix: stock tracking table aligment 
						
						
					 
					
						2021-12-08 10:21:31 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						c8c35e2f04 
					 
					
						
						
							
							Remove old task to delete expired sessions  
						
						... 
						
						
						
						- Does not apply any more with new session management 
						
						
					 
					
						2021-12-08 09:55:41 +11:00 
						 
				 
			
				
					
						
							
							
								Weng Tad 
							
						 
					 
					
						
						
							
						
						c143826e9b 
					 
					
						
						
							
							fix: stock tracking table aligment  
						
						... 
						
						
						
						Fixes  #2428  
					
						2021-12-07 13:59:51 +08:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						f2b966fac5 
					 
					
						
						
							
							Merge pull request  #2433  from SchrodingersGat/string-fix  
						
						... 
						
						
						
						Translateable string fixes 
						
						
					 
					
						2021-12-07 11:29:44 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						af1fe021f5 
					 
					
						
						
							
							Merge pull request  #2432  from SchrodingersGat/po-part-filter  
						
						... 
						
						
						
						Improved table filtering for "purchase order" table 
						
						
					 
					
						2021-12-07 11:29:38 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						1a85e4f21d 
					 
					
						
						
							
							Translateable string fixeas  
						
						
						
						
					 
					
						2021-12-07 10:51:40 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						463192e0b9 
					 
					
						
						
							
							Improved table filtering for "purchase order" table (as seen from "part" view)  
						
						
						
						
					 
					
						2021-12-07 10:33:09 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						1ad91811a5 
					 
					
						
						
							
							Merge pull request  #2426  from nwns/feature/qcluster_redis  
						
						... 
						
						
						
						Q_CLUSTER is using the database for its broker 
						
						
					 
					
						2021-12-07 09:24:29 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						b7f3a044d9 
					 
					
						
						
							
							Merge pull request  #2427  from nwns/fix/overlapping_currency  
						
						... 
						
						
						
						Swallow Serialization failure while updating exchange rates 
						
						
					 
					
						2021-12-06 09:49:54 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						07c88328ae 
					 
					
						
						
							
							Merge pull request  #2423  from SchrodingersGat/maintenance-mode-state-file  
						
						... 
						
						
						
						Adjustments for maintenance-mode options: 
						
						
					 
					
						2021-12-06 09:48:43 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						44d35d06f4 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master' into maintenance-mode-state-file  
						
						... 
						
						
						
						# Conflicts:
#	InvenTree/InvenTree/settings.py 
						
						
					 
					
						2021-12-06 09:16:44 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						da020f6fd6 
					 
					
						
						
							
							Remove extra options  
						
						
						
						
					 
					
						2021-12-06 09:05:13 +11:00 
						 
				 
			
				
					
						
							
							
								Nigel 
							
						 
					 
					
						
						
							
						
						a9f584cb65 
					 
					
						
						
							
							fix: swallow Serialization failure  
						
						... 
						
						
						
						We can swallow the serialization exception because there is a scheduled
task that will update these later anyway.
Fixes  #2241  
						
						
					 
					
						2021-12-05 09:24:57 -07:00 
						 
				 
			
				
					
						
							
							
								Nigel 
							
						 
					 
					
						
						
							
						
						561fd6afc1 
					 
					
						
						
							
							fix: Q_CLUSTER is using the database for its broker  
						
						... 
						
						
						
						Q_CLUSTER is using the database as its broker, and adding cache
configuration for it and not using it is pointless.  But rather than
change Q_CLUSTER's configuration to use redis as the broker, lets just
leave it using the database as the database broker has its advantages. 
						
						
					 
					
						2021-12-05 09:04:54 -07:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						8814868fc7 
					 
					
						
						
							
							Merge pull request  #2424  from SchrodingersGat/remove-schedule-delete  
						
						... 
						
						
						
						Remove schedule delete 
						
						
					 
					
						2021-12-05 19:11:00 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						93a240d9c3 
					 
					
						
						
							
							Remove the "scheduled_for_deletion" field from the StockItem model  
						
						... 
						
						
						
						Reverts back to the original behaviour - stock items are just deleted 
						
						
					 
					
						2021-12-05 18:14:14 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						a821717103 
					 
					
						
						
							
							Add a data migration which deletes any stock items which have been scheduled for deletion.  
						
						... 
						
						
						
						Also deletes any instance of the "delete_old_stock_items" worker task 
						
						
					 
					
						2021-12-05 17:56:39 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						ae8166984f 
					 
					
						
						
							
							Adjustments for maintenance-mode options:  
						
						... 
						
						
						
						- Brings the state into the same directory as the runtime config file 
						
						
					 
					
						2021-12-05 17:28:46 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						7ba01612d8 
					 
					
						
						
							
							Merge pull request  #2074  from matmair/plugin-2037  
						
						... 
						
						
						
						New Plugin definition 
						
						
					 
					
						2021-12-05 08:46:47 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						0c9590ba37 
					 
					
						
						
							
							Merge pull request  #2417  from matmair/pipeline  
						
						... 
						
						
						
						Pipeline refactor ... again 
						
						
					 
					
						2021-12-05 08:00:02 +11:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						529987bb17 
					 
					
						
						
							
							remove unneeded Todo  
						
						
						
						
					 
					
						2021-12-04 19:52:56 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						ed5bb3d264 
					 
					
						
						
							
							turn around template loader order  
						
						
						
						
					 
					
						2021-12-04 19:49:43 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						5567ee432a 
					 
					
						
						
							
							more coverage  
						
						
						
						
					 
					
						2021-12-04 18:50:49 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						d156e4c431 
					 
					
						
						
							
							make simpler  
						
						
						
						
					 
					
						2021-12-04 18:44:31 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						2413119cc1 
					 
					
						
						
							
							seperate wrong implementations into own cases  
						
						
						
						
					 
					
						2021-12-04 18:42:08 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						bb2ad7c2cb 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/inventree/InvenTree  into plugin-2037  
						
						
						
						
					 
					
						2021-12-04 18:04:47 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias Mair 
							
						 
					 
					
						
						
							
						
						502d701a70 
					 
					
						
						
							
							Merge branch 'inventree:master' into pipeline  
						
						
						
						
					 
					
						2021-12-04 17:53:02 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias Mair 
							
						 
					 
					
						
						
							
						
						0d9f76a019 
					 
					
						
						
							
							Merge branch 'inventree:master' into matmair/issue2279  
						
						
						
						
					 
					
						2021-12-04 17:52:58 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						2ef8c25c05 
					 
					
						
						
							
							directer import  
						
						
						
						
					 
					
						2021-12-04 17:46:04 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						8724471fc0 
					 
					
						
						
							
							rename  
						
						
						
						
					 
					
						2021-12-04 17:45:52 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						ce726f89a1 
					 
					
						
						
							
							refactor wrong implementations into own testcase  
						
						
						
						
					 
					
						2021-12-04 17:45:40 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						13b390d69b 
					 
					
						
						
							
							test that single errors do not kill the whole  
						
						
						
						
					 
					
						2021-12-04 17:44:10 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						cfd509adb4 
					 
					
						
						
							
							PEP fix  
						
						
						
						
					 
					
						2021-12-04 17:43:11 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						58f0838d3d 
					 
					
						
						
							
							improve coverage  
						
						
						
						
					 
					
						2021-12-04 17:24:41 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						0b6cceb998 
					 
					
						
						
							
							this should not happen  
						
						
						
						
					 
					
						2021-12-04 17:23:35 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						cccbc567fe 
					 
					
						
						
							
							delivery must be true  
						
						
						
						
					 
					
						2021-12-04 17:23:04 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						d9c6e6c4f4 
					 
					
						
						
							
							remove version nb checks  
						
						
						
						
					 
					
						2021-12-04 16:45:59 +01:00