From b09784c5ff721a61cf22b2a1b9e4a24f68c39496 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Mon, 23 Jul 2012 18:05:54 +0200 Subject: [PATCH 1/6] [REF] base, res.partner.bank: removed footer boolean which was unused and deprecated: the rml_footer2 is now fully editable since revision 4198 (12th of June 2012) bzr revid: qdp-launchpad@openerp.com-20120723160554-3v4j4mvh2kbu1g4k --- openerp/addons/base/res/res_bank.py | 2 -- openerp/addons/base/res/res_bank_view.xml | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py index c5c05c1807c..07719962866 100644 --- a/openerp/addons/base/res/res_bank.py +++ b/openerp/addons/base/res/res_bank.py @@ -139,7 +139,6 @@ class res_partner_bank(osv.osv): 'state': fields.selection(_bank_type_get, 'Bank Account Type', required=True, change_default=True), 'sequence': fields.integer('Sequence'), - 'footer': fields.boolean("Display on Reports", help="Display this bank account on the footer of printed documents like invoices and sales orders.") } _defaults = { @@ -212,7 +211,6 @@ class res_partner_bank(osv.osv): if c.partner_id: r = self.onchange_partner_id(cr, uid, ids, c.partner_id.id, context=context) r['value']['partner_id'] = c.partner_id.id - r['value']['footer'] = 1 result = r return result diff --git a/openerp/addons/base/res/res_bank_view.xml b/openerp/addons/base/res/res_bank_view.xml index 13419f7a881..c50fcd44e7c 100644 --- a/openerp/addons/base/res/res_bank_view.xml +++ b/openerp/addons/base/res/res_bank_view.xml @@ -97,7 +97,6 @@ - @@ -134,7 +133,6 @@ - @@ -159,7 +157,7 @@ res.partner.bank form tree,form - 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. + 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. Date: Tue, 7 Aug 2012 16:32:57 +0530 Subject: [PATCH 2/6] [IMP] account, edi : Removed 'footer' boolean from 'res.partner.bank' because 'rml_footer2' is now fully editable since server revision 4198 and its related changes. bzr revid: mdi@tinyerp.com-20120807110257-sy98hpliumlhtwis --- addons/account/account_bank_view.xml | 3 --- addons/account/res_config.py | 3 --- addons/account/res_config_view.xml | 2 -- addons/account/test/account_customer_invoice.yml | 1 - addons/edi/models/res_company.py | 2 +- 5 files changed, 1 insertion(+), 10 deletions(-) diff --git a/addons/account/account_bank_view.xml b/addons/account/account_bank_view.xml index 4b3436c8a51..388a8e5a64b 100644 --- a/addons/account/account_bank_view.xml +++ b/addons/account/account_bank_view.xml @@ -45,9 +45,6 @@

Click to setup a new bank account. -

- Configure your company's bank account and select those that must - appear on the report footer.

If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data. diff --git a/addons/account/res_config.py b/addons/account/res_config.py index 658f87962ff..8e50493b063 100644 --- a/addons/account/res_config.py +++ b/addons/account/res_config.py @@ -43,8 +43,6 @@ class account_config_settings(osv.osv_memory): string='Default company currency', help="Main currency of the company."), 'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128, string='Paypal account', help="Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer will be able to pay your invoices or quotations with a button \"Pay with Paypal\" in automated emails or through the OpenERP portal."), - 'company_footer': fields.related('company_id', 'rml_footer2', type='char', size=250, readonly=True, - string='Bank accounts on reports will display as followed', help="Bank accounts as printed in the footer of each customer document. This is for information purpose only, you should configure these bank accounts through the above button \"Configure Bank Accounts\"."), 'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'), 'chart_template_id': fields.many2one('account.chart.template', 'Template', domain="[('visible','=', True)]"), @@ -154,7 +152,6 @@ class account_config_settings(osv.osv_memory): 'expects_chart_of_accounts': company.expects_chart_of_accounts, 'currency_id': company.currency_id.id, 'paypal_account': company.paypal_account, - 'company_footer': company.rml_footer2, 'has_chart_of_accounts': has_chart_of_accounts, 'has_fiscal_year': bool(fiscalyear_count), 'chart_template_id': False, diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml index d19a5dc5f98..100dd7fb22d 100644 --- a/addons/account/res_config_view.xml +++ b/addons/account/res_config_view.xml @@ -225,8 +225,6 @@ icon="gtk-go-forward" type="action" class="oe_inline oe_link"/> -