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 on 2013-05-21

[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
1=== modified file 'openerp/addons/base/res/res_bank.py'
2--- openerp/addons/base/res/res_bank.py 2013-04-12 13:30:08 +0000
3+++ openerp/addons/base/res/res_bank.py 2013-05-21 14:24:32 +0000
4@@ -1,6 +1,6 @@
5 # -*- coding: utf-8 -*-
6 ##############################################################################
7-#
8+#
9 # OpenERP, Open Source Management Solution
10 # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
11 #
12@@ -15,7 +15,7 @@
13 # GNU Affero General Public License for more details.
14 #
15 # You should have received a copy of the GNU Affero General Public License
16-# along with this program. If not, see <http://www.gnu.org/licenses/>.
17+# along with this program. If not, see <http://www.gnu.org/licenses/>.
18 #
19 ##############################################################################
20
21@@ -139,6 +139,7 @@
22 'state': fields.selection(_bank_type_get, 'Bank Account Type', required=True,
23 change_default=True),
24 'sequence': fields.integer('Sequence'),
25+ 'active': fields.boolean('Active', select=True),
26 'footer': fields.boolean("Display on Reports", help="Display this bank account on the footer of printed documents like invoices and sales orders.")
27 }
28
29@@ -155,7 +156,8 @@
30 cursor, user, 'country_id', context=context),
31 'state_id': lambda obj, cursor, user, context: obj._default_value(
32 cursor, user, 'state_id', context=context),
33- 'name': '/'
34+ 'name': '/',
35+ 'active': True,
36 }
37
38 def fields_get(self, cr, uid, allfields=None, context=None):
39
40=== modified file 'openerp/addons/base/res/res_bank_view.xml'
41--- openerp/addons/base/res/res_bank_view.xml 2013-01-31 13:56:09 +0000
42+++ openerp/addons/base/res/res_bank_view.xml 2013-05-21 14:24:32 +0000
43@@ -91,6 +91,8 @@
44 <group col="4">
45 <field name="state"/>
46 <field name="acc_number" placeholder="Account Number"/>
47+ <field name="active"/>
48+ <newline/>
49 <field name="company_id" groups="base.group_multi_company" on_change="onchange_company_id(company_id)"
50 invisible="context.get('company_hide', True)" widget="selection"/>
51 <field name="footer" invisible="context.get('footer_hide', True)"/>