| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 93b2f167f8 | [fixes] opportunity, task minor | 2015-02-23 14:43:16 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 65a2759432 | [minor] opportunity / item | 2015-02-21 17:35:50 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 813f0eda05 | [form] section labels | 2015-02-20 16:02:48 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 50dc4e90e3 | [cleanup] item grid views, removed desc etc | 2015-02-19 20:05:45 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | d60acb9f26 | [fixes] production, added qty transferred, fix gantt, fiscal year (set fiscal year, instead of validation | 2015-02-19 14:53:31 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 614e7ab757 | [cleanup] SMS, and added item filter in stock balance | 2015-02-18 19:51:48 +05:30 |  | 
			
				
					| 
							
							
								 Neil Trini Lasrado | c48f06c095 | Image field and view added to all selling doctypes | 2015-02-18 12:33:19 +05:30 |  | 
			
				
					| 
							
							
								 Neil Trini Lasrado | 66df3566a9 | html item desc removed from item master, item image added in oppurtunity | 2015-02-18 12:32:37 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 6f0a3ed8d4 | fixed conflict | 2015-02-17 11:12:04 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 60cfccbf77 | [new-module] crm | 2015-02-17 10:36:54 +05:30 |  |