Oliver 
							
						 
					 
					
						
						
							
						
						22e30903b6 
					 
					
						
						
							
							Merge pull request  #965  from SchrodingersGat/api-stock-fix  
						
						 
						
						... 
						
						
						
						Major bugfix for multiple annotations in API querysets 
						
						
					 
					
						2020-09-05 23:42:25 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						db214dfd73 
					 
					
						
						
							
							Update queryset annotation for StockItem  
						
						 
						
						... 
						
						
						
						- Query time reduced from 4.1 to 3.5s (for sample data) 
						
						
					 
					
						2020-09-05 22:50:17 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						f737ad2d38 
					 
					
						
						
							
							Bugfix: CreateStockItem form  
						
						 
						
						... 
						
						
						
						- hide the field rather than popping it 
						
						
					 
					
						2020-09-05 20:31:18 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						bb9e8fa97b 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master' into multi-db-unit-test  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	InvenTree/build/test_build.py 
						
						
					 
					
						2020-09-02 20:02:22 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						911727f7b7 
					 
					
						
						
							
							Update test fixtures  
						
						 
						
						... 
						
						
						
						- Can't assume that pk values will be assigned sensibly!
- Need to hard-code them in 
						
						
					 
					
						2020-09-02 19:47:07 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						74f25ee7f9 
					 
					
						
						
							
							Part: Extend logic for "latest" serial number  
						
						 
						
						... 
						
						
						
						- Return value if it is a string
- Remove 'getNextSerialNumber' function
- Improve functionality of function which returns serial number placeholder string 
						
						
					 
					
						2020-09-01 20:16:46 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e6c0a04131 
					 
					
						
						
							
							Merge branch 'feature-non-int-serial' of git://github.com/bcc/InvenTree into bcc-feature-non-int-serial  
						
						 
						
						
						
						
					 
					
						2020-09-01 19:41:48 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						1eeaa17085 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						 
						
						
						
						
					 
					
						2020-09-01 16:41:07 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ffbdb0317f 
					 
					
						
						
							
							Add "focus" option when displaying a modal form  
						
						 
						
						
						
						
					 
					
						2020-09-01 12:43:37 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						59e7474f75 
					 
					
						
						
							
							Stock: More unit tests  
						
						 
						
						... 
						
						
						
						- Add some more tests (would have caught a bug that was there already, darn it) 
						
						
					 
					
						2020-08-31 20:09:43 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						8615cad711 
					 
					
						
						
							
							Stock: Fix serializers.py  
						
						 
						
						... 
						
						
						
						- Use of read_only PrimaryKeyRelatedField was breaking POST via API 
						
						
					 
					
						2020-08-31 20:08:07 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ben Charlton 
							
						 
					 
					
						
						
							
						
						06552832cb 
					 
					
						
						
							
							Style corrections  
						
						 
						
						
						
						
					 
					
						2020-08-28 17:30:16 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ben Charlton 
							
						 
					 
					
						
						
							
						
						6b1696f8df 
					 
					
						
						
							
							Merge branch 'master' into feature-non-int-serial  
						
						 
						
						
						
						
					 
					
						2020-08-28 17:14:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						f6d8a3f229 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						 
						
						
						
						
					 
					
						2020-08-27 22:50:52 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						27f7745231 
					 
					
						
						
							
							Follow link to newly created StockItem  
						
						 
						
						
						
						
					 
					
						2020-08-27 08:37:18 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						19329a9627 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						 
						
						
						
						
					 
					
						2020-08-27 00:21:42 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						146dae6d43 
					 
					
						
						
							
							Toot toot - it's the refactor tractor!  
						
						 
						
						... 
						
						
						
						- New function for launching a CreateStockItem form
- Wraps up the previous code improvements into a single function
- Oh, the ease! 
						
						
					 
					
						2020-08-27 00:08:02 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						72899530cf 
					 
					
						
						
							
							Add helper function to simplify reloading of field options  
						
						 
						
						
						
						
					 
					
						2020-08-26 23:43:19 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						9dcc23ee4e 
					 
					
						
						
							
							Hide 'supplier part' options if no part is selected in the form  
						
						 
						
						
						
						
					 
					
						2020-08-26 23:40:15 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						d44ad541eb 
					 
					
						
						
							
							Add "callback" functionality for modal forms when a given field is changed  
						
						 
						
						... 
						
						
						
						- Attach callback function
- Add a function to retrieve a field by name 
						
						
					 
					
						2020-08-26 22:35:36 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						54d0c4e8a8 
					 
					
						
						
							
							Bugfix: Select test report template  
						
						 
						
						... 
						
						
						
						- Actually, two bugs! 
						
						
					 
					
						2020-08-26 14:29:49 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ben Charlton 
							
						 
					 
					
						
						
							
						
						7d6055f06f 
					 
					
						
						
							
							Merge branch 'master' into feature-non-int-serial  
						
						 
						
						
						
						
					 
					
						2020-08-25 09:28:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ben Charlton 
							
						 
					 
					
						
						
							
						
						9c2d13b487 
					 
					
						
						
							
							test non-numeric serials are handled correctly for ranges  
						
						 
						
						
						
						
					 
					
						2020-08-24 20:04:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ben Charlton 
							
						 
					 
					
						
						
							
						
						d5a374f1fd 
					 
					
						
						
							
							Make serial number suggestion DB independent, handle mixed types more cleanly and test  
						
						 
						
						
						
						
					 
					
						2020-08-24 19:49:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ben Charlton 
							
						 
					 
					
						
						
							
						
						9149aa1536 
					 
					
						
						
							
							Fix internal server error when serializing stock with no location  
						
						 
						
						
						
						
					 
					
						2020-08-24 18:04:22 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ben Charlton 
							
						 
					 
					
						
						
							
						
						471ece136e 
					 
					
						
						
							
							Merge branch 'master' into feature-non-int-serial  
						
						 
						
						
						
						
					 
					
						2020-08-24 11:12:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						78826dc20b 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						 
						
						
						
						
					 
					
						2020-08-23 21:21:18 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						2a4b9c6c5c 
					 
					
						
						
							
							Merge pull request  #929  from SchrodingersGat/label-enable  
						
						 
						
						... 
						
						
						
						Label enable 
						
						
					 
					
						2020-08-23 21:18:11 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						c849f618d5 
					 
					
						
						
							
							Clean up implementation of test report matching  
						
						 
						
						
						
						
					 
					
						2020-08-23 21:03:29 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						8f1af0f5f9 
					 
					
						
						
							
							Add "enabled" field to Label class  
						
						 
						
						... 
						
						
						
						- Only list labels which are enabled
- Allows labels to be hidden / disabled without being deleted 
						
						
					 
					
						2020-08-23 09:07:15 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ben Charlton 
							
						 
					 
					
						
						
							
						
						23cc3d9b06 
					 
					
						
						
							
							Handle 'next serial' more gracefully  
						
						 
						
						
						
						
					 
					
						2020-08-21 19:17:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ben Charlton 
							
						 
					 
					
						
						
							
						
						c31b30bf83 
					 
					
						
						
							
							Fix simple tests  
						
						 
						
						
						
						
					 
					
						2020-08-21 18:53:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ben Charlton 
							
						 
					 
					
						
						
							
						
						f7ed48809c 
					 
					
						
						
							
							Support non-integer serial numbers  
						
						 
						
						
						
						
					 
					
						2020-08-21 17:36:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ben Charlton 
							
						 
					 
					
						
						
							
						
						eeca3effee 
					 
					
						
						
							
							Fix disabled form item from preventing stock location moves for items with serial numbers  
						
						 
						
						
						
						
					 
					
						2020-08-21 16:20:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						98017cb8bd 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						 
						
						
						
						
					 
					
						2020-08-21 22:11:02 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						59b3d8b5bc 
					 
					
						
						
							
							Fix stocktake export  
						
						 
						
						... 
						
						
						
						- Exclude MPTT fields
- Fix foreignkey field references 
						
						
					 
					
						2020-08-21 20:08:47 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						142a1462bb 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						 
						
						
						
						
					 
					
						2020-08-20 16:02:18 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						90d34cdfcf 
					 
					
						
						
							
							StockItem: Allow customer field to be blank  
						
						 
						
						
						
						
					 
					
						2020-08-20 14:54:55 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e67327953d 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						 
						
						
						
						
					 
					
						2020-08-16 15:10:23 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver 
							
						 
					 
					
						
						
							
						
						b5b882d3b6 
					 
					
						
						
							
							Merge pull request  #906  from SchrodingersGat/blabel  
						
						 
						
						... 
						
						
						
						Label Printing Functionality 
						
						
					 
					
						2020-08-16 14:02:38 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						d52278e423 
					 
					
						
						
							
							Icon tweak  
						
						 
						
						
						
						
					 
					
						2020-08-16 13:45:58 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						da079b23dc 
					 
					
						
						
							
							Fix duplicate label printing menu action  
						
						 
						
						
						
						
					 
					
						2020-08-16 13:43:59 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						a4267f76e8 
					 
					
						
						
							
							Fixes for barcode data rendering  
						
						 
						
						
						
						
					 
					
						2020-08-16 13:39:05 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2bbc65cc59 
					 
					
						
						
							
							Add "brief" version of QR codes  
						
						 
						
						... 
						
						
						
						- Use this to render to labels (as it contains much less information) 
						
						
					 
					
						2020-08-16 13:29:38 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						1807ba4e7b 
					 
					
						
						
							
							Add form for selecting label template for a StockItem  
						
						 
						
						
						
						
					 
					
						2020-08-16 12:10:58 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						cdde0f8c43 
					 
					
						
						
							
							Add URL endpoint for downloading PDF labels  
						
						 
						
						
						
						
					 
					
						2020-08-16 11:12:21 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						18b3fd3256 
					 
					
						
						
							
							Add context data to StockItemLabel model  
						
						 
						
						
						
						
					 
					
						2020-08-16 10:24:15 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2f77007dbe 
					 
					
						
						
							
							Significant query speed improvements to stock list API  
						
						 
						
						... 
						
						
						
						- Thanks, django-debug-toolbar!
- Gah, django DRF is the worst. Enforcing a PrimaryKeyRelatedSerializer seems to really improve speed 
						
						
					 
					
						2020-08-15 21:15:11 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						3b01614a38 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						 
						
						
						
						
					 
					
						2020-08-09 21:37:06 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						cebba6909c 
					 
					
						
						
							
							Revert thing  
						
						 
						
						
						
						
					 
					
						2020-08-09 21:21:12 +10:00