Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/trunk-res_bank_remove_footer-mdi into lp:openobject-server

  1. trunk-res_bank_remove_footer-mdi
  2. Merge into trunk
Proposed by DJ Patel (OpenERP)
Status: Merged
Merged at revision: 4314
Proposed branch: lp:~openerp-dev/openobject-server/trunk-res_bank_remove_footer-mdi
Merge into: lp:openobject-server
Diff against target: 48 lines (+1/-5)
2 files modified
openerp/addons/base/res/res_bank.py (+0/-2)
openerp/addons/base/res/res_bank_view.xml (+1/-3)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-res_bank_remove_footer-mdi
Reviewer Review Type Date Requested Status
Purnendu Singh (OpenERP) (community) Approve
Review via email: mp+118539@code.launchpad.net

Description of the change

Hello Sir,

Removed 'footer' from 'res.partner.bank' because 'rml_footer2' is now fully editable since revision 4198 and its related changes.

Thanks,
Divyesh

To post a comment you must log in.
lp:~openerp-dev/openobject-server/trunk-res_bank_remove_footer-mdi updated
4303. By DJ Patel (OpenERP)

[Merge] Merge with main server.

Revision history for this message
Purnendu Singh (OpenERP) (purnendu-singh) wrote :

Thanks for your contribution.

Purnendu Singh

review: Approve

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 2012-07-10 23:50:09 +0000
3+++ openerp/addons/base/res/res_bank.py 2012-08-08 04:32:20 +0000
4@@ -139,7 +139,6 @@
5 'state': fields.selection(_bank_type_get, 'Bank Account Type', required=True,
6 change_default=True),
7 'sequence': fields.integer('Sequence'),
8- 'footer': fields.boolean("Display on Reports", help="Display this bank account on the footer of printed documents like invoices and sales orders.")
9 }
10
11 _defaults = {
12@@ -212,7 +211,6 @@
13 if c.partner_id:
14 r = self.onchange_partner_id(cr, uid, ids, c.partner_id.id, context=context)
15 r['value']['partner_id'] = c.partner_id.id
16- r['value']['footer'] = 1
17 result = r
18 return result
19
20
21=== modified file 'openerp/addons/base/res/res_bank_view.xml'
22--- openerp/addons/base/res/res_bank_view.xml 2012-07-30 13:08:44 +0000
23+++ openerp/addons/base/res/res_bank_view.xml 2012-08-08 04:32:20 +0000
24@@ -97,7 +97,6 @@
25 <field name="state"/>
26 <field name="acc_number"/>
27 <field name="company_id" on_change="onchange_company_id(company_id)" invisible="context.get('company_hide', True)" widget="selection"/>
28- <field name="footer" attrs="{'invisible': [('company_id','=',False)]}"/>
29 </group>
30 <group>
31 <group name="owner" string="Bank Account Owner">
32@@ -134,7 +133,6 @@
33 <field name="acc_number"/>
34 <field name="bank_name"/>
35 <field name="company_id" invisible="context.get('company_hide', True)"/>
36- <field name="footer" invisible="context.get('company_hide', True)"/>
37 <field name="partner_id"/>
38 </tree>
39 </field>
40@@ -157,7 +155,7 @@
41 <field name="res_model">res.partner.bank</field>
42 <field name="view_type">form</field>
43 <field name="view_mode">tree,form</field>
44- <field name="help">Configure your company's bank accounts and select those that must appear on the report footer. You can reorder bank accounts from the list view. If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data.</field>
45+ <field name="help">Configure your company's bank accounts. You can reorder bank accounts from the list view. If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data.</field>
46 </record>
47 <menuitem action="action_res_partner_bank_account_form"
48 id="menu_action_res_partner_bank_form"