Matthias Mair
							
						 
					 | 
					
						
						
							
						
						346327b545
					 | 
					
						
						
							
							Merge branch 'inventree:master' into plugin-mark-sample
						
						
						
						
						
						
					 | 
					
						2022-04-05 02:03:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						347be2aa3a
					 | 
					
						
						
							
							fix test
						
						
						
						
						
						
					 | 
					
						2022-04-05 01:58:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						5f4c8b3a3e
					 | 
					
						
						
							
							add icon support for user settings
						
						
						
						
						
						
					 | 
					
						2022-04-05 01:53:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						5b9f84a90f
					 | 
					
						
						
							
							fix test
						
						
						
						
						
						
					 | 
					
						2022-04-05 01:30:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						785cdc5267
					 | 
					
						
						
							
							patch loading methods for selective loading
						
						
						
						
						
						
					 | 
					
						2022-04-05 01:29:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						42f630cff1
					 | 
					
						
						
							
							fix tests
						
						
						
						
						
						
						
						due to changes in the loading mechansim they need to be fethced now 
						
						
					 | 
					
						2022-04-05 01:10:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						ad9d067033
					 | 
					
						
						
							
							typo fix
						
						
						
						
						
						
					 | 
					
						2022-04-05 01:08:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						41ccacaa05
					 | 
					
						
						
							
							disable email by default
						
						
						
						
						
						
					 | 
					
						2022-04-05 00:56:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						32918348b9
					 | 
					
						
						
							
							fix docstrings
						
						
						
						
						
						
					 | 
					
						2022-04-05 00:55:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						7063db7a32
					 | 
					
						
						
							
							add missing model ruleset
						
						
						
						
						
						
					 | 
					
						2022-04-05 00:43:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						01fcc728ad
					 | 
					
						
						
							
							PEP fixes
						
						
						
						
						
						
					 | 
					
						2022-04-05 00:34:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						dc7b88515e
					 | 
					
						
						
							
							rename class to make it clearer
						
						
						
						
						
						
					 | 
					
						2022-04-05 00:27:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						2728bfab37
					 | 
					
						
						
							
							fix: add genericSettingClassMixin back in
						
						
						
						
						
						
					 | 
					
						2022-04-05 00:25:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						d634afad48
					 | 
					
						
						
							
							move to common/models
						
						
						
						
						
						
					 | 
					
						2022-04-05 00:24:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						352ab34eda
					 | 
					
						
						
							
							remove struc docstring
						
						
						
						
						
						
					 | 
					
						2022-04-05 00:23:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						586812e5c6
					 | 
					
						
						
							
							add doc for generic mixin
						
						
						
						
						
						
					 | 
					
						2022-04-05 00:23:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						0ff754c7d9
					 | 
					
						
						
							
							Merge pull request #2804 from SchrodingersGat/quantity-fixes
						
						
						
						
						
						
						
						Quantity fixes 
						
						
					 | 
					
						2022-04-05 08:20:18 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						23f57bec19
					 | 
					
						
						
							
							some docs for future users :-)
						
						
						
						
						
						
					 | 
					
						2022-04-05 00:15:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						205916e0b2
					 | 
					
						
						
							
							refactor clean method to reduce duplication
						
						
						
						
						
						
					 | 
					
						2022-04-05 00:14:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						8d01df0b5e
					 | 
					
						
						
							
							refactor settings to reduce duplication
						
						
						
						
						
						
					 | 
					
						2022-04-05 00:08:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						bdc62dfcc3
					 | 
					
						
						
							
							mark active sample code as a sample
						
						
						
						
						
						
					 | 
					
						2022-04-04 23:53:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						138aebdb08
					 | 
					
						
						
							
							and another one
						
						
						
						
						
						
					 | 
					
						2022-04-04 23:52:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						e3ca478042
					 | 
					
						
						
							
							PEP fix
						
						
						
						
						
						
					 | 
					
						2022-04-04 23:51:51 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						1eb511e8a0
					 | 
					
						
						
							
							user notification settings
						
						
						
						
						
						
					 | 
					
						2022-04-04 23:46:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						c93f9c94f3
					 | 
					
						
						
							
							Change column title
						
						
						
						
						
						
					 | 
					
						2022-04-05 00:33:54 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						0908aa8c8c
					 | 
					
						
						
							
							Allow sorting of part table by unallocated_stock
						
						
						
						
						
						
					 | 
					
						2022-04-05 00:31:44 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						58003bc2cb
					 | 
					
						
						
							
							Refactor model renderer functions
						
						
						
						
						
						
					 | 
					
						2022-04-05 00:27:37 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						15253435af
					 | 
					
						
						
							
							Adjustments for partStockLabel function
						
						
						
						
						
						
					 | 
					
						2022-04-05 00:02:11 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						e4ca638a2e
					 | 
					
						
						
							
							Add field for substitute_stock (work in progress)
						
						
						
						
						
						
					 | 
					
						2022-04-04 23:52:45 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						c6ba104ae8
					 | 
					
						
						
							
							Condense into single "available_stock" field
						
						
						
						
						
						
					 | 
					
						2022-04-04 23:07:44 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						f6664b2477
					 | 
					
						
						
							
							Add annotated fields to BomItem API:
						
						
						
						
						
						
						
						- total-stock / allocated_to_build_orders / allocated_to_sales_orders 
						
						
					 | 
					
						2022-04-04 22:50:13 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						782a0f3576
					 | 
					
						
						
							
							Fix for scanIntoLocation function
						
						
						
						
						
						
					 | 
					
						2022-04-04 16:23:17 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						7dae05acc5
					 | 
					
						
						
							
							Fix for scanItemsIntoLocation function
						
						
						
						
						
						
						
						- Accept list of objects rather than pk values
- Conform to API requirements 
						
						
					 | 
					
						2022-04-04 16:20:19 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						2c8e274aa9
					 | 
					
						
						
							
							Tweaks for barcode scanning functionality
						
						
						
						
						
						
						
						- Prevent javascript errors
(cherry picked from commit 9129a42a3e2a5c5939e6002d3b4010b3fd9cc20e) 
						
						
					 | 
					
						2022-04-04 14:24:28 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						d1a8b7ed48
					 | 
					
						
						
							
							Merge pull request #2801 from rkalman/feat-use-unallocated-quantites
						
						
						
						
						
						
						
						Use new unallocated_stock quantity in the part table and in the search results 
						
						
					 | 
					
						2022-04-03 23:23:02 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kálmán Rózsahegyi
							
						 
					 | 
					
						
						
							
						
						ade5a81a1a
					 | 
					
						
						
							
							Enhance partStockLabel with ordering/building quantites
						
						
						
						
						
						
					 | 
					
						2022-04-03 12:36:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kálmán Rózsahegyi
							
						 
					 | 
					
						
						
							
						
						bc4b66e7d3
					 | 
					
						
						
							
							Render partStockLabel based on available/in stock quantites
						
						
						
						
						
						
					 | 
					
						2022-04-03 12:36:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kálmán Rózsahegyi
							
						 
					 | 
					
						
						
							
						
						d912846e41
					 | 
					
						
						
							
							Use available quantities in part table, enhance stock badge
						
						
						
						
						
						
					 | 
					
						2022-04-03 12:35:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kálmán Rózsahegyi
							
						 
					 | 
					
						
						
							
						
						a9f7457c12
					 | 
					
						
						
							
							New part table filter on available stock
						
						
						
						
						
						
					 | 
					
						2022-04-03 12:30:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						2fee6b02db
					 | 
					
						
						
							
							structure comment
						
						
						
						
						
						
					 | 
					
						2022-04-03 03:48:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						905b164ecb
					 | 
					
						
						
							
							store methods on load
						
						
						
						
						
						
					 | 
					
						2022-04-03 03:47:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						d1d7db76cc
					 | 
					
						
						
							
							Merge pull request #2797 from SchrodingersGat/available_stock
						
						
						
						
						
						
						
						Available stock 
						
						
					 | 
					
						2022-04-02 13:52:34 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						271cb3f8b1
					 | 
					
						
						
							
							Rebuild tree structure before running unit tests!
						
						
						
						
						
						
					 | 
					
						2022-04-02 13:26:39 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						926f56bb41
					 | 
					
						
						
							
							move plugins checks to method
						
						
						
						
						
						
					 | 
					
						2022-04-02 04:11:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						6a300ea24a
					 | 
					
						
						
							
							fix global settings check
						
						
						
						
						
						
					 | 
					
						2022-04-02 03:32:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						6124b1207d
					 | 
					
						
						
							
							make setting global
						
						
						
						
						
						
					 | 
					
						2022-04-02 03:16:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						c7329da7e0
					 | 
					
						
						
							
							move settings
						
						
						
						
						
						
					 | 
					
						2022-04-02 03:03:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						fb0b87db3d
					 | 
					
						
						
							
							Further unit test fixes
						
						
						
						
						
						
					 | 
					
						2022-04-02 12:00:08 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						e95cc7c699
					 | 
					
						
						
							
							only calculate excluded classes once
						
						
						
						
						
						
					 | 
					
						2022-04-02 02:57:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						40ff2f61aa
					 | 
					
						
						
							
							make comperator simpler to read
						
						
						
						
						
						
					 | 
					
						2022-04-02 02:52:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |