Merge lp:~camptocamp/openobject-server/7.0-fix-1180803 into lp:openobject-server/7.0

[Nicolas Bessi - Camptocamp]

Fix bug 1180803

Unmerged revisions

4983. By Nicolas Bessi - Camptocamp on 2013-05-21

[FIX] missing active checkbox on res.partner.bank

=== modified file 'openerp/addons/base/res/res_bank.py'
--- openerp/addons/base/res/res_bank.py	2013-04-12 13:30:08 +0000
+++ openerp/addons/base/res/res_bank.py	2013-05-21 14:24:32 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -139,6 +139,7 @@
         'state': fields.selection(_bank_type_get, 'Bank Account Type', required=True,
             change_default=True),
         'sequence': fields.integer('Sequence'),
+        'active': fields.boolean('Active', select=True),
         'footer': fields.boolean("Display on Reports", help="Display this bank account on the footer of printed documents like invoices and sales orders.")
     }
 
@@ -155,7 +156,8 @@
             cursor, user, 'country_id', context=context),
         'state_id': lambda obj, cursor, user, context: obj._default_value(
             cursor, user, 'state_id', context=context),
-        'name': '/'
+        'name': '/',
+        'active': True,
     }
 
     def fields_get(self, cr, uid, allfields=None, context=None):

=== modified file 'openerp/addons/base/res/res_bank_view.xml'
--- openerp/addons/base/res/res_bank_view.xml	2013-01-31 13:56:09 +0000
+++ openerp/addons/base/res/res_bank_view.xml	2013-05-21 14:24:32 +0000
@@ -91,6 +91,8 @@
                     <group col="4">
                         <field name="state"/>
                         <field name="acc_number" placeholder="Account Number"/>
+                        <field name="active"/>
+                        <newline/>
                         <field name="company_id" groups="base.group_multi_company" on_change="onchange_company_id(company_id)"
                             invisible="context.get('company_hide', True)" widget="selection"/>
                         <field name="footer" invisible="context.get('footer_hide', True)"/>