Oliver Walters 
							
						 
					 
					
						
						
							
						
						d9698b10cc 
					 
					
						
						
							
							PEP fixes  
						
						 
						
						
						
						
					 
					
						2020-04-22 13:21:45 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						1373425c29 
					 
					
						
						
							
							Update definition for StockItemAllocation model  
						
						 
						
						... 
						
						
						
						- Limit foreignkey choices
- Error checking
- Check if a StockItem is over-allocated
- Fix API serialization and filtering 
						
						
					 
					
						2020-04-22 13:11:19 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2cb1b076f6 
					 
					
						
						
							
							Create "SalesOrderAllocation" object  
						
						 
						
						... 
						
						
						
						- Links multiple StockItem objects to a single SalesOrderLineItem 
						
						
					 
					
						2020-04-22 12:12:48 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						3a71a4f63a 
					 
					
						
						
							
							Fix for StockItem model  
						
						 
						
						... 
						
						
						
						- Allow sales_order_line to be blank 
						
						
					 
					
						2020-04-22 10:16:54 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						6dd79af0b6 
					 
					
						
						
							
							Expose "is_allocated" parameter on StockItem API  
						
						 
						
						
						
						
					 
					
						2020-04-22 10:11:40 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						372958d939 
					 
					
						
						
							
							Migrate more pages to the two_column template  
						
						 
						
						
						
						
					 
					
						2020-04-22 09:50:10 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						09ccd6c5e2 
					 
					
						
						
							
							PEP style fixes  
						
						 
						
						
						
						
					 
					
						2020-04-21 22:37:35 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						cb636e000d 
					 
					
						
						
							
							Display a sub-list of stock items which are allocated to a SalseOrderLineItem  
						
						 
						
						
						
						
					 
					
						2020-04-21 21:38:04 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2c6e8da90e 
					 
					
						
						
							
							Ability to filter StockItemList API by sales_order or sales_order_line  
						
						 
						
						
						
						
					 
					
						2020-04-21 17:33:02 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						0d1919f10b 
					 
					
						
						
							
							Display an alert on a stock item page if that stock item is allocated to a salesorder  
						
						 
						
						
						
						
					 
					
						2020-04-21 16:59:14 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						89ede3e103 
					 
					
						
						
							
							Fix for SalesOrderLineItem allocation calculation  
						
						 
						
						... 
						
						
						
						Also function to render a progress bar 
						
						
					 
					
						2020-04-21 16:45:44 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						a1376eeb9e 
					 
					
						
						
							
							The 'StockItem' model now has a reference to a SalesOrderLineItem  
						
						 
						
						
						
						
					 
					
						2020-04-21 15:04:21 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						87d8b4674a 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						 
						
						
						
						
					 
					
						2020-04-20 09:58:49 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						4ec5e9a907 
					 
					
						
						
							
							Consolidate StockItem serializer  
						
						 
						
						
						
						
					 
					
						2020-04-20 08:24:43 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						c49cd9ffde 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						 
						
						
						
						
					 
					
						2020-04-20 01:28:31 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						c72fce0cc5 
					 
					
						
						
							
							Add "tracking items" back in  
						
						 
						
						
						
						
					 
					
						2020-04-20 01:14:19 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						b2c40c91b7 
					 
					
						
						
							
							PEP fixes  
						
						 
						
						
						
						
					 
					
						2020-04-20 01:11:25 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						0334035e77 
					 
					
						
						
							
							Simplify StockItem serializer  
						
						 
						
						... 
						
						
						
						- Some more work needed here to cut down on database hits 
						
						
					 
					
						2020-04-20 01:09:37 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						6a89e0089d 
					 
					
						
						
							
							Updates for stock serializer  
						
						 
						
						
						
						
					 
					
						2020-04-20 00:49:13 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						762d735618 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						 
						
						
						
						
					 
					
						2020-04-16 21:55:59 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						d57fed6142 
					 
					
						
						
							
							Change fingerprint icon to barcode  
						
						 
						
						
						
						
					 
					
						2020-04-15 00:30:00 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e56c018a4a 
					 
					
						
						
							
							Display StockItem UID if one exists  
						
						 
						
						
						
						
					 
					
						2020-04-14 23:28:46 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						977316cb3a 
					 
					
						
						
							
							Include UID field in StockItem API  
						
						 
						
						
						
						
					 
					
						2020-04-14 22:57:46 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ba4a1fd771 
					 
					
						
						
							
							Add a 'uid' field to StockItem model  
						
						 
						
						... 
						
						
						
						- To be used for barcode asociation and lookup 
						
						
					 
					
						2020-04-14 22:54:05 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						4a615e05ae 
					 
					
						
						
							
							Further barcode work  
						
						 
						
						... 
						
						
						
						- Simplify InvenTree barcode format
- Create base-clas for plugin 
						
						
					 
					
						2020-04-14 21:30:43 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2e1c4e9792 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						 
						
						
						
						
					 
					
						2020-04-13 20:43:00 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2506aa110b 
					 
					
						
						
							
							API changes  
						
						 
						
						... 
						
						
						
						- Allow SupplierPart to be filtered by 'company' in addition to 'supplier' and 'manufacturer'
- Stock can now also be filtered by 'company'
(cherry picked from commit 1b1cd944be ) 
						
						
					 
					
						2020-04-13 20:20:33 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						a8ceddc8e4 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						 
						
						
						
						
					 
					
						2020-04-12 01:05:42 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						7503596ea4 
					 
					
						
						
							
							More fixes  
						
						 
						
						... 
						
						
						
						- Add a set of template tags for rendering status codes
- Improve build API filtering
- Remove some outdated files
- Fix unit testing 
						
						
					 
					
						2020-04-12 00:10:33 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e3102900b6 
					 
					
						
						
							
							Allow stock API to filter by parts which are not active  
						
						 
						
						
						
						
					 
					
						2020-04-11 14:41:07 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ba2b1ce581 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						 
						
						
						
						
					 
					
						2020-04-10 01:12:11 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						bc91975f2c 
					 
					
						
						
							
							Fixes for Stocktransfer API endpoint  
						
						 
						
						
						
						
					 
					
						2020-04-10 01:01:39 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						5b2665edb1 
					 
					
						
						
							
							Better API validation  
						
						 
						
						
						
						
					 
					
						2020-04-10 00:53:04 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						41b3f1d39c 
					 
					
						
						
							
							API cleanup  
						
						 
						
						... 
						
						
						
						Add / Remove / Count endpoints now work 
						
						
					 
					
						2020-04-10 00:03:43 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						3e5dc65c49 
					 
					
						
						
							
							Bugfix for notes field  
						
						 
						
						
						
						
					 
					
						2020-04-10 00:03:21 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						58a0f40889 
					 
					
						
						
							
							Simplifiy stock adjustment APIs  
						
						 
						
						... 
						
						
						
						- Separate API endpoints for count / add / remove / transfer
- Unit testing 
						
						
					 
					
						2020-04-09 22:24:05 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						1b3f8a9309 
					 
					
						
						
							
							Unit testing for the stocktake API  
						
						 
						
						
						
						
					 
					
						2020-04-09 21:19:13 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						f6a1ddf8e7 
					 
					
						
						
							
							Re-enable stocktake API  
						
						 
						
						
						
						
					 
					
						2020-04-09 21:18:55 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						97f605ef55 
					 
					
						
						
							
							Remove some weird trailing zeros  
						
						 
						
						
						
						
					 
					
						2020-04-07 00:19:51 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						4a02a90954 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						 
						
						
						
						
					 
					
						2020-04-07 00:08:44 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						96547b885e 
					 
					
						
						
							
							Include supplier-part information in Stock API  
						
						 
						
						
						
						
					 
					
						2020-04-06 22:02:23 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						93eeeec2f3 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						 
						
						
						
						
					 
					
						2020-04-06 21:15:06 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						44c10c45cd 
					 
					
						
						
							
							visual consolidation  
						
						 
						
						
						
						
					 
					
						2020-04-06 20:50:33 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						b8f7555a73 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						 
						
						
						
						
					 
					
						2020-04-06 16:25:48 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						bbe714c8f7 
					 
					
						
						
							
							Bugs!  
						
						 
						
						... 
						
						
						
						Thanks, unit testing 
						
						
					 
					
						2020-04-06 11:21:34 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						bd407cd226 
					 
					
						
						
							
							Rename "URL" to "link" for StockItem and StockItemTracking models  
						
						 
						
						
						
						
					 
					
						2020-04-06 10:43:06 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2530313e68 
					 
					
						
						
							
							Add part_detail and location_detail to the StockItem detail class  
						
						 
						
						
						
						
					 
					
						2020-04-06 08:38:10 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						94b9878c8d 
					 
					
						
						
							
							Bug fix for stock api  
						
						 
						
						... 
						
						
						
						- If a part had an empty image, the thumbnail was improperly encoded 
						
						
					 
					
						2020-04-05 22:57:42 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						efaa532162 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						 
						
						
						
						
					 
					
						2020-04-05 22:07:57 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						7b494c08ec 
					 
					
						
						
							
							Translations  
						
						 
						
						
						
						
					 
					
						2020-04-05 20:40:46 +10:00