Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							75e50ee082 
							
						 
					 
					
						
						
							
							Fixes for subcontracting  
						
						
						
						
					 
					
						2014-05-11 12:11:15 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							966edff222 
							
						 
					 
					
						
						
							
							minor fix  
						
						
						
						
					 
					
						2014-05-09 10:54:12 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							344f4436f1 
							
						 
					 
					
						
						
							
							Create / update raw materials supplied table for sub-contracting  
						
						
						
						
					 
					
						2014-05-08 19:08:20 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							23649c6852 
							
						 
					 
					
						
						
							
							fixe in query.py  
						
						
						
						
					 
					
						2014-05-07 19:18:15 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							90f2d8d9fc 
							
						 
					 
					
						
						
							
							minor fix  
						
						
						
						
					 
					
						2014-05-07 14:55:09 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							69e0cb5d6f 
							
						 
					 
					
						
						
							
							Fixed POS and Sales Invoice paid amount display, when invoice not submitted.  Fixes   #1573  
						
						
						
						
					 
					
						2014-05-04 19:37:45 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							296d626e53 
							
						 
					 
					
						
						
							
							Back flush issue fixed in sub contracting  #1567  
						
						
						
						
					 
					
						2014-05-02 17:36:13 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							2cebf9b499 
							
						 
					 
					
						
						
							
							minor  fix   #1565  
						
						
						
						
					 
					
						2014-05-02 16:12:07 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							6b03914731 
							
						 
					 
					
						
						
							
							asynchronus issue in get_party_details  
						
						
						
						
					 
					
						2014-05-02 15:45:10 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							1e6c32e95f 
							
						 
					 
					
						
						
							
							Address and contact creation from opportunity  #1570  
						
						
						
						
					 
					
						2014-05-02 11:42:24 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							d341254786 
							
						 
					 
					
						
						
							
							Purchase receipt to purchase invoice item  
						
						
						
						
					 
					
						2014-05-01 17:42:21 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							5b98340d15 
							
						 
					 
					
						
						
							
							payment to invoice matching  
						
						
						
						
					 
					
						2014-05-01 15:43:22 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							613919325d 
							
						 
					 
					
						
						
							
							Fixes in link field queries  
						
						
						
						
					 
					
						2014-04-30 20:30:33 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							b054eb7a4f 
							
						 
					 
					
						
						
							
							Call calculate_taxes_and_totals after mapping  
						
						
						
						
					 
					
						2014-04-22 20:35:22 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							424c033395 
							
						 
					 
					
						
						
							
							Removed controller.py  
						
						
						
						
					 
					
						2014-04-21 15:06:56 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							ac32bad25a 
							
						 
					 
					
						
						
							
							Fixes in Taxes, Quotation and Address Territory  
						
						
						
						
					 
					
						2014-04-18 01:32:02 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							de1a97d506 
							
						 
					 
					
						
						
							
							Fixes get_voucher_detail for Stock Reconcilation  
						
						
						
						
					 
					
						2014-04-17 11:37:46 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							094610d7ce 
							
						 
					 
					
						
						
							
							Fixes in Production, Stock Entry and Stock Controller  
						
						
						
						
					 
					
						2014-04-16 20:23:24 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							eea802298e 
							
						 
					 
					
						
						
							
							refactor get_voucher_details in stock_controller  
						
						
						
						
					 
					
						2014-04-16 19:38:40 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							052fe82688 
							
						 
					 
					
						
						
							
							production order: test fixed and added  in test_stock_entry.py  
						
						
						
						
					 
					
						2014-04-16 19:20:11 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							c38fc713c6 
							
						 
					 
					
						
						
							
							updated translations  
						
						
						
						
					 
					
						2014-04-16 17:46:30 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							652bc0784a 
							
						 
					 
					
						
						
							
							Ported v3 fixes to v4  
						
						... 
						
						
						
						Commit range: webnotes/erpnext@e4b72df2f4bd7272c42e90f6faec3c27aa763b82..webnotes/erpnext@85441b0180f84246259d5a0ab4e3bcbf29355efe 
						
						
					 
					
						2014-04-16 15:26:42 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							a0c239db8d 
							
						 
					 
					
						
						
							
							perpetual inventory fix related to sub-contracting  
						
						... 
						
						
						
						Cherry-picked and modified by @anandpdoshi
Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	controllers/buying_controller.py
	controllers/stock_controller.py 
						
						
					 
					
						2014-04-16 15:23:10 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							82d8a637ac 
							
						 
					 
					
						
						
							
							#1252  
						
						
						
						
					 
					
						2014-04-16 09:20:00 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							8a40c136ce 
							
						 
					 
					
						
						
							
							more message fixing  
						
						
						
						
					 
					
						2014-04-15 16:31:20 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							9f0d625300 
							
						 
					 
					
						
						
							
							update translation strings  #1403  
						
						
						
						
					 
					
						2014-04-14 19:20:45 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							bd67e87921 
							
						 
					 
					
						
						
							
							Fixes saving of Sales Order and fetching Prices  frappe/frappe#478  
						
						
						
						
					 
					
						2014-04-11 16:51:27 +05:30 
						 
				 
			
				
					
						
							
							
								Pratik Vyas 
							
						 
					 
					
						
						
						
						
							
						
						
							f7daab7393 
							
						 
					 
					
						
						
							
							pass only valid columns to get_item_details  
						
						
						
						
					 
					
						2014-04-10 17:53:30 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							233fbb08b2 
							
						 
					 
					
						
						
							
							Minor fix  
						
						
						
						
					 
					
						2014-04-10 12:53:16 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							9fd50bcfb6 
							
						 
					 
					
						
						
							
							Fixed rest of the test cases  frappe/frapp#478  
						
						
						
						
					 
					
						2014-04-09 19:20:01 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							d29465029d 
							
						 
					 
					
						
						
							
							Fixed Test Cases  frappe/frappe#478  
						
						
						
						
					 
					
						2014-04-08 20:15:22 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							2ce39cf770 
							
						 
					 
					
						
						
							
							Fixed Stock Entry Test Cases  frappe/frappe#478  
						
						
						
						
					 
					
						2014-04-07 18:51:58 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							dc82d4f0cd 
							
						 
					 
					
						
						
							
							frappe/frappe#478  fixes  
						
						
						
						
					 
					
						2014-04-07 12:02:57 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							312ba99e71 
							
						 
					 
					
						
						
							
							frappe/frappe#478  fixes  
						
						
						
						
					 
					
						2014-04-04 11:06:10 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							365ae27acf 
							
						 
					 
					
						
						
							
							frappe/frappe#478  fixes  
						
						
						
						
					 
					
						2014-04-03 17:38:54 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							f14b809ab5 
							
						 
					 
					
						
						
							
							frappe/frappe#478 , more changes, removed bean  
						
						
						
						
					 
					
						2014-04-03 14:30:42 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							d36cb5c812 
							
						 
					 
					
						
						
							
							frappe/frappe#478  removed more instances of doclist  
						
						
						
						
					 
					
						2014-04-03 12:38:42 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							f191f854cd 
							
						 
					 
					
						
						
							
							frappe/frappe#478  erpnext install works  
						
						
						
						
					 
					
						2014-04-02 18:09:34 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							5b552b51f1 
							
						 
					 
					
						
						
							
							frappe/frappe#478  
						
						
						
						
					 
					
						2014-04-02 15:03:35 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							f2227d033c 
							
						 
					 
					
						
						
							
							frappe/frappe#478 , removed instances of .fields  
						
						
						
						
					 
					
						2014-03-31 23:37:40 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							0a0f2495a2 
							
						 
					 
					
						
						
							
							frappe/frappe#478 , frappe tests pass, .txt renamed to .json  
						
						
						
						
					 
					
						2014-03-31 17:27:06 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							b385ecf65e 
							
						 
					 
					
						
						
							
							frappe/frappe#478  
						
						
						
						
					 
					
						2014-03-28 16:54:45 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							81ba0b29da 
							
						 
					 
					
						
						
							
							frappe/frappe#478  
						
						
						
						
					 
					
						2014-03-28 15:23:26 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							f78d1aee28 
							
						 
					 
					
						
						
							
							Replaced doc, doc.fields  frappe/frappe#478  
						
						
						
						
					 
					
						2014-03-28 13:55:00 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							67d6a4e3aa 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'frappe/develop' into model-cleanup  
						
						... 
						
						
						
						Conflicts:
	erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/controllers/stock_controller.py 
						
						
					 
					
						2014-03-28 13:41:59 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							e88bc8b12a 
							
						 
					 
					
						
						
							
							frappe/frappe#478  
						
						
						
						
					 
					
						2014-03-27 17:51:41 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							becf75d791 
							
						 
					 
					
						
						
							
							Perpetual inventory cleanup  
						
						
						
						
					 
					
						2014-03-27 17:18:29 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							d2b34dc30c 
							
						 
					 
					
						
						
							
							frappe/frappe#478  
						
						
						
						
					 
					
						2014-03-27 16:12:56 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							66d52b55c0 
							
						 
					 
					
						
						
							
							#478  
						
						
						
						
					 
					
						2014-03-27 14:17:33 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							2c517e0a62 
							
						 
					 
					
						
						
							
							Fixes related to countrywise coa  
						
						
						
						
					 
					
						2014-03-25 18:28:49 +05:30