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

Proposed by Nicolas Bessi - Camptocamp
Status: Needs review
Proposed branch: lp:~camptocamp/openobject-server/7.0-fix-1180803
Merge into: lp:openobject-server/7.0
Diff against target: 51 lines (+7/-3)
2 files modified
openerp/addons/base/res/res_bank.py (+5/-3)
openerp/addons/base/res/res_bank_view.xml (+2/-0)
To merge this branch: bzr merge lp:~camptocamp/openobject-server/7.0-fix-1180803
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+164903@code.launchpad.net

Description of the change

To post a comment you must log in.

Unmerged revisions

4983. By Nicolas Bessi - Camptocamp

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1# -*- coding: utf-8 -*-1# -*- coding: utf-8 -*-
2##############################################################################2##############################################################################
3# 3#
4# OpenERP, Open Source Management Solution4# OpenERP, Open Source Management Solution
5# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).5# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
6#6#
@@ -15,7 +15,7 @@
15# GNU Affero General Public License for more details.15# GNU Affero General Public License for more details.
16#16#
17# You should have received a copy of the GNU Affero General Public License17# You should have received a copy of the GNU Affero General Public License
18# along with this program. If not, see <http://www.gnu.org/licenses/>. 18# along with this program. If not, see <http://www.gnu.org/licenses/>.
19#19#
20##############################################################################20##############################################################################
2121
@@ -139,6 +139,7 @@
139 'state': fields.selection(_bank_type_get, 'Bank Account Type', required=True,139 'state': fields.selection(_bank_type_get, 'Bank Account Type', required=True,
140 change_default=True),140 change_default=True),
141 'sequence': fields.integer('Sequence'),141 'sequence': fields.integer('Sequence'),
142 'active': fields.boolean('Active', select=True),
142 'footer': fields.boolean("Display on Reports", help="Display this bank account on the footer of printed documents like invoices and sales orders.")143 'footer': fields.boolean("Display on Reports", help="Display this bank account on the footer of printed documents like invoices and sales orders.")
143 }144 }
144145
@@ -155,7 +156,8 @@
155 cursor, user, 'country_id', context=context),156 cursor, user, 'country_id', context=context),
156 'state_id': lambda obj, cursor, user, context: obj._default_value(157 'state_id': lambda obj, cursor, user, context: obj._default_value(
157 cursor, user, 'state_id', context=context),158 cursor, user, 'state_id', context=context),
158 'name': '/'159 'name': '/',
160 'active': True,
159 }161 }
160162
161 def fields_get(self, cr, uid, allfields=None, context=None):163 def fields_get(self, cr, uid, allfields=None, context=None):
162164
=== 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 @@
91 <group col="4">91 <group col="4">
92 <field name="state"/>92 <field name="state"/>
93 <field name="acc_number" placeholder="Account Number"/>93 <field name="acc_number" placeholder="Account Number"/>
94 <field name="active"/>
95 <newline/>
94 <field name="company_id" groups="base.group_multi_company" on_change="onchange_company_id(company_id)"96 <field name="company_id" groups="base.group_multi_company" on_change="onchange_company_id(company_id)"
95 invisible="context.get('company_hide', True)" widget="selection"/>97 invisible="context.get('company_hide', True)" widget="selection"/>
96 <field name="footer" invisible="context.get('footer_hide', True)"/>98 <field name="footer" invisible="context.get('footer_hide', True)"/>