Merge branch 'master' of github.com:webnotes/erpnext into 1209

Conflicts:
	accounts/doctype/account/account.py
	erpnext/accounts/doctype/journal_voucher/journal_voucher.py
	patches/patch_list.py
	startup/event_handlers.py

patches/before_jan_2012/repost_account_bal.py

@@ -30,10 +30,7 @@ def execute():
 			fy_obj = get_obj('Fiscal Year', f[0])
 			fy_obj.doc.past_year = prev_fy
 			fy_obj.doc.company = c[0]
-			fy_obj.doc.save()
-
-			fy_obj = get_obj('Fiscal Year', f[0])
 			fy_obj.repost()
 			prev_fy = f[0]
-			sql("commit")
-			sql("start transaction")
+			webnotes.conn.commit()
+			webnotes.conn.begin()

patches/october_2012/update_permission.py

@@ -0,0 +1,39 @@
+# ERPNext - web based ERP (http://erpnext.com)
+# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+def execute():
+	import webnotes
+	webnotes.conn.sql("""
+		delete from `tabDocPerm`
+		where 
+			role in ('Sales User', 'Sales Manager', 'Sales Master Manager', 
+				'Purchase User', 'Purchase Manager', 'Purchase Master Manager')
+			and parent = 'Sales and Purchase Return Tool'
+	""")
+	
+	webnotes.conn.sql("""delete from `tabDocPerm` where ifnull(role, '') = ''""")
+	
+	if not webnotes.conn.sql("""select name from `tabDocPerm` where parent = 'Leave Application'
+			and role = 'Employee' and permlevel = 1"""):
+		from webnotes.model.code import get_obj
+		from webnotes.model.doc import addchild
+		leave_app = get_obj('DocType', 'Leave Application', with_children=1)
+		ch = addchild(leave_app.doc, 'permissions', 'DocPerm')
+		ch.role = 'Employee'
+		ch.permlevel = 1
+		ch.read = 1
+		ch.save()

patches/patch_list.py

@@ -607,4 +607,8 @@ patch_list = [
 		'patch_module': 'patches.september_2012',
 		'patch_file': 'profile_delete_permission',
 	},
+	{
+		'patch_module': 'patches.october_2012',
+		'patch_file': 'update_permission',
+	},
 ]