Merge lp:~camptocamp/ocb-addons/7.0-fix-bug-1180803 into lp:ocb-addons

[Nicolas Bessi - Camptocamp]

Fix bug 1180803 add active fields on account.journal

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

LGMT

review: Approve

=== modified file 'account/account.py'
--- account/account.py	2013-05-07 11:57:18 +0000
+++ account/account.py	2013-05-22 11:14:43 +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	2013-05-22 11:14:43 +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>