From 779b11adaa78984113c4a4c4a38d99dd95dd1aa3 Mon Sep 17 00:00:00 2001 From: statsvn <> Date: Thu, 27 Mar 2008 08:02:16 +0000 Subject: [PATCH] Removed bad files bzr revid: statsvn-4f94201a3be9445f81c873d55bcc22dda17d9e3f --- addons/crm/crm.py | 1 + addons/custom/corporate_rml_header.rml | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 4b2ca01741d..1f9fe4349f9 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -459,6 +459,7 @@ class crm_case(osv.osv): write['date_action_last'] = time.strftime('%Y-%m-%d %H:%M:%S') self.write(cr, uid, [case.id], write, context) caseobj = self.pool.get('crm.case') + print 'Ok', action.name, action.act_mail_to_partner, action.act_mail_to_user, action.act_mail_to_watchers, action.act_mail_to_email, action.id if action.act_remind_user: caseobj.remind_user(cr, uid, [case.id], context, attach=action.act_remind_attach) if action.act_remind_partner: diff --git a/addons/custom/corporate_rml_header.rml b/addons/custom/corporate_rml_header.rml index 08b178cbdb1..f72f066c91c 100644 --- a/addons/custom/corporate_rml_header.rml +++ b/addons/custom/corporate_rml_header.rml @@ -3,23 +3,25 @@ + - + + 1cm 27.7cm 20cm 27.7cm - [[ company.partner_id.name ]] [[ company.rml_header1 ]] - [[ company.partner_id.address and company.partner_id.address[0].street ]] - [[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]] - Phone: - [[ company.partner_id.address and company.partner_id.address[0].phone ]] - Mail: - [[ company.partner_id.address and company.partner_id.address[0].email ]] - 1cm 25.7cm 7cm 25.7cm + [[ company.partner_id.name ]] + [[ company.partner_id.address and company.partner_id.address[0].street ]] + [[ company.partner_id.address and company.partner_id.address[0].zip ]] [[ company.partner_id.address and company.partner_id.address[0].city ]] - [[ company.partner_id.address and company.partner_id.address[0].country_id and company.partner_id.address[0].country_id.name ]] + Phone: + [[ company.partner_id.address and company.partner_id.address[0].phone ]] + Mail: + [[ company.partner_id.address and company.partner_id.address[0].email ]] + 1cm 25.5cm 7cm 25.5cm