From 70028097b9683696d9b26e5782df71b0414eeae3 Mon Sep 17 00:00:00 2001
From: "Ravish Murari (OpenERP)" <rmu@tinyerp.com>
Date: Mon, 16 Jul 2012 18:40:00 +0530
Subject: [PATCH 1/4] [FIX] recurring models for account not showing company

lp bug: https://launchpad.net/bugs/999315 fixed

bzr revid: rmu@tinyerp.com-20120716131000-tvwhhz4xcmwpubaj
---
 addons/account/account_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 80202d97d6c..9fd37ea94fe 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1547,7 +1547,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'), ('company_id', '=', parent.company_id)]"/>
+                    <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="partner_id"/>
                     <field name="debit"/>
@@ -1567,7 +1567,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'), ('company_id', '=', parent.company_id)]"/>
+                        <field name="account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
                         <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                         <field name="partner_id"/>
                         <field name="debit"/>

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 2/4] [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"/>

From 0986f13047ec51204de281ad3501606108f457ba Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 13 Sep 2012 14:23:12 +0200
Subject: [PATCH 3/4] [FIX] recurring line's model form view properly set a
 company id when a journal is selected and, therefore, correctly display
 available accounts

bzr revid: abo@openerp.com-20120913122312-v2zz8m4r8wcxovtx
---
 addons/account/account.py       | 14 ++++++++++++--
 addons/account/account_view.xml |  4 ++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index e5e29f178a3..35cc34fda82 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2338,6 +2338,16 @@ class account_model(osv.osv):
 
         return move_ids
 
+    def onchange_journal_id(self, cr, uid, ids, journal_id=None, context=None):
+        company_id = False
+
+        if journal_id:
+            company = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context).company_id
+            if company:
+                company_id = company.id
+
+        return {'value': {'company_id': company_id}}
+
 account_model()
 
 class account_model_line(osv.osv):
@@ -3013,9 +3023,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         'purchase_tax_rate': fields.float('Purchase Tax(%)'),
         'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sales and purchase rates or use the usual m2o fields. This last choice assumes that the set of tax defined for the chosen template is complete'),
     }
-    
+
     def onchange_company_id(self, cr, uid, ids, company_id, context=None):
-        currency_id = False        
+        currency_id = False
         if company_id:
             currency_id = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id.id
         return {'value': {'currency_id': currency_id}}
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 75359b4f207..d1b19910365 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1651,8 +1651,8 @@
                 <form string="Journal Entry Model" version="7.0">
                     <group col="4">
                         <field name="name"/>
-                        <field name="journal_id"/>
-                        <field name="company_id" widget='selection' groups="base.group_multi_company"/>
+                        <field name="journal_id" on_change="onchange_journal_id(journal_id)"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
 
                     <field name="lines_id" widget="one2many_list"/>

From 15b62537f56cacc797dc0ce41ceeb61de6569b2b Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 13 Sep 2012 14:52:28 +0200
Subject: [PATCH 4/4] [IMP] code cleaning

bzr revid: abo@openerp.com-20120913125228-mb17mk4m6dqbm5rt
---
 addons/account/account.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 35cc34fda82..d4e31167c43 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2338,13 +2338,13 @@ class account_model(osv.osv):
 
         return move_ids
 
-    def onchange_journal_id(self, cr, uid, ids, journal_id=None, context=None):
+    def onchange_journal_id(self, cr, uid, ids, journal_id, context=None):
         company_id = False
 
         if journal_id:
-            company = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context).company_id
-            if company:
-                company_id = company.id
+            journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
+            if journal.company_id.id:
+                company_id = journal.company_id.id
 
         return {'value': {'company_id': company_id}}