| 
							
							
								 Nabin Hait | 7b596d8d88 | fixed conflict | 2013-04-29 14:37:38 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 345c8fbfa2 | [patch] rebuild sales browser | 2013-04-29 14:35:11 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 7bd7c8769e | [patch] [file data] files in update file data patch | 2013-04-29 14:22:04 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 123f59dc89 | [patches] [file data] fixes in file data patch | 2013-04-29 14:21:42 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | e5a36a287f | [patch] [file data] patch for custom fields with name file_list | 2013-04-29 14:12:27 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 457cd7d1f4 | [gl entry] [validation] company match validation should be done only for is_cancelled = No | 2013-04-29 13:01:44 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 4b6f83ef18 | Merge branch 'master' of github.com:webnotes/erpnext | 2013-04-29 12:52:10 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | ce3296fc87 | [rename tool] [fix] condition to validate that content exists in a row of the uploaded file | 2013-04-29 12:28:19 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 99883420e7 | [general ledger][fixes] for against_account value | 2013-04-29 12:17:05 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 7597330cb6 | Merge branch 'master' of github.com:webnotes/erpnext | 2013-04-29 11:46:42 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | e81b0e2d66 | [stock ageing][fixes] for serialized items | 2013-04-29 11:45:22 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 4cbeda1ec7 | [patch] [fix] commented out export_to_files call in p05_update_file_data patch | 2013-04-29 10:48:45 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | c9897ff533 | Merge branch 'edge' Conflicts:
	home/page/latest_updates/latest_updates.js | 2013-04-29 10:42:21 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 319e0f43da | [latest updates] added default cost center and update manager | 2013-04-29 08:53:12 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 6198c28fd3 | validation for stock and nonstock items in purchase cycle | 2013-04-26 17:29:05 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | d58d1b5a18 | validation for stock and nonstock items in purchase cycle | 2013-04-26 17:25:44 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 6124247765 | [bom] set fetched values at server side | 2013-04-26 16:29:06 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 04c1f94b4e | [DN][usability] copy cost center in each row | 2013-04-26 16:27:51 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 205f7ce620 | validation for stock and nonstock items in purchase cycle | 2013-04-26 13:35:06 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 794c098e55 | Merge branch 'master' of github.com:webnotes/erpnext | 2013-04-26 10:49:52 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | cdc9e2cd6f | [patch] [file data] reset permissions | 2013-04-25 11:06:17 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | b7193461bc | Merge branch 'master' into edge | 2013-04-25 10:57:19 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | d9ad2e0271 | [master database] [patched] updated patched master.sql.gz | 2013-04-25 10:31:36 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 1ae95518f1 | Merge branch 'master' into edge | 2013-04-24 18:54:11 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 181bcd015d | [bom] [fixes] fixes in bom | 2013-04-24 18:52:41 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 5c2cb74e7a | [script report] sales register migrated into new script report | 2013-04-24 15:46:09 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | ded4848a5e | Merge branch 'master' into edge | 2013-04-24 15:35:38 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | c95c973829 | Merge branch 'master' of github.com:webnotes/erpnext | 2013-04-24 15:33:39 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 77bb4cef39 | [naming series] [fixes] consider custom fields with fieldname naming_series | 2013-04-24 15:32:39 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 59a6cd6c44 | Merge branch 'master' of github.com:webnotes/erpnext | 2013-04-23 17:50:22 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 627a08b7db | [report] total added in daily time log summary report | 2013-04-23 17:49:24 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | deb31432dd | Merge branch 'master' into edge | 2013-04-23 17:08:34 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 10f09092aa | [backup manager] [fixes] show erroneous files in error email message | 2013-04-23 17:07:52 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | a63b9e7762 | Merge branch 'master' into edge | 2013-04-23 16:29:33 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | cb9c480967 | [report] total added in daily time log summary report | 2013-04-23 16:08:13 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | b2972dca98 | [script report] accounts payable migrated to new style | 2013-04-23 15:53:33 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 5494b181ac | Merge branch 'master' of github.com:webnotes/erpnext | 2013-04-23 15:37:13 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | ebd514442a | [script report] accounts payable migrated to new style | 2013-04-23 15:36:26 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 3e8c696de7 | Merge branch 'master' into edge | 2013-04-23 14:24:00 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | ed7cf1bced | [backup manager] [fixes] fixes in dropbox and google drive | 2013-04-23 14:23:03 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | a536eef393 | Merge branch 'master' into edge | 2013-04-23 13:10:55 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 94dab56a1f | Merge branch 'master' of github.com:webnotes/erpnext | 2013-04-23 13:08:00 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 76d7ec51fb | [backup manager] [fixes] fix in dropbox folder path | 2013-04-23 13:05:40 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 98025ac32c | Merge branch 'master' of github.com:webnotes/erpnext | 2013-04-23 12:54:54 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 0a480f4efd | fixes in item: organized code | 2013-04-23 12:54:07 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | dc0f2d2422 | Merge branch 'master' into edge Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt | 2013-04-23 12:42:18 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 890265928b | [backup manager] [error handling] on error, send complete traceback as email | 2013-04-23 12:30:38 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | 6f83e77010 | [leave application] [employee query] fixes | 2013-04-23 12:24:31 +05:30 |  | 
			
				
					| 
							
							
								 Nabin Hait | 81c6a3beef | stock uom mandatory for item | 2013-04-23 11:39:54 +05:30 |  | 
			
				
					| 
							
							
								 Anand Doshi | f2785c9e61 | Merge branch 'master' of github.com:webnotes/erpnext | 2013-04-22 18:59:48 +05:30 |  |