 Anand Doshi
		
	
	
		d35354cc06
		
	
	
	
	Merge remote-tracking branch 'frappe/develop' into v5.0
			Anand Doshi
		
	
	
		d35354cc06
		
	
	
	
	Merge remote-tracking branch 'frappe/develop' into v5.0
		
			
			Conflicts:
	erpnext/__version__.py
	erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
	erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
	erpnext/hooks.py
	erpnext/patches.txt
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	erpnext/stock/get_item_details.py
	erpnext/translations/ar.csv
	erpnext/translations/bs.csv
	erpnext/translations/ca.csv
	erpnext/translations/el.csv
	erpnext/translations/es.csv
	erpnext/translations/fr.csv
	erpnext/translations/hr.csv
	erpnext/translations/id.csv
	erpnext/translations/is.csv
	erpnext/translations/ja.csv
	erpnext/translations/nl.csv
	erpnext/translations/pl.csv
	erpnext/translations/pt-BR.csv
	erpnext/translations/ru.csv
	erpnext/translations/tr.csv
	erpnext/translations/zh-cn.csv
	erpnext/translations/zh-tw.csv
	setup.py
		
	
 
		2015-02-24 18:12:17 +05:30
	 
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2014-07-25 13:02:28 +05:30
		 
	
		
			
			
			
			
			
			2014-09-16 15:08:02 +05:30
		 
	
		
			
			
			
			
			
			2015-02-24 12:24:53 +05:30
		 
	
		
			
			
			
			
			
			2014-07-29 08:51:41 +05:30
		 
	
		
			
			
			
			
			
			2015-01-14 11:49:04 +05:30
		 
	
		
			
			
			
			
			
			2014-08-07 19:22:02 +05:30
		 
	
		
			
			
			
			
			
			2014-10-15 15:31:33 +05:30
		 
	
		
			
			
			
			
			
			2015-01-02 12:46:49 +05:30
		 
	
		
			
			
			
			
			
			2015-02-10 14:41:27 +05:30
		 
	
		
			
			
			
			
			
			2014-11-26 15:35:39 +05:30
		 
	
		
			
			
			
			
			
			2015-02-10 14:41:27 +05:30
		 
	
		
			
			
			
			
			
			2014-09-30 14:48:38 +05:30
		 
	
		
			
			
			
			
			
			2014-09-01 10:23:47 +05:30
		 
	
		
			
			
			
			
			
			2015-01-27 12:27:10 +05:30
		 
	
		
			
			
			
			
			
			2014-07-29 22:24:31 +05:30
		 
	
		
			
			
			
			
			
			2015-01-21 14:08:06 +05:30
		 
	
		
			
			
			
			
			
			2015-02-24 12:24:53 +05:30
		 
	
		
			
			
			
			
			
			2014-11-05 12:33:29 +05:30
		 
	
		
			
			
			
			
			
			2015-02-24 12:24:53 +05:30
		 
	
		
			
			
			
			
			
			2015-02-20 14:23:58 +05:30