From e768bf46ab63dd52d61058379c876c00da079b17 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Thu, 13 Sep 2012 14:20:11 +0200 Subject: [PATCH] [IMP] res.company: rewrite onchange method to compute rml_footer bzr revid: rco@openerp.com-20120913122011-h9qsqizhmsibndf3 --- openerp/addons/base/res/res_company.py | 60 ++++++++------------ openerp/addons/base/res/res_company_view.xml | 27 ++++----- 2 files changed, 35 insertions(+), 52 deletions(-) diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py index 83b24b55a93..b27476b2c92 100644 --- a/openerp/addons/base/res/res_company.py +++ b/openerp/addons/base/res/res_company.py @@ -111,8 +111,8 @@ class res_company(osv.osv): 'rml_header1': fields.char('Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents (report header)."), 'rml_header2': fields.text('RML Internal Header', required=True), 'rml_header3': fields.text('RML Internal Header for Landscape Reports', required=True), - 'rml_footer': fields.text('Report Footer', help="Footer text displayed at the bottom of all reports. Automatically set based on company details, "\ - "but may also be customized by directly editing it."), + 'rml_footer': fields.text('Report Footer', help="Footer text displayed at the bottom of all reports."), + 'rml_footer_readonly': fields.related('rml_footer', type='text', string='Report Footer', readonly=True), 'custom_footer': fields.boolean('Custom Footer', help="Check this to define the report footer manually. Otherwise it will be filled in automatically."), 'logo': fields.related('partner_id', 'image', string="Logo", type="binary"), 'currency_id': fields.many2one('res.currency', 'Currency', required=True), @@ -138,36 +138,28 @@ class res_company(osv.osv): ('name_uniq', 'unique (name)', 'The company name must be unique !') ] - def onchange_footer(self, cr, uid, ids, context=None): - # when touched, the footer becomes custom - return {'value': {'custom_footer': True}} + def onchange_footer(self, cr, uid, ids, custom_footer, phone, fax, email, website, vat, company_registry, bank_ids, context=None): + if custom_footer: + return {} - def set_auto_footer(self, cr, uid, ids, context=None): - # unset the flag 'custom_footer'; this will automatically compute the footer - return self.write(cr, uid, ids, {'custom_footer': False}, context=context) - - def compute_footer(self, cr, uid, ids, context=None): + # first line (notice that missing elements are filtered out before the join) + res = ' | '.join(filter(bool, [ + phone and '%s: %s' % (_('Phone'), phone), + fax and '%s: %s' % (_('Fax'), fax), + email and '%s: %s' % (_('Email'), email), + website and '%s: %s' % (_('Website'), website), + vat and '%s: %s' % (_('TIN'), vat), + company_registry and '%s: %s' % (_('Reg'), company_registry), + ])) + # second line: bank accounts res_partner_bank = self.pool.get('res.partner.bank') - for company in self.browse(cr, uid, ids, context): - if not company.custom_footer: - # first line (notice that missing elements are filtered out before the join) - res = ' | '.join(filter(bool, [ - company.phone and '%s: %s' % (_('Phone'), company.phone), - company.fax and '%s: %s' % (_('Fax'), company.fax), - company.email and '%s: %s' % (_('Email'), company.email), - company.website and '%s: %s' % (_('Website'), company.website), - company.vat and '%s: %s' % (_('TIN'), company.vat), - company.company_registry and '%s: %s' % (_('Reg'), company.company_registry), - ])) - # second line: bank accounts - account_ids = [acc.id for acc in company.bank_ids if acc.footer] - account_names = res_partner_bank.name_get(cr, uid, account_ids, context=context) - if account_names: - title = _('Bank Accounts') if len(account_names) > 1 else _('Bank Account') - res += '\n%s: %s' % (title, ', '.join(name for id, name in account_names)) - # update footer - self.write(cr, uid, [company.id], {'rml_footer': res}, context=context) - return True + account_data = self.resolve_2many_commands(cr, uid, 'bank_ids', bank_ids, context=context) + account_names = res_partner_bank._prepare_name_get(cr, uid, account_data, context=context) + if account_names: + title = _('Bank Accounts') if len(account_names) > 1 else _('Bank Account') + res += '\n%s: %s' % (title, ', '.join(name for id, name in account_names)) + + return {'value': {'rml_footer': res, 'rml_footer_readonly': res}} def on_change_country(self, cr, uid, ids, country_id, context=None): currency_id = self._get_euro(cr, uid, context=context) @@ -248,17 +240,11 @@ class res_company(osv.osv): self.cache_restart(cr) company_id = super(res_company, self).create(cr, uid, vals, context=context) obj_partner.write(cr, uid, partner_id, {'company_id': company_id}, context=context) - self.compute_footer(cr, uid, [company_id], context=context) return company_id def write(self, cr, uid, ids, values, context=None): self.cache_restart(cr) - if isinstance(ids, (int, long)): - ids = [ids] - super(res_company, self).write(cr, uid, ids, values, context=context) - if 'rml_footer' not in values: - self.compute_footer(cr, uid, ids, context=context) - return True + return super(res_company, self).write(cr, uid, ids, values, context=context) def _get_euro(self, cr, uid, context=None): rate_obj = self.pool.get('res.currency.rate') diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml index b92cfba19b6..cac53b7a76a 100644 --- a/openerp/addons/base/res/res_company_view.xml +++ b/openerp/addons/base/res/res_company_view.xml @@ -55,29 +55,26 @@
- + - - - - - + + + + + - + - -