diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index ffefd2f4df1..cc03b66969a 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -77,7 +77,7 @@ account_analytic_line()
 class hr_analytic_timesheet(osv.osv):
 	_inherit = "hr.analytic.timesheet"
 	def on_change_account_id(self, cr, uid, ids, account_id):
-		res = super(hr_analytic_timesheet,self).on_change_account_id(cr, uid, ids, account_id)
+		res = {}
 		if not account_id:
 			return res
 		res.setdefault('value',{})
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index d185e7d19f1..c0d65c83cd1 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -31,6 +31,18 @@
 		</field>
 	</record>
 
+	<record model="ir.ui.view" id="hr_timesheet_line_form2">
+		<field name="name">hr.analytic.timesheet.form2</field>
+		<field name="model">hr.analytic.timesheet</field>
+		<field name="type">form</field>
+		<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form" />
+		<field name="arch" type="xml">
+			<field name="account_id" position="replace">
+				<field name="account_id"  domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" select="1" on_change="on_change_account_id(account_id)"/>
+			</field>
+		</field>
+	</record>
+
 	<record model="ir.ui.view" id="hr_timesheet_line_tree">
 		<field name="name">hr.analytic.timesheet.tree</field>
 		<field name="model">hr.analytic.timesheet</field>
@@ -43,6 +55,19 @@
 		</field>
 	</record>
 
+	<record model="ir.ui.view" id="hr_timesheet_line_tree2">
+		<field name="name">hr.analytic.timesheet.tree2</field>
+		<field name="model">hr.analytic.timesheet</field>
+		<field name="type">tree</field>
+		<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree" />
+		<field name="arch" type="xml">
+
+			<field name="account_id" position="replace">
+				<field name="account_id"  domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id)"/>
+			</field>
+		</field>
+	</record>
+
 	#
 	# Inherits for account analytic lines
 	#