Nabin Hait 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d0249b0880 
							
						 
					 
					
						
						
							
							Employee advance ( #11875 )  
						
						... 
						
						
						
						* Employee Advances against Expense Claim
* added employee advance test cases and docs
* Default Employee Advance Account field in company
* Cleanup and fixes of employee advance 
						
						
					 
					
						2017-12-14 13:25:57 +05:30 
						 
				 
			
				
					
						
							
							
								Shreya Shah 
							
						 
					 
					
						
						
						
						
							
						
						
							88dbc26a98 
							
						 
					 
					
						
						
							
							replace process payroll ( #11873 )  
						
						
						
						
					 
					
						2017-12-07 18:24:42 +05:30 
						 
				 
			
				
					
						
							
							
								Doridel Cahanap 
							
						 
					 
					
						
						
						
						
							
						
						
							5a4d5bfaf2 
							
						 
					 
					
						
						
							
							Add Training Program DocType, Script, Path and Doc ( #11181 )  
						
						... 
						
						
						
						* Add Training Program Doctype, Script, Config and documentation
* Add Training Program to Training Event
* [Test Case] Training Event in a Training Program 
						
						
					 
					
						2017-10-20 11:31:15 +05:30 
						 
				 
			
				
					
						
							
							
								Kanchan Chauhan 
							
						 
					 
					
						
						
						
						
							
						
						
							639eebdae5 
							
						 
					 
					
						
						
							
							[Minor] Employee Loan Management moved up in  HR Page  
						
						
						
						
					 
					
						2017-02-28 18:01:07 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							7ec4b717ed 
							
						 
					 
					
						
						
							
							[feature] added team updates page  
						
						
						
						
					 
					
						2017-01-31 11:42:58 +05:30 
						 
				 
			
				
					
						
							
							
								KanchanChauhan 
							
						 
					 
					
						
						
						
						
							
						
						
							fbaa6197f9 
							
						 
					 
					
						
						
							
							Employee Loan Management ( #7126 )  
						
						... 
						
						
						
						* [WIP] Employee Loan Management
* EMI calculation
* Fixing PR 
						
						
					 
					
						2017-01-30 15:15:58 +05:30 
						 
				 
			
				
					
						
							
							
								Kanchan Chauhan 
							
						 
					 
					
						
						
						
						
							
						
						
							f80c2b9606 
							
						 
					 
					
						
						
							
							Fleet management moved to HR  
						
						
						
						
					 
					
						2017-01-16 14:38:24 +05:30 
						 
				 
			
				
					
						
							
							
								Kanchan Chauhan 
							
						 
					 
					
						
						
						
						
							
						
						
							2f3ae914a6 
							
						 
					 
					
						
						
							
							Changes to Salary Register  
						
						
						
						
					 
					
						2017-01-11 19:45:01 +05:30 
						 
				 
			
				
					
						
							
							
								Neil Trini Lasrado 
							
						 
					 
					
						
						
						
						
							
						
						
							984ee372e8 
							
						 
					 
					
						
						
							
							[new Feature] Added Training Module  
						
						
						
						
					 
					
						2016-12-13 15:42:12 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							2167ff589c 
							
						 
					 
					
						
						
							
							[minor] update font awesome icons  
						
						
						
						
					 
					
						2016-12-07 11:09:02 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							557e7f787b 
							
						 
					 
					
						
						
							
							[minor] UX fixes for Daily Work Summary  
						
						
						
						
					 
					
						2016-11-21 12:10:44 +05:30 
						 
				 
			
				
					
						
							
							
								Kanchan Chauhan 
							
						 
					 
					
						
						
						
						
							
						
						
							7ff0c4eef4 
							
						 
					 
					
						
						
							
							Employee Attendance report renamed to Employees working on a holiday  
						
						
						
						
					 
					
						2016-07-15 13:42:36 +05:30 
						 
				 
			
				
					
						
							
							
								Kanchan Chauhan 
							
						 
					 
					
						
						
						
						
							
						
						
							d963b76a4b 
							
						 
					 
					
						
						
							
							Salary component cleanup  
						
						
						
						
					 
					
						2016-07-06 12:04:38 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							8a065e0028 
							
						 
					 
					
						
						
							
							[rename] Bulk Email to Email Queue  
						
						
						
						
					 
					
						2016-06-22 12:58:39 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							d1e1c52171 
							
						 
					 
					
						
						
							
							[redesign] modules  
						
						
						
						
					 
					
						2016-03-08 18:07:20 +05:30 
						 
				 
			
				
					
						
							
							
								Valmik Jangla 
							
						 
					 
					
						
						
						
						
							
						
						
							07364f5ece 
							
						 
					 
					
						
						
							
							Feature - Employee Attendance Tool  
						
						
						
						
					 
					
						2016-01-29 16:57:54 +05:30 
						 
				 
			
				
					
						
							
							
								Valmik Jangla 
							
						 
					 
					
						
						
						
						
							
						
						
							1890c794d7 
							
						 
					 
					
						
						
							
							Added Employee Report Attendance Report  
						
						... 
						
						
						
						Made Holiday details mandatory 
						
						
					 
					
						2016-01-29 16:57:54 +05:30 
						 
				 
			
				
					
						
							
							
								Sambhaji Kolate 
							
						 
					 
					
						
						
						
						
							
						
						
							fd53991dfa 
							
						 
					 
					
						
						
							
							[minor] Update Help Video Links in Buying, CRM, Selling   #4233  
						
						
						
						
					 
					
						2015-10-27 17:01:27 +05:30 
						 
				 
			
				
					
						
							
							
								Neil Trini Lasrado 
							
						 
					 
					
						
						
						
						
							
						
						
							4089b3d376 
							
						 
					 
					
						
						
							
							Salary Slip renamed to Process Payroll  
						
						
						
						
					 
					
						2015-07-13 12:41:28 +05:30 
						 
				 
			
				
					
						
							
							
								Neil Trini Lasrado 
							
						 
					 
					
						
						
						
						
							
						
						
							d1c413a668 
							
						 
					 
					
						
						
							
							employee removed from HR setup  
						
						
						
						
					 
					
						2015-05-07 12:40:18 +05:30 
						 
				 
			
				
					
						
							
							
								Neil Trini Lasrado 
							
						 
					 
					
						
						
						
						
							
						
						
							e1d620b168 
							
						 
					 
					
						
						
							
							Offer Letter - New Doctype added and job_applicant naming changed  
						
						
						
						
					 
					
						2015-04-08 12:28:20 +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 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							5cdc8e560c 
							
						 
					 
					
						
						
							
							[mailbox] removed separate email settings for jobs, sales, support  
						
						
						
						
					 
					
						2014-09-16 15:12:18 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							7a4e739d6c 
							
						 
					 
					
						
						
							
							templating for hr  
						
						
						
						
					 
					
						2014-08-08 11:56:32 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							08ef467fc6 
							
						 
					 
					
						
						
							
							Fixed moduleview language issue  
						
						
						
						
					 
					
						2014-05-08 11:43:18 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							f29bcaf436 
							
						 
					 
					
						
						
							
							Added new fixtures ( Fixes   #1540 ). Removed Employee Grade from HR.  
						
						
						
						
					 
					
						2014-05-02 13:55:07 +05:30 
						 
				 
			
				
					
						
							
							
								Anand Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							f5794f1c07 
							
						 
					 
					
						
						
							
							Module Home Pages using Module View  
						
						
						
						
					 
					
						2014-03-03 15:06:34 +05:30