Merge lp:~therp-nl/therp-backports/addons-6.1-lp999315-fix_recurring_model_set_company into lp:therp-backports

[Stefan Rijnhart (Opener)]

[Stefan Rijnhart (Opener) (stefan-opener)]

Backport of OpenERP's fix in 7.0

=== modified file 'account/account.py'
--- account/account.py	2012-08-28 07:48:35 +0000
+++ account/account.py	2012-10-19 14:09:34 +0000
@@ -2319,6 +2319,14 @@
 
         return move_ids
 
+    def onchange_journal_id(self, cr, uid, ids, journal_id, context=None):
+        company_id = False
+        if journal_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}}
+
 account_model()
 
 class account_model_line(osv.osv):

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2012-05-28 06:02:51 +0000
+++ account/account_view.xml	2012-10-19 14:09:34 +0000
@@ -1703,7 +1703,7 @@
                     <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
                     <separator orientation="vertical"/>
                       <field name="name"/>
-                      <field name="journal_id" widget="selection"/>
+                      <field name="journal_id" on_change="onchange_journal_id(journal_id)"/>
                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <newline/>