Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							e9bd77d674 
							
						 
					 
					
						
						
							
							[minor] fixes in welcome mails  
						
						
						
						
					 
					
						2015-04-20 13:00:56 +05:30 
						 
				 
			
				
					
						
							
							
								Neil Trini Lasrado 
							
						 
					 
					
						
						
						
						
							
						
						
							28b0cc4d0b 
							
						 
					 
					
						
						
							
							fixes in offer letter  
						
						
						
						
					 
					
						2015-04-08 12:28:21 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							e4e112a6bc 
							
						 
					 
					
						
						
							
							setup wizard - don't send welcome mail  
						
						
						
						
					 
					
						2015-04-07 11:03:58 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							c399709789 
							
						 
					 
					
						
						
							
							fixes to test cases  
						
						
						
						
					 
					
						2015-04-06 19:29:16 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							e4580447d0 
							
						 
					 
					
						
						
							
							[fix] on setup wizard language selection and load, set it as system default language  
						
						
						
						
					 
					
						2015-04-04 16:15:04 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							432c12ad93 
							
						 
					 
					
						
						
							
							[fix] email account patch fix and minor setup wizard fix  
						
						
						
						
					 
					
						2015-04-03 14:30:15 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							4c46687fb1 
							
						 
					 
					
						
						
							
							[incoming sales email] to opportunity  
						
						
						
						
					 
					
						2015-04-02 22:00:34 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							05e39992d0 
							
						 
					 
					
						
						
							
							[setup-wizard] don't catch duplicate  
						
						
						
						
					 
					
						2015-04-02 18:55:36 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							54448aabd6 
							
						 
					 
					
						
						
							
							Setup wizard fixes  
						
						
						
						
					 
					
						2015-04-02 15:39:44 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							bfa3a08576 
							
						 
					 
					
						
						
							
							fixed welcome emails  
						
						
						
						
					 
					
						2015-04-01 23:34:16 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							3aaab1a39e 
							
						 
					 
					
						
						
							
							setup wizard fixes  
						
						
						
						
					 
					
						2015-04-01 22:01:54 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							99d90e1f34 
							
						 
					 
					
						
						
							
							[setup] send welcome emails after setup  
						
						
						
						
					 
					
						2015-04-01 20:32:57 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							eb928b950f 
							
						 
					 
					
						
						
							
							[fix] journal entry 3 cols, default weekly digest  
						
						
						
						
					 
					
						2015-03-25 17:34:20 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							37eaa0cca3 
							
						 
					 
					
						
						
							
							Merge pull request  #3003  from neilLasrado/activity-type  
						
						... 
						
						
						
						time_log_for select field in TL changed to against_manufacturing (check) 
						
						
					 
					
						2015-03-24 18:03:25 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							308e6ea21e 
							
						 
					 
					
						
						
							
							[fixes] default_website and stock reco  
						
						
						
						
					 
					
						2015-03-24 17:35:16 +05:30 
						 
				 
			
				
					
						
							
							
								Neil Trini Lasrado 
							
						 
					 
					
						
						
						
						
							
						
						
							bccec29415 
							
						 
					 
					
						
						
							
							In Time Log  
						
						... 
						
						
						
						- time_log_for removed.
- against manufacturing check box introduced
- all logic depending time_log_for shifted to against_manufacturing
- activity type made non-mandatory
- fixes in operations select feild data population in Time log
In Activity Type
- Validations for activity type manufacturing removed.
- Patch for creating activity type manufacturing removed
- activity type manufacturing removed from install fixtures 
						
						
					 
					
						2015-03-24 16:53:54 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							2b2b639492 
							
						 
					 
					
						
						
							
							fixes  
						
						
						
						
					 
					
						2015-03-20 14:29:23 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							3353ad42bc 
							
						 
					 
					
						
						
							
							setup wizard bounce animation when working  
						
						
						
						
					 
					
						2015-03-17 12:45:44 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							7c9d003917 
							
						 
					 
					
						
						
							
							Test case cleanup and fixes  
						
						
						
						
					 
					
						2015-03-13 08:14:46 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							838ba02d34 
							
						 
					 
					
						
						
							
							setup wizard image fix  
						
						
						
						
					 
					
						2015-03-10 19:15:49 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							ecd2e0f386 
							
						 
					 
					
						
						
							
							Setup Wizard: catch duplicate entry error  
						
						
						
						
					 
					
						2015-03-09 15:42:52 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							fcda00f317 
							
						 
					 
					
						
						
							
							Activity spelling correction  
						
						
						
						
					 
					
						2015-03-03 15:48:33 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							885e074697 
							
						 
					 
					
						
						
							
							Changed company name from Web Notes to Frappe Technologies  
						
						
						
						
					 
					
						2015-03-03 14:56:43 +05:30 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							f9fc04ce8e 
							
						 
					 
					
						
						
							
							Website Listing  
						
						
						
						
					 
					
						2015-02-23 22:34:27 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							d54031f3b5 
							
						 
					 
					
						
						
							
							[tests] [projects] merged tasks and projects and added quick edit of tasks from projects  
						
						
						
						
					 
					
						2015-02-22 22:32:39 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							e8a37949cf 
							
						 
					 
					
						
						
							
							[issue fixes] + added fixtures for item attribute and operation  
						
						
						
						
					 
					
						2015-02-20 20:10:11 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							e55def23af 
							
						 
					 
					
						
						
							
							Merge pull request  #2745  from neilLasrado/time-log  
						
						... 
						
						
						
						activity type fixes 
						
						
					 
					
						2015-02-18 11:21:25 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							df9e80c87a 
							
						 
					 
					
						
						
							
							[refactor] stock entry, minor ux  
						
						
						
						
					 
					
						2015-02-17 19:56:04 +05:30 
						 
				 
			
				
					
						
							
							
								Neil Trini Lasrado 
							
						 
					 
					
						
						
						
						
							
						
						
							744aec8def 
							
						 
					 
					
						
						
							
							activity type fixs  
						
						
						
						
					 
					
						2015-02-17 16:12:32 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							a6c361c00e 
							
						 
					 
					
						
						
							
							Setup Wizard: Load number format based on currency  #2627 , login as first user on setup complete  
						
						
						
						
					 
					
						2015-02-17 15:56:31 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							c82331bc19 
							
						 
					 
					
						
						
							
							[design] Setup Wizard  
						
						
						
						
					 
					
						2015-02-12 20:02:17 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							6dfd430a2f 
							
						 
					 
					
						
						
							
							Moved flags like ignore_mandatory, ignore_validate etc to doc.flags  
						
						
						
						
					 
					
						2015-02-10 14:41:27 +05:30 
						 
				 
			
				
					
						
							
							
								Neil Trini Lasrado 
							
						 
					 
					
						
						
						
						
							
						
						
							11cd4f6c30 
							
						 
					 
					
						
						
							
							time log activity type made mandatory, new activity type manufacturing created  
						
						
						
						
					 
					
						2015-02-06 16:06:45 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							06fa46fafe 
							
						 
					 
					
						
						
							
							[fix] onshow > on_page_show  
						
						
						
						
					 
					
						2015-01-29 18:09:11 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							5bceebc6a1 
							
						 
					 
					
						
						
							
							[fix] fixes birthday reminders  #2021  
						
						
						
						
					 
					
						2015-01-23 15:22:30 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							81e972eac4 
							
						 
					 
					
						
						
							
							[cleanups]  
						
						
						
						
					 
					
						2015-01-19 17:34:54 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							5293aa7ca0 
							
						 
					 
					
						
						
							
							[ui] setup wizard  
						
						
						
						
					 
					
						2015-01-15 12:07:02 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							e8500ad4e6 
							
						 
					 
					
						
						
							
							Multiple fixes  
						
						
						
						
					 
					
						2015-01-10 16:05:17 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							9b955feff8 
							
						 
					 
					
						
						
							
							[design] POS - item grid and taxes  
						
						
						
						
					 
					
						2015-01-05 16:19:12 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							54361e8651 
							
						 
					 
					
						
						
							
							fixed conflict while merging develop into v5  
						
						
						
						
					 
					
						2014-12-31 13:24:36 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							e7d153624f 
							
						 
					 
					
						
						
							
							Table Field Renaming: code replace, JV and budget distribution renamed  
						
						
						
						
					 
					
						2014-12-25 16:01:55 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							ca2c297f72 
							
						 
					 
					
						
						
							
							[fix] In Setup Wizard, load languages from languages.txt  
						
						
						
						
					 
					
						2014-12-18 17:31:21 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							6d950d23a8 
							
						 
					 
					
						
						
							
							[merge]  
						
						
						
						
					 
					
						2014-11-28 12:08:51 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							1897360e4b 
							
						 
					 
					
						
						
							
							Set default language as English in setup wizard  
						
						
						
						
					 
					
						2014-11-24 15:25:13 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							707322adb9 
							
						 
					 
					
						
						
							
							Fixes for standard chart of accounts  
						
						
						
						
					 
					
						2014-11-14 18:13:33 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							f5b94143dc 
							
						 
					 
					
						
						
							
							Minor fixes  
						
						
						
						
					 
					
						2014-10-22 16:14:41 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							be1a8d82c5 
							
						 
					 
					
						
						
							
							[merge] develop  
						
						
						
						
					 
					
						2014-10-21 13:14:55 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							531077e504 
							
						 
					 
					
						
						
							
							Strip company in setup wizard  
						
						
						
						
					 
					
						2014-10-15 13:55:37 +05:30