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 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							0c21e2afef 
							
						 
					 
					
						
						
							
							Is_pl_account and debit_or_credit field removed and added report_type field in account  
						
						
						
						
					 
					
						2014-03-21 11:35:59 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							49a6f0754e 
							
						 
					 
					
						
						
							
							Removed debit_or_credit field  
						
						
						
						
					 
					
						2014-03-21 11:22:38 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							4d713ac5ba 
							
						 
					 
					
						
						
							
							sql injection fixes  
						
						
						
						
					 
					
						2014-03-21 11:22:37 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							4b2692182a 
							
						 
					 
					
						
						
							
							Fixes after change in fields handling in Document  
						
						
						
						
					 
					
						2014-03-19 16:58:42 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							2e7ad8980c 
							
						 
					 
					
						
						
							
							fix for queries  
						
						
						
						
					 
					
						2014-03-06 12:28:47 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							4541875c81 
							
						 
					 
					
						
						
							
							removed searchfield condition from get_match_cond  frappe/erpnext#1457  
						
						
						
						
					 
					
						2014-03-06 11:19:46 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							e9baaa68e7 
							
						 
					 
					
						
						
							
							Changed frappe.conn to frappe.db  
						
						
						
						
					 
					
						2014-02-26 12:35:33 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							4362443b6e 
							
						 
					 
					
						
						
							
							Propagate ignore_permissions during mapping from quotation to sales order  
						
						
						
						
					 
					
						2014-02-25 15:42:32 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							2f8d4451f5 
							
						 
					 
					
						
						
							
							calculate outstanding amount in server side, only if docstatus is 0  
						
						
						
						
					 
					
						2014-02-20 14:59:37 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							9d1f077922 
							
						 
					 
					
						
						
							
							get lead details in quotation  
						
						
						
						
					 
					
						2014-02-19 17:43:24 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							793ba6bd37 
							
						 
					 
					
						
						
							
							-webnotes +frappe  💥  
						
						
						
						
					 
					
						2014-02-14 15:47:51 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							eba1bdbcca 
							
						 
					 
					
						
						
							
							minor fixes  
						
						
						
						
					 
					
						2014-02-12 16:04:17 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							139dc7b9b2 
							
						 
					 
					
						
						
							
							minor fixes  
						
						
						
						
					 
					
						2014-02-12 14:54:16 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							0aa71a5c41 
							
						 
					 
					
						
						
							
							minor fixes  
						
						
						
						
					 
					
						2014-02-12 14:54:15 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							1eb560130a 
							
						 
					 
					
						
						
							
							Rename fields: amount related fields  
						
						
						
						
					 
					
						2014-02-12 14:54:14 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							7979f7ed21 
							
						 
					 
					
						
						
							
							Field Rename: rate field mass replacement  
						
						
						
						
					 
					
						2014-02-12 14:54:14 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							a7f757a3f4 
							
						 
					 
					
						
						
							
							Rename fields: initial commit  
						
						
						
						
					 
					
						2014-02-12 14:54:13 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							436f526102 
							
						 
					 
					
						
						
							
							commonify get_item_details and rename fields to sync selling and purchase  
						
						
						
						
					 
					
						2014-02-12 14:54:12 +05:30