From 5de520e4dad39b002ab6bbe18ecfc1d8bdd23e89 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 13 Sep 2012 12:06:28 +0200
Subject: [PATCH] [FIX] remove previous erroneous bugfix

bzr revid: abo@openerp.com-20120913100628-oojngjznaeu0txyb
---
 addons/account/account_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d11a6bc88bd..75359b4f207 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -112,7 +112,7 @@
 		                        <field name="fiscalyear_id" widget="selection"/>
 		                        <label for="date_start" string="Duration"/>
 		                        <div>
-		                            <field name="date_start" class="oe_inline" nolabel="1"/> - 
+		                            <field name="date_start" class="oe_inline" nolabel="1"/> -
 		                            <field name="date_stop" nolabel="1" class="oe_inline"/>
 		                        </div>
 		                    </group>
@@ -181,7 +181,7 @@
                 <form string="Account" version="7.0">
                     <label for="code" class="oe_edit_only" string="Account Code and Name"/>
                     <h1>
-                        <field name="code" class="oe_inline" placeholder="Account code" style="width: 6em"/> - 
+                        <field name="code" class="oe_inline" placeholder="Account code" style="width: 6em"/> -
                         <field name="name" class="oe_inline" placeholder="Account name"/>
                     </h1>
                     <group>
@@ -1082,7 +1082,7 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Journal Item" version="7.0">
-                    <sheet> 
+                    <sheet>
 	                    <group>
 	                        <group>
 		                        <field name="name"/>
@@ -1349,7 +1349,7 @@
                             <field name="date"/>
                             <field name="to_check"/>
                             <field name="amount" invisible="1"/>
-                        </group>	
+                        </group>
                     </group>
                     <notebook>
                         <page string="Journal Items">
@@ -1613,7 +1613,7 @@
                 <tree string="Journal Entry Model Line" editable="bottom">
                     <field name="sequence"/>
                     <field name="name"/>
-                    <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                    <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation'), ('company_id', '=', parent.company_id)]"/>
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="partner_id"/>
                     <field name="debit"/>
@@ -1632,7 +1632,7 @@
                     <group col="4">
                         <field colspan="4" name="name"/>
                         <field name="sequence"/>
-                        <field name="account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
+                        <field name="account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation'), ('company_id', '=', parent.company_id)]"/>
                         <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                         <field name="partner_id"/>
                         <field name="debit"/>