Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							c795386230 
							
						 
					 
					
						
						
							
							Fixed merge conflict  
						
						
						
						
					 
					
						2017-05-24 18:39:16 +05:30 
						 
				 
			
				
					
						
							
							
								Charles-Henri Decultot 
							
						 
					 
					
						
						
						
						
							
						
						
							032374e76e 
							
						 
					 
					
						
						
							
							Correction of the digest template ( #8992 )  
						
						
						
						
					 
					
						2017-05-24 16:29:42 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							7a9bd41a72 
							
						 
					 
					
						
						
							
							Improved currency exchange rate message  
						
						
						
						
					 
					
						2017-05-24 16:18:36 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							012c9a0916 
							
						 
					 
					
						
						
							
							Set default account in mode-of-payment Cash, only if default cash account exists ( #8909 )  
						
						
						
						
					 
					
						2017-05-19 12:30:58 +05:30 
						 
				 
			
				
					
						
							
							
								rohitwaghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							a689432a6e 
							
						 
					 
					
						
						
							
							[fix] Can't update naming series if format has year,month ( #8836 )  
						
						
						
						
					 
					
						2017-05-16 12:47:34 +05:30 
						 
				 
			
				
					
						
							
							
								Charles-Henri Decultot 
							
						 
					 
					
						
						
						
						
							
						
						
							156eef1907 
							
						 
					 
					
						
						
							
							Description correction ( #8811 )  
						
						
						
						
					 
					
						2017-05-16 08:34:33 +05:30 
						 
				 
			
				
					
						
							
							
								Makarand Bauskar 
							
						 
					 
					
						
						
						
						
							
						
						
							62414565b1 
							
						 
					 
					
						
						
							
							[minor] added the address_html field in company doctype ( #8754 )  
						
						
						
						
					 
					
						2017-05-10 14:52:03 +05:30 
						 
				 
			
				
					
						
							
							
								rohitwaghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							6324987c15 
							
						 
					 
					
						
						
							
							[fix] Company's abbreviation change will not update the warehouse ( #8685 )  
						
						
						
						
					 
					
						2017-05-04 16:12:29 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							fcc0246b38 
							
						 
					 
					
						
						
							
							Get mobile nos for customer contact ( #8674 )  
						
						
						
						
					 
					
						2017-05-04 12:11:48 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							1117125841 
							
						 
					 
					
						
						
							
							Update domainify.py  
						
						
						
						
					 
					
						2017-05-01 11:40:13 +05:30 
						 
				 
			
				
					
						
							
							
								mbauskar 
							
						 
					 
					
						
						
						
						
							
						
						
							e94c6e7b8e 
							
						 
					 
					
						
						
							
							[minor] disabled the instructor role if the company domain is not Education  
						
						
						
						
					 
					
						2017-05-01 11:40:13 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Waghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							ac28ffb41e 
							
						 
					 
					
						
						
							
							[fix] frappe.db.exists('Series', series) is not working because tabSeries table did not have column modified  
						
						
						
						
					 
					
						2017-04-28 14:34:11 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							9b20e07431 
							
						 
					 
					
						
						
							
							[fix] currency field precision  
						
						
						
						
					 
					
						2017-04-25 14:09:29 +05:30 
						 
				 
			
				
					
						
							
							
								mbauskar 
							
						 
					 
					
						
						
						
						
							
						
						
							9bac58cdc6 
							
						 
					 
					
						
						
							
							[fixes] fixes in setup wizard for education domain  
						
						
						
						
					 
					
						2017-04-21 11:38:28 +05:30 
						 
				 
			
				
					
						
							
							
								CH 
							
						 
					 
					
						
						
						
						
							
						
						
							d20ec25c92 
							
						 
					 
					
						
						
							
							Removal of double brackets to setup the chart of accounts in the setup wizard  
						
						
						
						
					 
					
						2017-04-13 18:59:06 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							2d132e32aa 
							
						 
					 
					
						
						
							
							Function name changed in company  
						
						
						
						
					 
					
						2017-04-03 17:26:32 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							cc8b2b2fdb 
							
						 
					 
					
						
						
							
							[fix] [refactor] demo for v8 and remove purchase common  
						
						
						
						
					 
					
						2017-03-31 17:36:48 +05:30 
						 
				 
			
				
					
						
							
							
								CH 
							
						 
					 
					
						
						
						
						
							
						
						
							99752e58ec 
							
						 
					 
					
						
						
							
							VAT rates update for France  
						
						
						
						
					 
					
						2017-03-30 12:45:08 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							56f650f342 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						
						
						
					 
					
						2017-03-15 11:28:07 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							f6dee248ee 
							
						 
					 
					
						
						
							
							Update company.json  
						
						
						
						
					 
					
						2017-03-14 17:10:01 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							6d4a52562b 
							
						 
					 
					
						
						
							
							[fix] posting date, time is always current unless explicitly set  
						
						
						
						
					 
					
						2017-03-14 17:06:51 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							fb4b8d926f 
							
						 
					 
					
						
						
							
							Company based on exising company fix  
						
						
						
						
					 
					
						2017-03-12 16:55:05 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							d0d22ff203 
							
						 
					 
					
						
						
							
							copy letter head from invoice to payment entry  
						
						
						
						
					 
					
						2017-03-12 16:55:05 +05:30 
						 
				 
			
				
					
						
							
							
								mbauskar 
							
						 
					 
					
						
						
						
						
							
						
						
							124cf14429 
							
						 
					 
					
						
						
							
							[minor] ignore lead addresses delete query if address against lead not found  
						
						
						
						
					 
					
						2017-03-11 16:02:20 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							83aa5ee3df 
							
						 
					 
					
						
						
							
							[messages] cleanup  
						
						
						
						
					 
					
						2017-03-10 12:47:29 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							868bb26e24 
							
						 
					 
					
						
						
							
							[sample] add help for sample tasks and make them into notifications  
						
						
						
						
					 
					
						2017-03-09 18:11:11 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Waghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							e7485150a1 
							
						 
					 
					
						
						
							
							added roles in the report  
						
						
						
						
					 
					
						2017-03-06 14:26:09 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Waghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							312498060f 
							
						 
					 
					
						
						
							
							changed doctype name userrole to has role  
						
						
						
						
					 
					
						2017-03-06 14:24:39 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							78a650062c 
							
						 
					 
					
						
						
							
							Update company.json  
						
						
						
						
					 
					
						2017-03-02 14:48:49 +05:30 
						 
				 
			
				
					
						
							
							
								Neil Trini Lasrado 
							
						 
					 
					
						
						
						
						
							
						
						
							c15b5db030 
							
						 
					 
					
						
						
							
							Added 'All Assessment Group' to fixtures  
						
						
						
						
					 
					
						2017-02-24 13:16:46 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							8bb69ff8bf 
							
						 
					 
					
						
						
							
							Fixed merge conflict  
						
						
						
						
					 
					
						2017-02-20 19:01:04 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							fd3ec066ce 
							
						 
					 
					
						
						
							
							Added fields in global search  
						
						
						
						
					 
					
						2017-02-20 13:38:31 +05:30 
						 
				 
			
				
					
						
							
							
								Kanchan Chauhan 
							
						 
					 
					
						
						
						
						
							
						
						
							1b204c8e4e 
							
						 
					 
					
						
						
							
							Accrual Payroll System  
						
						
						
						
					 
					
						2017-02-16 16:30:51 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							cf99dc0e77 
							
						 
					 
					
						
						
							
							[fix] for setup wizard tests and demo;  
						
						
						
						
					 
					
						2017-02-09 18:06:11 +05:30 
						 
				 
			
				
					
						
							
							
								rohitwaghchaure 
							
						 
					 
					
						
						
						
						
							
						
						
							ea092a7b24 
							
						 
					 
					
						
						
							
							[Enhancement] Booking of an employee's expense claim ( #7267 )  
						
						... 
						
						
						
						* [Enhancement] Auto book of an employee's expense claim
* test cases
* documentation
* fixes and changes
* removed payable from employee and added into the company
* Added party in account, patch to update party type for customer and supplier accounts
* added party type in erpnext, fix patch
* fixed travis 
						
						
					 
					
						2017-02-01 12:02:08 +05:30 
						 
				 
			
				
					
						
							
							
								mbauskar 
							
						 
					 
					
						
						
						
						
							
						
						
							16ce3623bc 
							
						 
					 
					
						
						
							
							[fixes] set lead to Null on delete company transaction & other minor fixes  
						
						
						
						
					 
					
						2017-01-30 10:45:28 +05:30 
						 
				 
			
				
					
						
							
							
								mbauskar 
							
						 
					 
					
						
						
						
						
							
						
						
							51b1d6de48 
							
						 
					 
					
						
						
							
							[minor] moved the address_and_contact utils to frappe  
						
						
						
						
					 
					
						2017-01-30 10:45:28 +05:30 
						 
				 
			
				
					
						
							
							
								mbauskar 
							
						 
					 
					
						
						
						
						
							
						
						
							7fa039f15c 
							
						 
					 
					
						
						
							
							[fixes] delete company transaction and other minor fixes  
						
						
						
						
					 
					
						2017-01-30 10:45:28 +05:30 
						 
				 
			
				
					
						
							
							
								mbauskar 
							
						 
					 
					
						
						
						
						
							
						
						
							83f4780f74 
							
						 
					 
					
						
						
							
							[Fixes] Address and Contact fixes  
						
						
						
						
					 
					
						2017-01-30 10:45:28 +05:30 
						 
				 
			
				
					
						
							
							
								mbauskar 
							
						 
					 
					
						
						
						
						
							
						
						
							cbc49e2989 
							
						 
					 
					
						
						
							
							[WIP] Address and Contact Fixes  
						
						
						
						
					 
					
						2017-01-30 10:45:28 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							fd82f4b0d4 
							
						 
					 
					
						
						
							
							[minor] fix for item_group.py  
						
						
						
						
					 
					
						2017-01-27 16:00:47 +05:30 
						 
				 
			
				
					
						
							
							
								Kanchan Chauhan 
							
						 
					 
					
						
						
						
						
							
						
						
							679cc23abb 
							
						 
					 
					
						
						
							
							[Fix] Naming series issue fix  
						
						
						
						
					 
					
						2017-01-23 17:20:55 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							397e508fc0 
							
						 
					 
					
						
						
							
							[fix] sales_partner.js,  fixes   #7553  
						
						
						
						
					 
					
						2017-01-21 16:58:57 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							6b3670848e 
							
						 
					 
					
						
						
							
							Merge pull request  #7477  from rmehta/custom-perms  
						
						... 
						
						
						
						[minor] fix for custom perms 
						
						
					 
					
						2017-01-18 17:03:58 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							8d39fd9790 
							
						 
					 
					
						
						
							
							[fix] address queries + tests  
						
						
						
						
					 
					
						2017-01-16 13:06:15 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							95439db53f 
							
						 
					 
					
						
						
							
							[fixes] address and contact  
						
						
						
						
					 
					
						2017-01-14 00:25:22 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							b92087cb2d 
							
						 
					 
					
						
						
							
							[cleanup] move contact, address to frappe  💥  
						
						
						
						
					 
					
						2017-01-13 18:54:47 +05:30 
						 
				 
			
				
					
						
							
							
								Rushabh Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							af077dc616 
							
						 
					 
					
						
						
							
							[minor] fix for custom perms  
						
						
						
						
					 
					
						2017-01-13 14:47:37 +05:30 
						 
				 
			
				
					
						
							
							
								Nabin Hait 
							
						 
					 
					
						
						
						
						
							
						
						
							6e9d2a3c1f 
							
						 
					 
					
						
						
							
							fixed conflict  
						
						
						
						
					 
					
						2017-01-09 17:21:34 +05:30 
						 
				 
			
				
					
						
							
							
								Saurabh 
							
						 
					 
					
						
						
						
						
							
						
						
							f65e8de5a5 
							
						 
					 
					
						
						
							
							[fix] if terms exists then only call render_template  
						
						
						
						
					 
					
						2017-01-07 08:18:10 +05:30