diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 609c67f70dc..a742c7ef84a 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -362,8 +362,8 @@ class account_move_line(osv.osv):
 		('credit_debit2', 'CHECK (credit+debit>=0)', 'Wrong credit or debit value in accounting entry !'),
 	]
 
-	def _auto_init(self, cr):
-		super(account_move_line, self)._auto_init(cr)
+	def _auto_init(self, cr, context={}):
+		super(account_move_line, self)._auto_init(cr, context)
 		cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'account_move_line_journal_id_period_id_index\'')
 		if not cr.fetchone():
 			cr.execute('CREATE INDEX account_move_line_journal_id_period_id_index ON account_move_line (journal_id, period_id)')
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index bc5947a8d66..429eebe8527 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1452,57 +1452,6 @@
 	# Admin config
 	-->
 
-	<menuitem name="Administration/Configuration/Account" sequence="2"/>
-
-	<record model="ir.actions.act_window" id="open_module_tree_accounting">
-		<field name="name">Chart of accounts</field>
-		<field name="res_model">ir.module.module</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('category_id','=','Account charts')]</field>
-	</record>
-
-	<menuitem name="Administration/Configuration/Account/Choose a Chart of Accounts" action="open_module_tree_accounting" sequence="1" id="menu_accounting_modules"/>
-
-	<record model="ir.actions.act_window" id="open_module_tree_tva">
-		<field name="name">VAT mode</field>
-		<field name="res_model">ir.module.module</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="domain">[('category_id','=','VAT')]</field>
-	</record>
-	<menuitem name="Administration/Configuration/Account/Choose Tax Mode" action="open_module_tree_tva" sequence="2" id="menu_tva_def"/>
-
-
-	<record model="ir.actions.wizard" id="account_wizard_upgrade">
-		<field name="name">Set chart of accounts</field>
-		<field name="wiz_name">module.upgrade</field>
-	</record>
-	<menuitem
-		name="Administration/Configuration/Account/Set Chart of Accounts and Tax Mode"
-		action="account_wizard_upgrade" sequence="3" type="wizard" id="menu_install_module"/>
-
-	<record model="ir.actions.act_window" id="open_module_plan_ctbl">
-		<field name="res_model">account.account</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-	</record>
-	<menuitem name="Administration/Configuration/Account/Modify the Chart of Accounts" action="open_module_plan_ctbl" sequence="4" id="menu_plan_ctbl"/>
-
-	<record model="ir.actions.act_window" id="open_module_fiscal">
-		<field name="res_model">account.fiscalyear</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-	</record>
-	<menuitem name="Administration/Configuration/Account/Set Fiscal Year" action="open_module_fiscal" sequence="5" id="menu_fiscal_def"/>
-
-	<record model="ir.actions.act_window" id="open_module_journal">
-		<field name="res_model">account.journal</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-	</record>
-	<menuitem name="Administration/Configuration/Account/Add Account Journal" action="open_module_journal" sequence="6" id="menu_journal_def"/>
-
 	<act_window name="Bank statements"
 		domain="[('journal_id', '=', active_id)]"
 		res_model="account.bank.statement"
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 9b41a6cba87..539a8ef2d2f 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -77,7 +77,6 @@ class res_partner(osv.osv):
 		'credit': fields.function(_credit_get, fnct_search=_credit_search, method=True, string='Total Receivable'),
 		'debit': fields.function(_debit_get, fnct_search=_debit_search, method=True, string='Total Payable'),
 		'debit_limit': fields.float('Payable Limit'),
-		'credit_limit': fields.float('Receivable Limit'),
 		'property_account_payable': fields.property(
 			'account.account',
 			type='many2one',
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index c8a24b8df2d..a6b1d706e0c 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -806,8 +806,8 @@ class stock_move(osv.osv):
 		'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
 	}
 
-	def _auto_init(self, cursor):
-		super(stock_move, self)._auto_init(cursor)
+	def _auto_init(self, cursor, context):
+		super(stock_move, self)._auto_init(cursor, context)
 		cursor.execute('SELECT indexname \
 				FROM pg_indexes \
 				WHERE indexname = \'stock_move_location_id_location_dest_id_product_id_state\'')