Merge lp:~savoirfairelinux-openerp/openupgrade-addons/account_journal_active into lp:openupgrade-addons

[Sandy Carter (http://www.savoirfairelinux.com)]

Backport of addition of active field which prevents errors when updating after openupgrade

https://github.com/odoo/odoo/commit/3468c2655b40925133e248c4f4fcd9104f27093b

The field was added to Odoo 7.0 and without this commit, the migration succeeds but subsequent updates when running odoo run into errors related to the missing active field.

This is a case of OpenUpgrade not being up to date with Odoo

[Pedro Manuel Baeza (pedro.baeza)]

LGTM

review: Approve (code review)

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

review: Approve

[Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)]

Might need to edit migration

review: Needs Fixing

[Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)]

I just tested and it fixes the issues

review: Needs Fixing

[Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)]

review: Abstain

[Sylvain LE GAL (GRAP) (sylvain-legal)]

Hi Sandy,

Not sure to understand. You add that because your database is based on OCB and not Odoo.
Right ?

review: Needs Information

[Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)]

Database is Odoo, not OCB.

The field was added to Odoo 7.0 and without this commit, the migration succeeds but subsequent updates when running odoo run into errors related to the missing active field.

This is a case of OpenUpgrade not being up to date with Odoo

[Sylvain LE GAL (GRAP) (sylvain-legal)]

All right.
Thanks for the explanation.

review: Approve

[Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)]

No worries. I probably should have written that in the description to begin with.

=== modified file 'account/account.py'
--- account/account.py	2013-04-23 12:57:31 +0000
+++ account/account.py	2014-09-10 14:48:23 +0000
@@ -725,7 +725,7 @@
         'entry_posted': fields.boolean('Skip \'Draft\' State for Manual Entries', help='Check this box if you don\'t want new journal entries to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation. \nNote that journal entries that are automatically created by the system are always skipping that state.'),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
         'allow_date':fields.boolean('Check Date in Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
-
+        'active': fields.boolean('Active', select=True),
         'profit_account_id' : fields.many2one('account.account', 'Profit Account'),
         'loss_account_id' : fields.many2one('account.account', 'Loss Account'),
         'internal_account_id' : fields.many2one('account.account', 'Internal Transfers Account', select=1),
@@ -737,6 +737,7 @@
         'with_last_closing_balance' : False,
         'user_id': lambda self, cr, uid, context: uid,
         'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+        'active': True,
     }
     _sql_constraints = [
         ('code_company_uniq', 'unique (code, company_id)', 'The code of the journal must be unique per company !'),

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2013-04-25 12:06:04 +0000
+++ account/account_view.xml	2014-09-10 14:48:23 +0000
@@ -407,6 +407,7 @@
                             <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             <field name="currency" groups="base.group_multi_currency"/>
                             <field name="company_id" groups="base.group_multi_company"/>
+                            <field name="active"/>
                         </group>
                     </group>
                     <notebook>