Oliver Walters 
							
						 
					 
					
						
						
							
						
						3405fb93a9 
					 
					
						
						
							
							Peppy fixes  
						
						
						
						
					 
					
						2019-06-15 19:42:09 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						1290e7f289 
					 
					
						
						
							
							Implement POST for receiving items  
						
						... 
						
						
						
						- Create new StockItem in the correct location 
						
						
					 
					
						2019-06-15 19:39:57 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						c906cbe2c2 
					 
					
						
						
							
							Merge branch 'stock-endpoint'  
						
						
						
						
					 
					
						2019-06-13 23:06:08 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ff6df9741f 
					 
					
						
						
							
							Perform model validation on API serializers  
						
						... 
						
						
						
						If you have a class, why not subclass it?! 
						
						
					 
					
						2019-06-13 23:03:58 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						222c9f1876 
					 
					
						
						
							
							Allow quantity editing via /api/stock/ endpoint  
						
						... 
						
						
						
						- Allows creation of a new StockItem with a specified quantity 
						
						
					 
					
						2019-06-13 22:58:02 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						8a46dda07f 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						
						
						
					 
					
						2019-06-10 23:22:04 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						f731c45ce8 
					 
					
						
						
							
							Replace other choice fields with commonized status code  
						
						
						
						
					 
					
						2019-06-04 23:38:52 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						166b41196b 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						
						
						
					 
					
						2019-06-04 21:22:36 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						782ad57f52 
					 
					
						
						
							
							Re-enable image hovering where appropriate  
						
						
						
						
					 
					
						2019-06-03 22:03:22 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						7a3b186a0c 
					 
					
						
						
							
							Fix double loading of modals.html  
						
						
						
						
					 
					
						2019-06-03 21:51:59 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						c00b19bc5b 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						
						
						
					 
					
						2019-06-02 20:42:37 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ba26acd487 
					 
					
						
						
							
							Rename some fields  
						
						... 
						
						
						
						- Oops didn't think that through, gotta go through and fix the data now... 
						
						
					 
					
						2019-06-02 19:46:30 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						fd2e2a71f9 
					 
					
						
						
							
							Add search results for part-category and stock-location  
						
						
						
						
					 
					
						2019-06-02 19:15:05 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						6e7f354a23 
					 
					
						
						
							
							Add a 'LOST' status code for stockitem  
						
						
						
						
					 
					
						2019-06-02 13:53:54 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						013a85e6f7 
					 
					
						
						
							
							Better dispaly of stock status  
						
						... 
						
						
						
						- Send status text in JSON
- Only display status if it is not "OK" 
						
						
					 
					
						2019-06-02 13:53:11 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						9577e4e505 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						... 
						
						
						
						# Conflicts:
#	InvenTree/static/script/inventree/stock.js
#	InvenTree/stock/forms.py
#	InvenTree/stock/urls.py
#	InvenTree/stock/views.py 
						
						
					 
					
						2019-06-02 12:51:56 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						6982b2f0c2 
					 
					
						
						
							
							Making PEP happy  
						
						
						
						
					 
					
						2019-06-02 12:47:40 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						802ff35cf3 
					 
					
						
						
							
							Remove some now unused forms / views / etc  
						
						
						
						
					 
					
						2019-06-02 12:45:44 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2ee35ec062 
					 
					
						
						
							
							Stock counting now works  
						
						
						
						
					 
					
						2019-06-02 12:20:26 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						d365d7cc44 
					 
					
						
						
							
							remove from stock now works  
						
						
						
						
					 
					
						2019-06-02 12:15:44 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						1b3ffada6d 
					 
					
						
						
							
							Add-stock is now working  
						
						
						
						
					 
					
						2019-06-02 12:13:22 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						8dd9034563 
					 
					
						
						
							
							Remove 'destination' field if we are not moving stock  
						
						... 
						
						
						
						- Allow different stock adjustment actions 
						
						
					 
					
						2019-06-02 12:00:39 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						d1ff115f74 
					 
					
						
						
							
							Simplifiy js and improve template / form  
						
						
						
						
					 
					
						2019-06-02 11:47:21 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						c7503b4f9f 
					 
					
						
						
							
							Consolidated form/view into single 'stock-adjust' endpoint  
						
						
						
						
					 
					
						2019-06-02 11:37:04 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						fe31205017 
					 
					
						
						
							
							Stock movement now works!  
						
						
						
						
					 
					
						2019-06-02 11:27:03 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						0b54baf6db 
					 
					
						
						
							
							POST the stock adjustment method back as a hidden form input  
						
						
						
						
					 
					
						2019-06-02 11:15:12 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						1b7762470d 
					 
					
						
						
							
							catch a ValueError  
						
						
						
						
					 
					
						2019-06-02 11:14:56 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						96f6f6068e 
					 
					
						
						
							
							Return message on succses  
						
						
						
						
					 
					
						2019-06-02 11:05:40 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						20963f83d9 
					 
					
						
						
							
							Better error reporting for quantity  
						
						
						
						
					 
					
						2019-06-02 11:00:28 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						c228a4998c 
					 
					
						
						
							
							Extract stock items from POST and return to form  
						
						
						
						
					 
					
						2019-06-02 10:25:19 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e278bdbb90 
					 
					
						
						
							
							Improve filtering for stock items  
						
						
						
						
					 
					
						2019-06-02 09:14:45 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						011f5a5efd 
					 
					
						
						
							
							Delete rows interactively from stock adjustment form  
						
						
						
						
					 
					
						2019-06-01 22:04:03 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						6a04c8cbd3 
					 
					
						
						
							
							Update stock_move form template  
						
						
						
						
					 
					
						2019-06-01 21:16:59 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						3869bc27c9 
					 
					
						
						
							
							Whoops, that form was being used.  
						
						... 
						
						
						
						Created a copy of the form for multiple-item-stock-movements 
						
						
					 
					
						2019-05-30 09:01:16 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						d321947026 
					 
					
						
						
							
							Add stock item fields for each item passed to the form  
						
						
						
						
					 
					
						2019-05-29 22:38:42 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						0e3f74ef31 
					 
					
						
						
							
							Pass list of selected stock items to the view  
						
						
						
						
					 
					
						2019-05-29 22:24:22 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						0ce6c5f7d5 
					 
					
						
						
							
							Redirect non-ajax forms to /  
						
						
						
						
					 
					
						2019-05-29 22:24:17 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2b4cb4d3e0 
					 
					
						
						
							
							Beginning to move the stocktake forms server side  
						
						
						
						
					 
					
						2019-05-29 22:24:11 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						72dc75512b 
					 
					
						
						
							
							Pass list of selected stock items to the view  
						
						
						
						
					 
					
						2019-05-29 22:23:45 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						f4a052ee2b 
					 
					
						
						
							
							Redirect non-ajax forms to /  
						
						
						
						
					 
					
						2019-05-29 22:11:03 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						080f9da9c8 
					 
					
						
						
							
							Beginning to move the stocktake forms server side  
						
						
						
						
					 
					
						2019-05-29 22:05:13 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						6a30485a4e 
					 
					
						
						
							
							Initial work toward fixing stock issues  
						
						
						
						
					 
					
						2019-05-29 01:03:21 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						1232a6cf17 
					 
					
						
						
							
							PEP fixes  
						
						
						
						
					 
					
						2019-05-28 22:01:52 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						8c583750a2 
					 
					
						
						
							
							Update the stock list API  
						
						... 
						
						
						
						- Custom data serialization is MUCH faster (~400ms compared to 3s)
- Cache location queries
- Flatten related field data
- Update stock table javascript to match 
						
						
					 
					
						2019-05-28 21:45:27 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						4218cf8b45 
					 
					
						
						
							
							Client-side grouping  
						
						... 
						
						
						
						- Cusomizations made to bootstrap-table-group-by.js
- Group by part name
- Display total stock count per group
- Only group if there are more than 1 item in the group
- Groups send checkbox signals through appropriately! 
						
						
					 
					
						2019-05-28 17:21:29 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						64403f824a 
					 
					
						
						
							
							And deltaco some code that went along with it  
						
						
						
						
					 
					
						2019-05-27 22:46:17 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						7de4ee80f1 
					 
					
						
						
							
							Deltaco some dead code  
						
						
						
						
					 
					
						2019-05-27 22:44:38 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						5a9c19492b 
					 
					
						
						
							
							Design an aggregation filter for stock items  
						
						... 
						
						
						
						- If 'aggregate=1' is sent to the stock API, aggregate the returned stock items by part and location
- Suprisingly this actually works right out of the gate 
						
						
					 
					
						2019-05-27 22:44:13 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						f3b17b2164 
					 
					
						
						
							
							Add some form fields (might have to remove later)  
						
						
						
						
					 
					
						2019-05-26 00:32:18 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						6603d6e9ed 
					 
					
						
						
							
							PEP fixes  
						
						
						
						
					 
					
						2019-05-26 00:22:05 +10:00