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 
							
						 
					 
					
						
						
							
						
						8214aef0db 
					 
					
						
						
							
							Add template for hover_image  
						
						
						
						
					 
					
						2019-06-01 21:13:51 +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 
							
						 
					 
					
						
						
							
						
						56821abd09 
					 
					
						
						
							
							CSS tweaks for modals  
						
						
						
						
					 
					
						2019-05-29 23:13:26 +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 
							
						 
					 
					
						
						
							
						
						1c1cc670f8 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						
						
						
					 
					
						2019-05-29 01:06:27 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						da4f68e5a5 
					 
					
						
						
							
							Merge pull request  #375  from SchrodingersGat/group-stock-items  
						
						... 
						
						
						
						Group stock items 
						
						
					 
					
						2019-05-29 01:05:57 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						6a30485a4e 
					 
					
						
						
							
							Initial work toward fixing stock issues  
						
						
						
						
					 
					
						2019-05-29 01:03:21 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						d512232aac 
					 
					
						
						
							
							Readable css  
						
						
						
						
					 
					
						2019-05-29 00:54:00 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ea03205c50 
					 
					
						
						
							
							Don't need to detach and re-attach rows any more!!  
						
						
						
						
					 
					
						2019-05-29 00:47:36 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2ccb014d9e 
					 
					
						
						
							
							FINALLY sorting is working well  
						
						... 
						
						
						
						- Wrote a custom sorter which takes group rows into account 
						
						
					 
					
						2019-05-29 00:45:35 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ecde201bb0 
					 
					
						
						
							
							Update to newest bootstrap-table script  
						
						
						
						
					 
					
						2019-05-29 00:20:01 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						729968e65d 
					 
					
						
						
							
							Better message for no stock found  
						
						
						
						
					 
					
						2019-05-28 22:05:30 +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 
							
						 
					 
					
						
						
							
						
						f7d521ca97 
					 
					
						
						
							
							Reorder stock table columns  
						
						
						
						
					 
					
						2019-05-28 19:13:46 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						7ac52d4d9f 
					 
					
						
						
							
							Optionally select which column gets grouped  
						
						... 
						
						
						
						- Allow grouping by numerical values 
						
						
					 
					
						2019-05-28 19:12:10 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e4acca2951 
					 
					
						
						
							
							Display stock item serial number (if it exists)!  
						
						
						
						
					 
					
						2019-05-28 18:29:12 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						807798810b 
					 
					
						
						
							
							Color sub-group rows slightly differently  
						
						
						
						
					 
					
						2019-05-28 18:17:16 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						8255332950 
					 
					
						
						
							
							Remove some debug messages  
						
						
						
						
					 
					
						2019-05-28 18:12:47 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						4011d66b6f 
					 
					
						
						
							
							Display sub-location information  
						
						
						
						
					 
					
						2019-05-28 18:08:50 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						7120b940f0 
					 
					
						
						
							
							Pre-collapse grouped columns  
						
						
						
						
					 
					
						2019-05-28 17:51:02 +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 
							
						 
					 
					
						
						
							
						
						28a226d08d 
					 
					
						
						
							
							Merge pull request  #374  from SchrodingersGat/build-allocated-view  
						
						... 
						
						
						
						Switch between display and edit mode for build allocations 
						
						
					 
					
						2019-05-27 23:52:20 +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 
							
						 
					 
					
						
						
							
						
						a305301b95 
					 
					
						
						
							
							Switch between display and edit mode for build allocations  
						
						
						
						
					 
					
						2019-05-27 08:07:38 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						141d9b779d 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'  
						
						
						
						
					 
					
						2019-05-26 16:09:20 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						59fa59f760 
					 
					
						
						
							
							Merge pull request  #372  from SchrodingersGat/variant-improvements  
						
						... 
						
						
						
						Variant improvements 
						
						
					 
					
						2019-05-26 16:08:47 +10:00