| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Anand Doshi | d57e793bf3 | [fix] Added unicode_literals if missing in py files | 2015-02-24 12:24:53 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 46e03eadca | [rename] Customer Issue -> Warranty Claim | 2015-02-17 10:45:50 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | bd9b62ff28 | [rename] Support Ticket -> Issue | 2014-11-28 11:46:10 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 5cdc8e560c | [mailbox] removed separate email settings for jobs, sales, support | 2014-09-16 15:12:18 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 08ef467fc6 | Fixed moduleview language issue | 2014-05-08 11:43:18 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | e30511d315 | Email Settings split into Outgoing Email Settings and Support Email Settings | 2014-03-03 20:32:20 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 6b12b07b33 | Fixes to Module Views | 2014-03-03 16:05:00 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | f5794f1c07 | Module Home Pages using Module View | 2014-03-03 15:06:34 +05:30 |  |