Oliver Walters 
							
						 
					 
					
						
						
							
						
						990808ec03 
					 
					
						
						
							
							Fix code to move multiple parts via AJAX / JSON  
						
						
						
						
					 
					
						2019-04-25 23:16:54 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						757cd539b2 
					 
					
						
						
							
							Enforce 'notes' field for StockItem move  
						
						... 
						
						
						
						- Better error handling for StockItem.move 
						
						
					 
					
						2019-04-25 23:01:03 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						053e9c9795 
					 
					
						
						
							
							Add a stock tracking index  
						
						... 
						
						
						
						- Shows entire history of stocktracking items 
						
						
					 
					
						2019-04-25 22:11:10 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						79f8736b6b 
					 
					
						
						
							
							Add note on creation of StockItem  
						
						
						
						
					 
					
						2019-04-25 22:10:46 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						533fdb71c4 
					 
					
						
						
							
							Javascript function to render stock tracking table  
						
						... 
						
						
						
						- Added extra info to StockItemTracking serializer 
						
						
					 
					
						2019-04-25 22:04:32 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						f36f02b27f 
					 
					
						
						
							
							Tests for stock app  
						
						... 
						
						
						
						- Increase coverage of Stock/models.py to 84% 
						
						
					 
					
						2019-04-25 17:30:44 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						7b68310d73 
					 
					
						
						
							
							PEP fixes  
						
						
						
						
					 
					
						2019-04-25 03:20:25 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						7c91c9ba79 
					 
					
						
						
							
							Reverse URL for stock models  
						
						... 
						
						
						
						- stock location
- stock item
- stock tracking
- Added blank test files 
						
						
					 
					
						2019-04-25 03:13:41 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						0cdf660a80 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master' into delete-old-forms  
						
						... 
						
						
						
						# Conflicts:
#	InvenTree/part/views.py 
						
						
					 
					
						2019-04-18 23:51:58 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						9e9aa02b90 
					 
					
						
						
							
							Remove old templates from Stock  
						
						
						
						
					 
					
						2019-04-18 23:41:17 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						8040ad8a6a 
					 
					
						
						
							
							Add function to duplicate stock item  
						
						
						
						
					 
					
						2019-04-18 23:28:46 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						a0b6900eb8 
					 
					
						
						
							
							Disable buttons that require row selection, until a selection has been made  
						
						... 
						
						
						
						- Stock table 
						
						
					 
					
						2019-04-18 22:35:51 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						5d887f3785 
					 
					
						
						
							
							Remove 'simple-history'  
						
						... 
						
						
						
						- Might re-add it later on 
						
						
					 
					
						2019-04-18 21:28:09 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						fd3f6ec21e 
					 
					
						
						
							
							Add stock item filtering by sub-category  
						
						
						
						
					 
					
						2019-04-18 08:33:12 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ebcbf9a90e 
					 
					
						
						
							
							Add status_text to API  
						
						
						
						
					 
					
						2019-04-17 23:33:19 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						963883acd6 
					 
					
						
						
							
							Consolidated function to adjust stock  
						
						... 
						
						
						
						- Add / remove / stocktake
- Handle forms and tables properly 
						
						
					 
					
						2019-04-17 23:17:04 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ba1b8d9181 
					 
					
						
						
							
							Created js function to load stock table  
						
						... 
						
						
						
						- Avoid duplication of code 
						
						
					 
					
						2019-04-17 22:59:52 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						b9b8b5ee12 
					 
					
						
						
							
							Update model for StockItem  
						
						
						
						
					 
					
						2019-04-17 18:34:21 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						01bdf2f19b 
					 
					
						
						
							
							PEP fixes  
						
						
						
						
					 
					
						2019-04-16 22:32:43 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						be60fbcc25 
					 
					
						
						
							
							More cleanup for modal forms  
						
						... 
						
						
						
						- Require 'ajax_template_name' to be set or weird things happen! 
						
						
					 
					
						2019-04-16 21:25:20 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						29f33a8eec 
					 
					
						
						
							
							Move button locations into bootstrap-table headers  
						
						... 
						
						
						
						- part category
- stock location
- build list
- company list
- supplier part list 
						
						
					 
					
						2019-04-16 11:46:07 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						1ef81ecf2e 
					 
					
						
						
							
							Ignore some rules  
						
						
						
						
					 
					
						2019-04-14 09:39:01 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						76b0d17b11 
					 
					
						
						
							
							PEP fixes for /stock  
						
						
						
						
					 
					
						2019-04-14 09:23:24 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e6e03963c4 
					 
					
						
						
							
							Simplified custom button text for modal forms  
						
						... 
						
						
						
						- Now only configured from the javascript end
- No server-side configuration of button text 
						
						
					 
					
						2019-04-13 23:02:23 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						51d77ce4d2 
					 
					
						
						
							
							Include uuid in serializer and api  
						
						
						
						
					 
					
						2019-04-13 07:56:06 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						7b68bac32f 
					 
					
						
						
							
							Display UUID and QR code on stockitem page  
						
						... 
						
						
						
						- The actual display of this can be improved upon at a later stage 
						
						
					 
					
						2019-04-13 01:14:24 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						b64e584b52 
					 
					
						
						
							
							Add UUID field to StockItem model  
						
						
						
						
					 
					
						2019-04-13 01:12:47 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						1b5287307b 
					 
					
						
						
							
							Add some help text  
						
						
						
						
					 
					
						2019-04-13 00:52:26 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						926d717190 
					 
					
						
						
							
							Add quantity field to StockItemTracking  
						
						... 
						
						
						
						- Keep track of historical levels of part availability 
						
						
					 
					
						2019-04-13 00:14:10 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						93bb0bf6f4 
					 
					
						
						
							
							Improved 'move stock' form  
						
						... 
						
						
						
						- Better error checking on the form (provides form validation messages to user) 
						
						
					 
					
						2019-04-13 00:08:13 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						f451d31f00 
					 
					
						
						
							
							Rearrange stockitem drop-down menu for more logical operations  
						
						
						
						
					 
					
						2019-04-12 23:10:47 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e560ea4a41 
					 
					
						
						
							
							Update edit form for StockItem  
						
						... 
						
						
						
						- Disallow direct quantity editing (must perform stocktake)
- Add notes field to allow editing 
						
						
					 
					
						2019-04-12 23:10:32 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						7566c3769a 
					 
					
						
						
							
							Added a note for future work  
						
						
						
						
					 
					
						2019-04-12 23:05:12 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						68ec5df371 
					 
					
						
						
							
							Correctly handle StockTrackingItem if there is no user data  
						
						
						
						
					 
					
						2019-04-12 23:03:02 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						88103b63d2 
					 
					
						
						
							
							Cannot filter by STATUS  
						
						... 
						
						
						
						- Is this because it is a dict?
- Need to address this in the future 
						
						
					 
					
						2019-04-12 22:46:48 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						7a7b0aea33 
					 
					
						
						
							
							Changed 'stocklocation.items' to 'stocklocation.stock_items'  
						
						
						
						
					 
					
						2019-04-12 22:46:15 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						c67dc6f56e 
					 
					
						
						
							
							Initial updates required to run under django 2.2  
						
						... 
						
						
						
						- Change to middleware.py
- Change some URLs formatting
- Fix django version at 2.2 
						
						
					 
					
						2019-04-12 20:44:22 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						1b9c98ae3e 
					 
					
						
						
							
							Bug fix for stock item traking list  
						
						... 
						
						
						
						- Query was returning ALL stock tracking objects!
- Now filter by StockItem ID 
						
						
					 
					
						2018-05-10 21:27:41 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						4b4db50de5 
					 
					
						
						
							
							Display username in stock-tracking  
						
						... 
						
						
						
						- Add UserSerializer 
						
						
					 
					
						2018-05-10 21:20:12 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						dcf74292b6 
					 
					
						
						
							
							Changed tracking into to datetime field  
						
						... 
						
						
						
						- Added moment.js for formatting dates
- 
						
						
					 
					
						2018-05-10 21:13:36 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						bf4ffb8b0b 
					 
					
						
						
							
							Add part stocktake to Stock Location page(s)  
						
						
						
						
					 
					
						2018-05-08 22:41:52 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						f2982a59ad 
					 
					
						
						
							
							Added StockTracking API  
						
						... 
						
						
						
						/api/stock/track/
ListCreate API view
StockItem page now shows bootrap-table of tracking notes 
						
						
					 
					
						2018-05-08 22:30:32 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						3b6ef3f008 
					 
					
						
						
							
							Added stocktake / add / remove actions to StockItemDetail page  
						
						
						
						
					 
					
						2018-05-08 22:14:03 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						25e0de1ce7 
					 
					
						
						
							
							Vast improvements to stocktake API endpoint  
						
						... 
						
						
						
						- Also acts to ADD and REMOVE stock
- Send 'action' field to specify which one to perform
- Fixed add_stock and remove_stock funcs for StockItem model
- Autoatically add transaction notes for all actions 
						
						
					 
					
						2018-05-08 22:06:28 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						3f1c6e2059 
					 
					
						
						
							
							Simplified modal calls  
						
						... 
						
						
						
						- Default modal target supplied (can be overridden in options) 
						
						
					 
					
						2018-05-08 19:55:39 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						c5155d5ac7 
					 
					
						
						
							
							Move modal JS file  
						
						... 
						
						
						
						- Loaded by base. 
						
						
					 
					
						2018-05-08 19:40:29 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						fdf214626c 
					 
					
						
						
							
							Further assorted updates  
						
						... 
						
						
						
						What, you need more commit details?! Pah 
						
						
					 
					
						2018-05-07 23:40:17 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						b6944620dd 
					 
					
						
						
							
							Fixes for JSON API  
						
						... 
						
						
						
						- Set content type
- Stringify JSON data
- Finish API to stocktake multiple parts 
						
						
					 
					
						2018-05-07 23:25:47 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						425db5fd39 
					 
					
						
						
							
							Tweaked part stock page  
						
						
						
						
					 
					
						2018-05-07 21:51:08 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						2b286c3b83 
					 
					
						
						
							
							Bulk stocktake API  
						
						... 
						
						
						
						- Pass list of pk/quantity dict objects 
						
						
					 
					
						2018-05-07 21:17:19 +10:00