Oliver Walters
							
						 
					 | 
					
						
						
							
						
						4f1acddb5d
					 | 
					
						
						
							
							Fix some build status code thingies
						
						
						
						
						
						
					 | 
					
						2019-06-04 23:42:48 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						f731c45ce8
					 | 
					
						
						
							
							Replace other choice fields with commonized status code
						
						
						
						
						
						
					 | 
					
						2019-06-04 23:38:52 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						8d70d2f28a
					 | 
					
						
						
							
							Fix rendering of purchase order status codes
						
						
						
						
						
						
					 | 
					
						2019-06-04 23:14:57 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						76a72be926
					 | 
					
						
						
							
							Add order status field
						
						
						
						
						
						
						
						- Display status field in PurchaseOrder list view 
						
						
					 | 
					
						2019-06-04 23:09:51 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						da53de844a
					 | 
					
						
						
							
							Add page for detailing company purchase orders
						
						
						
						
						
						
					 | 
					
						2019-06-04 22:39:46 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						c45d8a5782
					 | 
					
						
						
							
							Add 'purchase orders' tab for company
						
						
						
						
						
						
					 | 
					
						2019-06-04 22:35:34 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						cc2e3351ff
					 | 
					
						
						
							
							Search for company
						
						
						
						
						
						
					 | 
					
						2019-06-04 22:34:58 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						0e29f9b88c
					 | 
					
						
						
							
							Fix related name
						
						
						
						
						
						
					 | 
					
						2019-06-04 22:26:40 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						54b1ccd585
					 | 
					
						
						
							
							Allow blank PO description and add URL field
						
						
						
						
						
						
					 | 
					
						2019-06-04 22:26:19 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						68d514d478
					 | 
					
						
						
							
							Limit choices for supplier in PurchaseOrder
						
						
						
						
						
						
					 | 
					
						2019-06-04 22:20:49 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						d840b44f7a
					 | 
					
						
						
							
							Create initial models for 'Order'
						
						
						
						
						
						
						
						- PurchaseOrder
- PurchaseOrderLineItem
(These are based on some abstract model classes) 
						
						
					 | 
					
						2019-06-04 22:19:04 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						166b41196b
					 | 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'
						
						
						
						
						
						
					 | 
					
						2019-06-04 21:22:36 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						937763f961
					 | 
					
						
						
							
							Merge pull request #384 from SchrodingersGat/build-allocation-fixes
						
						
						
						
						
						
						
						Build allocation fixes 
						
						
					 | 
					
						2019-06-03 22:14:27 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						60f5160d24
					 | 
					
						
						
							
							Show total stock rather than taking allocation into account
						
						
						
						
						
						
					 | 
					
						2019-06-03 22:04:48 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						782ad57f52
					 | 
					
						
						
							
							Re-enable image hovering where appropriate
						
						
						
						
						
						
					 | 
					
						2019-06-03 22:03:22 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						8e0e2979b5
					 | 
					
						
						
							
							Rename parts tab in build view
						
						
						
						
						
						
					 | 
					
						2019-06-03 22:01:23 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						68e4adda48
					 | 
					
						
						
							
							Simplified build allocation view
						
						
						
						
						
						
					 | 
					
						2019-06-03 21:59:15 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						7a3b186a0c
					 | 
					
						
						
							
							Fix double loading of modals.html
						
						
						
						
						
						
					 | 
					
						2019-06-03 21:51:59 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						7a244f48ae
					 | 
					
						
						
							
							Solve weird collapse bug
						
						
						
						
						
						
						
						- HTML is so gross
- Disable image hover seems to work... 
						
						
					 | 
					
						2019-06-03 21:35:40 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						bb5ed0b9fe
					 | 
					
						
						
							
							Fix bug for BuildItem with no part image
						
						
						
						
						
						
						
						- Can't request a field what don't exist 
						
						
					 | 
					
						2019-06-03 21:25:37 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						a13e50445e
					 | 
					
						
						
							
							Merge branch 'tweeeek'
						
						
						
						
						
						
					 | 
					
						2019-06-03 14:19:21 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						aff4124d97
					 | 
					
						
						
							
							Merge pull request #382 from SchrodingersGat/tweeeek
						
						
						
						
						
						
						
						Remove defunct 'roadmap' document 
						
						
					 | 
					
						2019-06-03 14:18:33 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						151731c376
					 | 
					
						
						
							
							Remove defunct 'roadmap' document
						
						
						
						
						
						
					 | 
					
						2019-06-03 13:54:33 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						c00b19bc5b
					 | 
					
						
						
							
							Merge remote-tracking branch 'inventree/master'
						
						
						
						
						
						
					 | 
					
						2019-06-02 20:42:37 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						efaf38c583
					 | 
					
						
						
							
							Merge pull request #381 from SchrodingersGat/assorted-fixes
						
						
						
						
						
						
						
						Assorted fixes 
						
						
					 | 
					
						2019-06-02 20:42:11 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						219c438b82
					 | 
					
						
						
							
							Part name uniqueness is case insensitive
						
						
						
						
						
						
					 | 
					
						2019-06-02 20:37:59 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						64d541f453
					 | 
					
						
						
							
							Hide result types which return no results
						
						
						
						
						
						
					 | 
					
						2019-06-02 20:28:17 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						0b88953706
					 | 
					
						
						
							
							Form field rearrangement
						
						
						
						
						
						
					 | 
					
						2019-06-02 20:07:30 +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
							
						 
					 | 
					
						
						
							
						
						3427f81a34
					 | 
					
						
						
							
							Improve part information display
						
						
						
						
						
						
						
						- Better terminology 
						
						
					 | 
					
						2019-06-02 14:47:40 +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
							
						 
					 | 
					
						
						
							
						
						82f3773aa1
					 | 
					
						
						
							
							Merge pull request #380 from SchrodingersGat/server-side-stock-forms
						
						
						
						
						
						
						
						Server side stock forms 
						
						
					 | 
					
						2019-06-02 12:50:41 +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
							
						 
					 | 
					
						
						
							
						
						5177b7f836
					 | 
					
						
						
							
							Remove some defunct javascript
						
						
						
						
						
						
					 | 
					
						2019-06-02 12:24:40 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |