Oliver 
							
						 
					 
					
						
						
							
						
						f4941d55ed 
					 
					
						
						
							
							Merge pull request  #285  from SchrodingersGat/hide-supplier-part  
						
						... 
						
						
						
						Hide supplier_part field if the part cannot be purchased 
						
						
					 
					
						2019-05-09 18:46:48 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2c5bb6b126 
					 
					
						
						
							
							Hide supplier_part field if the part cannot be purchased  
						
						
						
						
					 
					
						2019-05-09 18:43:22 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ef9fb5b018 
					 
					
						
						
							
							Hide some fields from forms  
						
						
						
						
					 
					
						2019-05-09 18:38:37 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						8bf09300bb 
					 
					
						
						
							
							Merge pull request  #281  from SchrodingersGat/page-title  
						
						... 
						
						
						
						Page title 
						
						
					 
					
						2019-05-09 18:33:03 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ca6bd0a999 
					 
					
						
						
							
							Add page title for company page  
						
						
						
						
					 
					
						2019-05-09 18:17:28 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						b9b17f39d9 
					 
					
						
						
							
							Override page title for Stock app  
						
						
						
						
					 
					
						2019-05-09 18:11:13 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						873bd182f0 
					 
					
						
						
							
							Vertical alignment of button toolbars  
						
						
						
						
					 
					
						2019-05-09 18:04:42 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e9c904076f 
					 
					
						
						
							
							Added help text for model fields  
						
						
						
						
					 
					
						2019-05-08 23:32:57 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						afffd06fb8 
					 
					
						
						
							
							Limit choices for 'parent' field when editing StockLocation  
						
						
						
						
					 
					
						2019-05-08 18:00:34 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						abb8930702 
					 
					
						
						
							
							Limit SupplierPart choices in EditStockItem view  
						
						
						
						
					 
					
						2019-05-06 18:06:06 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						d2d248c72e 
					 
					
						
						
							
							QR button code is now a template  
						
						
						
						
					 
					
						2019-05-05 10:56:59 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						8a6932e993 
					 
					
						
						
							
							Improve QR code display  
						
						... 
						
						
						
						- Pretty little glyphicon button! 
						
						
					 
					
						2019-05-05 08:39:16 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ab6673caa3 
					 
					
						
						
							
							Add tests for default location traversal  
						
						
						
						
					 
					
						2019-05-04 23:20:59 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						71972f4454 
					 
					
						
						
							
							Add function to get the default location for a part  
						
						... 
						
						
						
						- If field not specified, look at the part category 
						
						
					 
					
						2019-05-04 19:06:39 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						9aa1a70f18 
					 
					
						
						
							
							QR code improvements  
						
						... 
						
						
						
						- Display QR codes as links to served images
- The qr_code plugin caches these images in the background
- Make a qr_code template to push out as a modal form
- Create a QRCodeView to simplify display of QR codes
- Add option to launchModalForm() to disable the 'submit' button
Refactored QR code display for
- StockLocation
- StockItem
- Part 
						
						
					 
					
						2019-05-04 18:46:57 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						8e65c0a120 
					 
					
						
						
							
							Fixes for some broken views  
						
						
						
						
					 
					
						2019-05-04 17:20:05 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						4ef1e4fc78 
					 
					
						
						
							
							Explicitly mark some CharField as non blank  
						
						
						
						
					 
					
						2019-05-04 17:01:31 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						b6cace2681 
					 
					
						
						
							
							Add 'options' drop-down for Part table in Category view  
						
						... 
						
						
						
						- Doesn't do anything yet 
						
						
					 
					
						2019-05-04 16:41:45 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						a116c3f191 
					 
					
						
						
							
							Handle case where a new stock item is to be created without the part being specified  
						
						
						
						
					 
					
						2019-05-03 23:52:30 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						6482b54bc9 
					 
					
						
						
							
							Merge pull request  #205  from SchrodingersGat/qr-codes  
						
						... 
						
						
						
						Qr codes 
						
						
					 
					
						2019-05-02 21:15:34 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						5a234a1070 
					 
					
						
						
							
							Added barcode for Part object  
						
						
						
						
					 
					
						2019-05-02 20:57:53 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						c901294a48 
					 
					
						
						
							
							Add more information to the Barcode  
						
						... 
						
						
						
						- API endpoint URL
- Add barcode generation for StockLocation 
						
						
					 
					
						2019-05-02 20:50:20 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						d49ce465e5 
					 
					
						
						
							
							Removed UUID field from StockItem  
						
						... 
						
						
						
						- QR code is now created based on a JSON object
- This will make it extensible to other things such as StockLocation
- Created a helper function to make Barcode objects 
						
						
					 
					
						2019-05-02 20:40:56 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						4d7ac870e0 
					 
					
						
						
							
							Use the collapse template for the stock location list view  
						
						
						
						
					 
					
						2019-05-02 19:02:03 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						20cfa71db2 
					 
					
						
						
							
							Added migration file  
						
						
						
						
					 
					
						2019-05-02 00:59:59 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						22f8c1d8c7 
					 
					
						
						
							
							Adjust model field (haven't run make migrate yet)  
						
						
						
						
					 
					
						2019-05-02 00:57:44 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						8a8de2b78f 
					 
					
						
						
							
							Add migration file  
						
						... 
						
						
						
						- Should pass this time 
						
						
					 
					
						2019-05-02 00:49:30 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						7e149f817c 
					 
					
						
						
							
							Small change to uuid should trigger migrations  
						
						
						
						
					 
					
						2019-05-02 00:41:29 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						905d78e25c 
					 
					
						
						
							
							Complete build now works  
						
						... 
						
						
						
						- Marks build as complete
- Deletes temporary BuildItem objects
- Preselects the part's default_location if there is one
- Creates a new stockitem in the selected location 
						
						
					 
					
						2019-05-02 00:04:39 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						436d158cfe 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master' into build-allocation  
						
						... 
						
						
						
						# Conflicts:
#	InvenTree/company/templates/company/tabs.html 
						
						
					 
					
						2019-05-01 08:15:58 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						395db4df38 
					 
					
						
						
							
							Pepe fixes  
						
						
						
						
					 
					
						2019-04-30 00:18:58 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						5c5411132a 
					 
					
						
						
							
							First pass at build allocation table  
						
						... 
						
						
						
						- Uses bootstrap-table "detailView" function 
						
						
					 
					
						2019-04-29 23:56:02 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e471313435 
					 
					
						
						
							
							PEP fix  
						
						
						
						
					 
					
						2019-04-29 18:43:44 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						3b838d29ec 
					 
					
						
						
							
							Small fixes  
						
						... 
						
						
						
						- Hide some tabs that aren't functional yet
- Hide fields instead of marking them as disabled
- Default behaviour is to allow all hosts 
						
						
					 
					
						2019-04-29 18:35:16 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2f7f49c116 
					 
					
						
						
							
							PEP fix  
						
						
						
						
					 
					
						2019-04-28 11:54:40 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ba49b080b0 
					 
					
						
						
							
							Some small tweaks  
						
						
						
						
					 
					
						2019-04-28 11:46:53 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						e5e6480099 
					 
					
						
						
							
							Merge pull request  #181  from SchrodingersGat/supplier-parts  
						
						... 
						
						
						
						Supplier parts 
						
						
					 
					
						2019-04-28 11:28:32 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						1171953e65 
					 
					
						
						
							
							Limit SupplierPart options in CreateBomItem form  
						
						... 
						
						
						
						- If Part is selected, limit the options in supplier_part field
- Only allow supplier_parts which map back to the same part 
						
						
					 
					
						2019-04-28 11:24:26 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						a9fbbc3a37 
					 
					
						
						
							
							Remove references to get_object_or_404  
						
						... 
						
						
						
						- Properly handle DoesNotExist errors 
						
						
					 
					
						2019-04-28 11:09:19 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2108ee2eb7 
					 
					
						
						
							
							Update makefile  
						
						
						
						
					 
					
						2019-04-28 08:42:17 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						d55ea1a982 
					 
					
						
						
							
							PEP fixes  
						
						
						
						
					 
					
						2019-04-28 01:09:48 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						aa04941bf1 
					 
					
						
						
							
							Add module-level docstrings for each app  
						
						
						
						
					 
					
						2019-04-28 01:05:45 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						a499fd325e 
					 
					
						
						
							
							Docstring for Stock app  
						
						
						
						
					 
					
						2019-04-27 22:49:16 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						0484e62836 
					 
					
						
						
							
							PEP fixes  
						
						
						
						
					 
					
						2019-04-27 15:25:40 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e7685951e1 
					 
					
						
						
							
							Add (simple) test cases for Stock API  
						
						... 
						
						
						
						- Still a lot of work to do here 
						
						
					 
					
						2019-04-27 15:24:30 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						030265cc2d 
					 
					
						
						
							
							Allow editing of 'notes' field when creating new StockItem  
						
						
						
						
					 
					
						2019-04-27 13:12:34 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						6c3041d99c 
					 
					
						
						
							
							Remove 'draft' function from StockItem RUD endpoint  
						
						
						
						
					 
					
						2019-04-26 21:44:38 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						d78841a665 
					 
					
						
						
							
							Allow editing of more stockitem options  
						
						
						
						
					 
					
						2019-04-25 23:35:48 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						8d5850248e 
					 
					
						
						
							
							PEP fixes  
						
						
						
						
					 
					
						2019-04-25 23:25:52 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						1f8632c77c 
					 
					
						
						
							
							Improved response message for stocktake  
						
						
						
						
					 
					
						2019-04-25 23:19:22 +10:00