From d3f76065d69bd022dd9b34162b98d63c5c9a50c8 Mon Sep 17 00:00:00 2001 From: Joao Alfredo Gama Batista Date: Thu, 14 May 2015 23:05:05 -0400 Subject: [PATCH] [FIX] Reject use_logo_secondary parameter if there is no logo secondary --- .../ir_actions_report_xml.py | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/res_company_logo_secondary/ir_actions_report_xml.py b/res_company_logo_secondary/ir_actions_report_xml.py index 8a48fd70d..eb165fbd2 100644 --- a/res_company_logo_secondary/ir_actions_report_xml.py +++ b/res_company_logo_secondary/ir_actions_report_xml.py @@ -36,16 +36,23 @@ class IrActionsReportXml(orm.Model): def write(self, cr, uid, ids, vals, context=None): context = context or {} + company = self.pool['res.users'].browse( + cr, uid, uid, context=context).company_id + logo_name = company.has_logo_secondary and company.name_secondary or False + if 'use_secondary_logo' in vals: - assert len(ids) == 1, "you can only modify the report logo one at a time" - logo_name = self.pool['res.users'].browse( - cr, uid, uid, context=context).company_id.name_secondary - name = vals.get('name', False) or self.browse( - cr, uid, ids[0], context=context).name - if vals['use_secondary_logo']: - vals['name'] = ' '.join([name.strip(logo_name), logo_name]) + if logo_name: + assert len(ids) == 1, "you can only modify the report logo " \ + "one at a time" + name = vals.get('name', False) or self.browse( + cr, uid, ids[0], context=context).name + if vals['use_secondary_logo']: + vals['name'] = ' '.join([name.strip(logo_name), logo_name]) + else: + vals['name'] = name.strip(logo_name) + else: - vals['name'] = name.strip(logo_name) + vals.pop('use_secondary_logo') return super(IrActionsReportXml, self).write( cr, uid, ids, vals, context=context)