Oliver
							
						 
					 | 
					
						
						
							
						
						55e7f365df
					 | 
					
						
						
							
							Added AjaxUpdateView class
						
						
						
						
						
						
						
						Also cleaned up the modal form javascript 
						
						
					 | 
					
						2018-04-26 08:18:53 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						99743c6bd0
					 | 
					
						
						
							
							Modal form now working on multiple pages
						
						
						
						
						
						
						
						- Part index
- Part category detail page(s) 
						
						
					 | 
					
						2018-04-25 15:34:12 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						e3b2bd7129
					 | 
					
						
						
							
							Abstracted jquery code to load a modal form
						
						
						
						
						
						
						
						- static/scripts/modal_form.js
- bindModalForm function takes care of the mechanics 
						
						
					 | 
					
						2018-04-25 15:28:57 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						ab05c6ce1e
					 | 
					
						
						
							
							Updated AjaxCreateView
						
						
						
						
						
						
						
						- Return PK of newly-created object
- Populate fields with initial values as necessary 
						
						
					 | 
					
						2018-04-25 15:27:23 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						d88da28871
					 | 
					
						
						
							
							Generic AjaxCreateView
						
						
						
						
						
						
						
						- Allows for same form to be posted 
						
						
					 | 
					
						2018-04-25 14:10:56 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						8bc4050d05
					 | 
					
						
						
							
							Modal form is working for 'create new category'
						
						
						
						
						
						
						
						- Had to set form.helper.form_tag to False (so we could control form tags manually)
- Created a 'json' model view 
						
						
					 | 
					
						2018-04-25 12:46:58 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						9004086632
					 | 
					
						
						
							
							Add button to launch modal form
						
						
						
						
						
						
					 | 
					
						2018-04-25 00:09:25 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						db49e98f37
					 | 
					
						
						
							
							Load bootstrap.min.js
						
						
						
						
						
						
					 | 
					
						2018-04-24 23:41:01 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						50fcf5363c
					 | 
					
						
						
							
							Download bootstrap and jquery to static dir
						
						
						
						
						
						
						
						- Allow to run offline 
						
						
					 | 
					
						2018-04-24 22:50:56 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						1df1bf2c07
					 | 
					
						
						
							
							Added 'URL' field to company
						
						
						
						
						
						
					 | 
					
						2018-04-24 18:01:15 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						b114001678
					 | 
					
						
						
							
							Fixed display of part allocation count
						
						
						
						
						
						
					 | 
					
						2018-04-24 17:59:20 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						f46c09e3a7
					 | 
					
						
						
							
							Added part category path string to serializer
						
						
						
						
						
						
					 | 
					
						2018-04-24 17:54:08 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						25fcd3e9f1
					 | 
					
						
						
							
							Simple search filtering for part list
						
						
						
						
						
						
						
						- Needs to be 'generecised'
- Working well for now 
						
						
					 | 
					
						2018-04-24 09:06:30 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						08ed128bea
					 | 
					
						
						
							
							PEP style fixes
						
						
						
						
						
						
					 | 
					
						2018-04-23 21:18:35 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						86a9b36c99
					 | 
					
						
						
							
							Add part-list API
						
						
						
						
						
						
						
						- Deleted some old serializers
- Simply list of parts
- Search by name / description
- Orderable by name 
						
						
					 | 
					
						2018-04-23 21:10:13 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						f1a5b3c1ca
					 | 
					
						
						
							
							Add AJAX filtering of company list
						
						
						
						
						
						
						
						- Search across NAME and DESCRIPTION fields
- TODO - Implement pagination (how?) 
						
						
					 | 
					
						2018-04-23 20:37:36 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						6c1784b5b9
					 | 
					
						
						
							
							Implement (basic) JSON API for company model
						
						
						
						
						
						
						
						- Pagination
- Search company name and description
- Filter by is_customer and is_supplier 
						
						
					 | 
					
						2018-04-23 19:46:40 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						97f05f85de
					 | 
					
						
						
							
							Added TODO entry
						
						
						
						
						
						
					 | 
					
						2018-04-22 23:16:12 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						ac3de4ce3d
					 | 
					
						
						
							
							Add part detail page for company / supplier
						
						
						
						
						
						
					 | 
					
						2018-04-22 23:07:23 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						4ebd8cd6b1
					 | 
					
						
						
							
							Added company details tab
						
						
						
						
						
						
					 | 
					
						2018-04-22 22:44:49 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						d44a4e174b
					 | 
					
						
						
							
							Added 'tabs' to company view
						
						
						
						
						
						
					 | 
					
						2018-04-22 22:38:35 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						ee2f262e19
					 | 
					
						
						
							
							Company index / detail / edit pages working
						
						
						
						
						
						
					 | 
					
						2018-04-22 22:21:50 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						4bedf0ed4c
					 | 
					
						
						
							
							Finally got migrations working together
						
						
						
						
						
						
					 | 
					
						2018-04-22 21:54:12 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						cef3c664f9
					 | 
					
						
						
							
							Moving 'supplier' to 'company'
						
						
						
						
						
						
					 | 
					
						2018-04-19 09:01:25 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						3bb434ae98
					 | 
					
						
						
							
							Migration fix
						
						
						
						
						
						
					 | 
					
						2018-04-19 09:01:20 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						433f670e1c
					 | 
					
						
						
							
							Removed 'customer' app
						
						
						
						
						
						
					 | 
					
						2018-04-19 09:01:17 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						f1357cfb7c
					 | 
					
						
						
							
							Adde 'system' Field to StockItemTracking
						
						
						
						
						
						
					 | 
					
						2018-04-18 08:44:08 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						a4621295a6
					 | 
					
						
						
							
							Fixed spash page for customer index
						
						
						
						
						
						
						
						Added 'notes' field to Part object 
						
						
					 | 
					
						2018-04-18 01:44:55 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						f66a751608
					 | 
					
						
						
							
							Add 'recevied' field to SupplierOrderLineItem
						
						
						
						
						
						
					 | 
					
						2018-04-18 01:23:08 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						1400128f9f
					 | 
					
						
						
							
							SupplierOrderLineItem gets reference to internal part
						
						
						
						
						
						
						
						- For keeping track of how many of an internal part is on order! 
						
						
					 | 
					
						2018-04-18 01:21:18 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						12a97204b1
					 | 
					
						
						
							
							Merged migration files
						
						
						
						
						
						
					 | 
					
						2018-04-18 01:18:15 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						24f4c95060
					 | 
					
						
						
							
							Merge branch 'PO'
						
						
						
						
						
						
					 | 
					
						2018-04-18 01:17:07 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						d8d3509b5e
					 | 
					
						
						
							
							Changes 'notes' fields to be textfield - not charfield
						
						
						
						
						
						
					 | 
					
						2018-04-18 01:16:30 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						d00f9f74e4
					 | 
					
						
						
							
							Added details page for SupplierOrder
						
						
						
						
						
						
					 | 
					
						2018-04-18 01:13:42 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						f4aa09a354
					 | 
					
						
						
							
							Added 'status' and 'delivery_date' fields to SupplierOrder
						
						
						
						
						
						
					 | 
					
						2018-04-18 00:50:05 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						7045443d7b
					 | 
					
						
						
							
							Add tab view for supplier page
						
						
						
						
						
						
						
						- "Parts" tab
- "Orders" tab 
						
						
					 | 
					
						2018-04-18 00:42:44 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Newlands
							
						 
					 | 
					
						
						
							
						
						cd903112cc
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/inventree/InvenTree
						
						
						
						
						
						
						
						# Conflicts:
#	InvenTree/customer/templates/customer/order_index.html 
						
						
					 | 
					
						2018-04-18 00:39:15 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Newlands
							
						 
					 | 
					
						
						
							
						
						5bb08053e0
					 | 
					
						
						
							
							Added table of orders and details for each order showing table of lines
						
						
						
						
						
						
					 | 
					
						2018-04-18 00:38:06 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						5769befb04
					 | 
					
						
						
							
							Add model for supplier order (PO)
						
						
						
						
						
						
						
						- Added create page
- Added detail page 
						
						
					 | 
					
						2018-04-18 00:22:25 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						192f823b1a
					 | 
					
						
						
							
							PEP fixes (not all yet)
						
						
						
						
						
						
					 | 
					
						2018-04-18 00:03:42 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						3f33a921ae
					 | 
					
						
						
							
							Renamed URLs for /customer/
						
						
						
						
						
						
					 | 
					
						2018-04-17 23:56:25 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						8b1dbd4500
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2018-04-17 23:42:30 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						34d240c6e8
					 | 
					
						
						
							
							Moved top-level templates to a top-level dir
						
						
						
						
						
						
						
						It just seems fitting is all 
						
						
					 | 
					
						2018-04-17 23:42:25 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						8856d7f793
					 | 
					
						
						
							
							Renamed 'customer-order' app to 'customer'
						
						
						
						
						
						
						
						- This app should manage more than just orders
- Moved the 'Customer' model into this app 
						
						
					 | 
					
						2018-04-17 23:39:53 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Newlands
							
						 
					 | 
					
						
						
							
						
						6535126069
					 | 
					
						
						
							
							Fixed weird line break in string
						
						
						
						
						
						
					 | 
					
						2018-04-17 23:32:50 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Newlands
							
						 
					 | 
					
						
						
							
						
						e8f9b31f44
					 | 
					
						
						
							
							Merge branch 'customer_orders'
						
						
						
						
						
						
					 | 
					
						2018-04-17 23:28:34 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Newlands
							
						 
					 | 
					
						
						
							
						
						65ed493283
					 | 
					
						
						
							
							Admin readability
						
						
						
						
						
						
					 | 
					
						2018-04-17 23:27:06 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						53d7fd2c46
					 | 
					
						
						
							
							Removed Customer model from supplier app
						
						
						
						
						
						
					 | 
					
						2018-04-17 23:25:14 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						05cb2fe167
					 | 
					
						
						
							
							Moved "Customer" to CustomerOrders models
						
						
						
						
						
						
					 | 
					
						2018-04-17 23:24:19 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						b547f6b309
					 | 
					
						
						
							
							CustomerOrderLine quantity must be positive
						
						
						
						
						
						
					 | 
					
						2018-04-17 23:20:54 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |