Matthias
							
						 
					 | 
					
						
						
							
						
						7e3be4a496
					 | 
					
						
						
							
							rename
						
						
						
						
						
						
					 | 
					
						2021-12-03 01:18:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						6b29e60494
					 | 
					
						
						
							
							Fixes for migration tests
						
						
						
						
						
						
					 | 
					
						2021-12-03 11:12:49 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						83708d645c
					 | 
					
						
						
							
							add packagelock
						
						
						
						
						
						
					 | 
					
						2021-12-03 01:11:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						f51a3557ee
					 | 
					
						
						
							
							cache python
						
						
						
						
						
						
					 | 
					
						2021-12-03 01:08:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						a05777029d
					 | 
					
						
						
							
							cache npm
						
						
						
						
						
						
					 | 
					
						2021-12-03 01:06:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						b6c6ac75e5
					 | 
					
						
						
							
							just set it statically
						
						
						
						
						
						
					 | 
					
						2021-12-03 01:05:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						e4a0b09796
					 | 
					
						
						
							
							simple seems to be better
						
						
						
						
						
						
					 | 
					
						2021-12-03 01:03:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						045932dfe1
					 | 
					
						
						
							
							try using outputs
						
						
						
						
						
						
					 | 
					
						2021-12-03 00:53:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						5891245c45
					 | 
					
						
						
							
							replace pwd
						
						
						
						
						
						
					 | 
					
						2021-12-03 00:47:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						d50007975c
					 | 
					
						
						
							
							replace db_users
						
						
						
						
						
						
					 | 
					
						2021-12-03 00:45:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						066f776c40
					 | 
					
						
						
							
							remove with from coveralls
						
						
						
						
						
						
					 | 
					
						2021-12-03 00:39:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						ea6a4979ae
					 | 
					
						
						
							
							reseet back tu usage without envs
						
						
						
						
						
						
					 | 
					
						2021-12-03 00:34:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						c7b5ec28ab
					 | 
					
						
						
							
							fix coveralls
						
						
						
						
						
						
					 | 
					
						2021-12-03 00:28:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						80b575bd3a
					 | 
					
						
						
							
							fix envs?
						
						
						
						
						
						
					 | 
					
						2021-12-03 00:24:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						1c388df3d2
					 | 
					
						
						
							
							set params paralell
						
						
						
						
						
						
					 | 
					
						2021-12-03 00:17:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						e41da09b31
					 | 
					
						
						
							
							set ports
						
						
						
						
						
						
					 | 
					
						2021-12-03 00:12:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						4ad7712b62
					 | 
					
						
						
							
							change db user name
						
						
						
						
						
						
					 | 
					
						2021-12-03 00:10:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						ce4a01255a
					 | 
					
						
						
							
							try a pre job to set params
						
						
						
						
						
						
					 | 
					
						2021-12-03 00:04:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						5de4a0cfaf
					 | 
					
						
						
							
							maybe declaring variables helps
						
						
						
						
						
						
					 | 
					
						2021-12-02 23:42:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						045d0c241d
					 | 
					
						
						
							
							add package-log back in
						
						
						
						
						
						
					 | 
					
						2021-12-02 17:33:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						3b311d62e4
					 | 
					
						
						
							
							Merge branch 'matmair/issue2201' of https://github.com/matmair/InvenTree into matmair/issue2201
						
						
						
						
						
						
					 | 
					
						2021-12-02 17:24:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						0f0460f8ea
					 | 
					
						
						
							
							merge
						
						
						
						
						
						
					 | 
					
						2021-12-02 17:24:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						329b00ae07
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037
						
						
						
						
						
						
					 | 
					
						2021-12-02 17:16:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias Mair
							
						 
					 | 
					
						
						
							
						
						ec3b5b6cbc
					 | 
					
						
						
							
							Merge branch 'inventree:master' into workflow-remaster
						
						
						
						
						
						
					 | 
					
						2021-12-02 17:13:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias Mair
							
						 
					 | 
					
						
						
							
						
						4904beb45a
					 | 
					
						
						
							
							Merge branch 'inventree:master' into webhooks
						
						
						
						
						
						
					 | 
					
						2021-12-02 17:08:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						3c3dd9368d
					 | 
					
						
						
							
							Do not auto-complete salesorder when shipment is done
						
						
						
						
						
						
						
						- User might want to add more line items? 
						
						
					 | 
					
						2021-12-03 00:45:44 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						732034d9e5
					 | 
					
						
						
							
							Merge conflicting migrations
						
						
						
						
						
						
					 | 
					
						2021-12-03 00:43:10 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						96c1f74cd8
					 | 
					
						
						
							
							Merge pull request #2408 from SchrodingersGat/initial-stock-when-duplicating
						
						
						
						
						
						
						
						Add option for creating initial stock quantity when duplicating a part 
						
						
					 | 
					
						2021-12-03 00:29:37 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						84a4060cd9
					 | 
					
						
						
							
							Merge pull request #2401 from matmair/load-minified-fa
						
						
						
						
						
						
						
						Load minified fa 
						
						
					 | 
					
						2021-12-03 00:23:58 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						440f5e560e
					 | 
					
						
						
							
							qucik fix
						
						
						
						
						
						
					 | 
					
						2021-12-02 14:19:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						6355d2e8c2
					 | 
					
						
						
							
							maybe this way?
						
						
						
						
						
						
					 | 
					
						2021-12-02 14:17:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						0f4991db0a
					 | 
					
						
						
							
							fix port envs?
						
						
						
						
						
						
					 | 
					
						2021-12-02 14:15:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						b99d5a28e9
					 | 
					
						
						
							
							fix? postgres user
						
						
						
						
						
						
					 | 
					
						2021-12-02 14:10:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						80b615bfb7
					 | 
					
						
						
							
							Import fix
						
						
						
						
						
						
					 | 
					
						2021-12-03 00:08:05 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						9ca6204d4b
					 | 
					
						
						
							
							Add option for creating initial stock quantity when duplicating a part
						
						
						
						
						
						
						
						Fixes https://github.com/inventree/InvenTree/issues/2407 
						
						
					 | 
					
						2021-12-03 00:05:55 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						bab7b766b5
					 | 
					
						
						
							
							Revert "seems like it does not like comments between envs"
						
						
						
						
						
						
						
						This reverts commit e7087aafda. 
						
						
					 | 
					
						2021-12-02 14:05:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						e7087aafda
					 | 
					
						
						
							
							seems like it does not like comments between envs
						
						
						
						
						
						
					 | 
					
						2021-12-02 14:05:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						281ea37bd6
					 | 
					
						
						
							
							maybe fix coveralls connection?
						
						
						
						
						
						
					 | 
					
						2021-12-02 14:03:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						93173ef1ee
					 | 
					
						
						
							
							Merge remote-tracking branch 'inventree/master' into partial-shipment
						
						
						
						
						
						
						
						# Conflicts:
#	InvenTree/order/serializers.py 
						
						
					 | 
					
						2021-12-02 23:58:52 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						ecf70b6d4d
					 | 
					
						
						
							
							Some PEP fixes
						
						
						
						
						
						
					 | 
					
						2021-12-02 23:58:02 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						dd9eed3da6
					 | 
					
						
						
							
							needed for import / export checks
						
						
						
						
						
						
					 | 
					
						2021-12-02 13:54:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						961c161b3c
					 | 
					
						
						
							
							rename to better reflect function
						
						
						
						
						
						
					 | 
					
						2021-12-02 13:54:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						e1668c8662
					 | 
					
						
						
							
							More stuffs:
						
						
						
						
						
						
						
						- Allow filtering of salesorderlineitem by "completed" status
- Allow deletion of (empty) shipment
- Show which items are going to be shipped 
						
						
					 | 
					
						2021-12-02 23:52:53 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						b0f14d23b2
					 | 
					
						
						
							
							use envs everywhere
						
						
						
						
						
						
					 | 
					
						2021-12-02 13:45:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						340c7574e4
					 | 
					
						
						
							
							optimise envs
						
						
						
						
						
						
					 | 
					
						2021-12-02 13:45:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						cc5ba37850
					 | 
					
						
						
							
							use env for db name
						
						
						
						
						
						
					 | 
					
						2021-12-02 13:39:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						840c1c12c5
					 | 
					
						
						
							
							use env for version
						
						
						
						
						
						
					 | 
					
						2021-12-02 13:37:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						cc5a03bb58
					 | 
					
						
						
							
							merge mysql
						
						
						
						
						
						
					 | 
					
						2021-12-02 13:37:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						a071d61ba7
					 | 
					
						
						
							
							use env for version
						
						
						
						
						
						
					 | 
					
						2021-12-02 13:34:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						ee60cbf603
					 | 
					
						
						
							
							merge in postgres
						
						
						
						
						
						
					 | 
					
						2021-12-02 13:34:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |