| 
							
							
								 Rushabh Mehta | 3966f1dc5d | added license files | 2012-02-23 12:35:32 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 35fabf76a6 | updated module pages | 2012-02-21 19:03:50 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | d025133b39 | added module pages and other css updates | 2012-02-21 17:26:50 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | e00e70841c | Merge branch 'stable' into latest Conflicts:
	erpnext/accounts/doctype/journal_voucher/journal_voucher.js
	erpnext/accounts/doctype/payable_voucher/payable_voucher.js
	index.html
	version.num | 2012-02-07 10:58:45 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | d008964fd6 | Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues | 2012-02-07 10:48:11 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | c5bf642c7d | version | 2012-01-23 16:18:34 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 5e57a39bb1 | Merge branch 'master' into stable | 2012-01-04 19:32:01 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | f80f20f480 | Changes in Notifications | 2012-01-04 19:31:32 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 6ac1d4bb44 | Merge branch 'stable' of github.com:webnotes/erpnext into stable Conflicts:
	erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt | 2012-01-03 11:45:11 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | a57732f71d | Removed custom field from doctype | 2011-12-20 18:48:19 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | c67e0d85d3 | Employemnt Type filter removed from salary manager | 2011-11-07 10:48:51 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | ae00547592 | appriasal copy fix | 2011-11-04 10:43:11 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 36fc1d06fb | appriasal copy fix | 2011-11-04 10:41:12 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 25190a903c | Report to get Employeewise Balance Leave | 2011-10-31 16:47:48 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | db3728955b | error fixed in leave calculation | 2011-10-11 17:11:24 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 685564f71d | Resolved conflict after merging with master | 2011-10-11 14:42:34 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | e8475f9b85 | Appraisal score allowed to be fraction | 2011-09-22 11:00:53 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | d984872be9 | checked sal struc docstatus in validation | 2011-09-16 14:47:19 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 73c4a4a154 | removed make_feed() function | 2011-09-16 11:24:54 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 53ba83158c | fixes to startup | 2011-09-15 15:06:23 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | 66ac2b018a | first cut for lazy loading framework | 2011-09-05 18:43:09 +05:30 |  |