Oliver Walters 
							
						 
					 
					
						
						
							
						
						82903d2bd6 
					 
					
						
						
							
							BOM display is now heirarchical  
						
						
						
						
							
						
					 
					
						2020-08-18 21:01:22 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						4cd54203a2 
					 
					
						
						
							
							Add jquery-treegrid plugin  
						
						
						
						
							
						
					 
					
						2020-08-18 20:53:50 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						37baec2db6 
					 
					
						
						
							
							bootstrap-table: Add "extensions"  
						
						
						
						
							
						
					 
					
						2020-08-18 20:53:05 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						32133fecc7 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
							
						
					 
					
						2020-08-18 14:41:03 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						316dfe5e38 
					 
					
						
						
							
							Merge pull request  #909  from SchrodingersGat/bom-import-export  
						
						... 
						
						
						
						BOM upload: improve generation of "import" template 
						
						
							
						
					 
					
						2020-08-18 14:37:48 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						92ac93aac5 
					 
					
						
						
							
							More intelligent checking for circular BOM  
						
						... 
						
						
						
						- Check all the way down a BOM "tree"
- Validate BOM tree before allowing BOM submission 
						
						
							
						
					 
					
						2020-08-18 14:17:59 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ca4d3df287 
					 
					
						
						
							
							Update translation files  
						
						
						
						
							
						
					 
					
						2020-08-18 14:01:40 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						68fb599c73 
					 
					
						
						
							
							Major improvements to BOM upload  
						
						... 
						
						
						
						- Column headings now match the values provided in BOM import template
- Add a new column for part selection, while displaying all imported data
- Better code documentation
- Improve data validation
- Allow decimal quantity (not just integer!)
- Better matching logic 
						
						
							
						
					 
					
						2020-08-18 14:01:01 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						7349b396ca 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into bom-import-export  
						
						
						
						
							
						
					 
					
						2020-08-18 11:50:40 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						561516e8d7 
					 
					
						
						
							
							Merge pull request  #908  from eeintech/bom_upload_part_match_auto_and_ipn  
						
						... 
						
						
						
						BoM Upload: Automatic Part match using name or IPN 
						
						
							
						
					 
					
						2020-08-18 11:50:10 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						476cc5f661 
					 
					
						
						
							
							BOM upload: improve generation of "import" template  
						
						... 
						
						
						
						- Better field naming
- Remove some fields which are not required here
- Better description of what is going to happen 
						
						
							
						
					 
					
						2020-08-18 11:47:27 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						badc306f33 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
							
						
					 
					
						2020-08-18 10:39:24 +10:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						783a94acce 
					 
					
						
						
							
							Corrected MakeBomTemplate method's queryset  
						
						
						
						
							
						
					 
					
						2020-08-17 16:42:28 -05:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						84c0ec7937 
					 
					
						
						
							
							BoM: added part matching based on IPN  
						
						
						
						
							
						
					 
					
						2020-08-17 16:35:38 -05:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						303157c586 
					 
					
						
						
							
							Added part match auto-selection (if partial_ratio >= 100) to BoM part selection form  
						
						
						
						
							
						
					 
					
						2020-08-17 14:10:24 -05:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						685a58b807 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into bom_dev  
						
						
						
						
							
						
					 
					
						2020-08-17 12:05:54 -05:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						89c7f72caf 
					 
					
						
						
							
							Merge pull request  #907  from SchrodingersGat/bom-level-int  
						
						... 
						
						
						
						Make BOM levels integers 
						
						
							
						
					 
					
						2020-08-17 10:43:31 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						25d90f643a 
					 
					
						
						
							
							Make BOM levels integers  
						
						
						
						
							
						
					 
					
						2020-08-17 10:39:35 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e67327953d 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						
						
						
							
						
					 
					
						2020-08-16 15:10:23 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						4dcd6ee136 
					 
					
						
						
							
							Update version.py  
						
						
						
						
							
						
					 
					
						2020-08-16 14:03:49 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						ab62f8fc59 
					 
					
						
						
							
							Update version.py  
						
						... 
						
						
						
						Increment version number 
						
						
							
 
						
					 
					
						2020-08-16 14:03:20 +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 
							
						 
					 
					
						
						
							
						
						ccda637e3c 
					 
					
						
						
							
							Fixes for barcode decoding  
						
						
						
						
							
						
					 
					
						2020-08-16 13:42:27 +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 
							
						 
					 
					
						
						
							
						
						2f5e3efada 
					 
					
						
						
							
							Update translations  
						
						
						
						
							
						
					 
					
						2020-08-16 12:11:22 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						1807ba4e7b 
					 
					
						
						
							
							Add form for selecting label template for a StockItem  
						
						
						
						
							
						
					 
					
						2020-08-16 12:10:58 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						30e24f19d9 
					 
					
						
						
							
							PEP fixes  
						
						
						
						
							
						
					 
					
						2020-08-16 11:13:17 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						cdde0f8c43 
					 
					
						
						
							
							Add URL endpoint for downloading PDF labels  
						
						
						
						
							
						
					 
					
						2020-08-16 11:12:21 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2b1d6c268c 
					 
					
						
						
							
							Render to an in-memory PDF  
						
						
						
						
							
						
					 
					
						2020-08-16 10:29:03 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						18b3fd3256 
					 
					
						
						
							
							Add context data to StockItemLabel model  
						
						
						
						
							
						
					 
					
						2020-08-16 10:24:15 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						aefd70ce49 
					 
					
						
						
							
							Add admin interface for StockItemLabel  
						
						
						
						
							
						
					 
					
						2020-08-16 09:29:45 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						eb2422e6be 
					 
					
						
						
							
							Merge pull request  #905  from SchrodingersGat/bom-depth  
						
						... 
						
						
						
						Allow user to set "depth" of exported multi-level BOM 
						
						
							
						
					 
					
						2020-08-16 09:29:09 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						a45902bd4f 
					 
					
						
						
							
							Add "label" app  
						
						
						
						
							
						
					 
					
						2020-08-16 09:28:12 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						dd77cc00b7 
					 
					
						
						
							
							Add requirement for "blabel" plugin  
						
						
						
						
							
						
					 
					
						2020-08-16 09:07:27 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e5406cae24 
					 
					
						
						
							
							More PEP fixes  
						
						
						
						
							
						
					 
					
						2020-08-16 09:05:16 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						97103207b6 
					 
					
						
						
							
							PEP fixes  
						
						
						
						
							
						
					 
					
						2020-08-16 08:34:54 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						b27ecf54d7 
					 
					
						
						
							
							Allow user to set "depth" of exported multi-level BOM  
						
						
						
						
							
						
					 
					
						2020-08-16 08:29:36 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						318c16f321 
					 
					
						
						
							
							Merge pull request  #904  from SchrodingersGat/query-speeds  
						
						... 
						
						
						
						Significant query speed improvements to stock list API 
						
						
							
						
					 
					
						2020-08-15 21:56:55 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						f1373e3bea 
					 
					
						
						
							
							Improve speed of BomItem API queries  
						
						... 
						
						
						
						- Including the pricing information takes absolutely ages, takes too long!! 
						
						
							
						
					 
					
						2020-08-15 21:52:32 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e1a8772af6 
					 
					
						
						
							
							Update serializers for SupplierPart  
						
						
						
						
							
						
					 
					
						2020-08-15 21:24:01 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						d34383e842 
					 
					
						
						
							
							Specify serializer type for part category  
						
						
						
						
							
						
					 
					
						2020-08-15 21:20:31 +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 
							
						 
					 
					
						
						
							
						
						411e7507a3 
					 
					
						
						
							
							Merge pull request  #903  from SchrodingersGat/debug-toolbar  
						
						... 
						
						
						
						Debug toolbar 
						
						
							
						
					 
					
						2020-08-15 20:08:04 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						3c4cfc9a1b 
					 
					
						
						
							
							Flake fix  
						
						
						
						
							
						
					 
					
						2020-08-15 19:56:02 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2bb669d7de 
					 
					
						
						
							
							Remove defunct "log_queries" option  
						
						
						
						
							
						
					 
					
						2020-08-15 19:52:04 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						b8b3a933ab 
					 
					
						
						
							
							Add django-debug-toolbar plugin  
						
						... 
						
						
						
						- Must be running in DEBUG mode
- Must set debug_toolbar to True in config file 
						
						
							
						
					 
					
						2020-08-15 19:48:42 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2280558303 
					 
					
						
						
							
							Add a method of return raw LaTeX for debugging  
						
						
						
						
							
						
					 
					
						2020-08-15 19:27:31 +10:00