diff --git a/addons/account/data/invoice_action_data.xml b/addons/account/data/invoice_action_data.xml index 69380567fef..73339ca4809 100644 --- a/addons/account/data/invoice_action_data.xml +++ b/addons/account/data/invoice_action_data.xml @@ -16,7 +16,7 @@ Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''} ${object.partner_id.lang} +

Hello ${object.partner_id.name},

A new invoice is available for you:

diff --git a/addons/calendar/calendar_data.xml b/addons/calendar/calendar_data.xml index 3526e338aa3..d0bfb57cd1e 100644 --- a/addons/calendar/calendar_data.xml +++ b/addons/calendar/calendar_data.xml @@ -113,14 +113,14 @@ % if object.event_id.location: -
+
Where
% endif % if object.event_id.location: -
+
: ${object.event_id.location} (View Map) @@ -132,14 +132,14 @@ % if object.event_id.description : -
+
What
% endif % if object.event_id.description : -
+
: ${object.event_id.description}
% endif @@ -149,21 +149,21 @@ % if not object.event_id.allday and object.event_id.duration: -
+
Duration
% endif % if not object.event_id.allday and object.event_id.duration: -
+
: ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
% endif - +
Attendees
@@ -238,14 +238,14 @@ % if object.event_id.location: -
+
Where
% endif % if object.event_id.location: -
+
: ${object.event_id.location} (View Map) @@ -257,14 +257,14 @@ % if object.event_id.description : -
+
What
% endif % if object.event_id.description : -
+
: ${object.event_id.description}
% endif @@ -274,21 +274,21 @@ % if not object.event_id.allday and object.event_id.duration: -
+
Duration
% endif % if not object.event_id.allday and object.event_id.duration: -
+
: ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
% endif - +
Attendees
@@ -362,14 +362,14 @@ % if object.event_id.location: -
+
Where
% endif % if object.event_id.location: -
+
: ${object.event_id.location} (View Map) @@ -381,14 +381,14 @@ % if object.event_id.description : -
+
What
% endif % if object.event_id.description : -
+
: ${object.event_id.description}
% endif @@ -398,21 +398,21 @@ % if not object.event_id.allday and object.event_id.duration: -
+
Duration
% endif % if not object.event_id.allday and object.event_id.duration: -
+
: ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
% endif - +
Attendees
diff --git a/addons/portal_sale/portal_sale_data.xml b/addons/portal_sale/portal_sale_data.xml index 97416fd3f15..6ee95291fda 100644 --- a/addons/portal_sale/portal_sale_data.xml +++ b/addons/portal_sale/portal_sale_data.xml @@ -16,7 +16,7 @@ ${object.partner_id.lang} +

Hello ${object.partner_id.name},

@@ -98,7 +98,7 @@ Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''} ${object.partner_id.lang} +

Hello ${object.partner_id.name},

diff --git a/addons/purchase/data/mail_template_data.xml b/addons/purchase/data/mail_template_data.xml index 52cad8083e3..34184bd0dc6 100644 --- a/addons/purchase/data/mail_template_data.xml +++ b/addons/purchase/data/mail_template_data.xml @@ -14,7 +14,7 @@ RFQ_${(object.name or '').replace('/','_')} ${object.partner_id.lang} +

Hello ${object.partner_id.name},

@@ -77,7 +77,7 @@ PO_${(object.name or '').replace('/','_')} ${object.partner_id.lang} +

Hello ${object.partner_id.name},

diff --git a/addons/sale/data/mail_template_data.xml b/addons/sale/data/mail_template_data.xml index 8eb14889c3d..694d676b965 100644 --- a/addons/sale/data/mail_template_data.xml +++ b/addons/sale/data/mail_template_data.xml @@ -14,7 +14,7 @@ ${(object.name or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''} ${object.partner_id.lang} +

Hello ${object.partner_id.name},

diff --git a/addons/website_quote/data/website_quotation_data.xml b/addons/website_quote/data/website_quotation_data.xml index 4de0cd21482..d559befc5ea 100644 --- a/addons/website_quote/data/website_quotation_data.xml +++ b/addons/website_quote/data/website_quotation_data.xml @@ -102,7 +102,7 @@ ${object.partner_id.lang} +

Hello ${object.partner_id.name},

diff --git a/openerp/addons/base/tests/test_mail.py b/openerp/addons/base/tests/test_mail.py index 8186674b964..b9bfa5f9a79 100644 --- a/openerp/addons/base/tests/test_mail.py +++ b/openerp/addons/base/tests/test_mail.py @@ -102,7 +102,7 @@ class TestSanitizer(unittest.TestCase): def test_edi_source(self): html = html_sanitize(test_mail_examples.EDI_LIKE_HTML_SOURCE) - self.assertIn('div style="font-family: \'Lucica Grande\', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF;', html, + self.assertIn('div style="font-family: \'Lucida Grande\', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF;', html, 'html_sanitize removed valid style attribute') self.assertIn('', html, 'html_sanitize removed valid style attribute') diff --git a/openerp/addons/base/tests/test_mail_examples.py b/openerp/addons/base/tests/test_mail_examples.py index 3342876bf73..a78a5f45fc6 100644 --- a/openerp/addons/base/tests/test_mail_examples.py +++ b/openerp/addons/base/tests/test_mail_examples.py @@ -19,7 +19,7 @@ test12

test link """ -EDI_LIKE_HTML_SOURCE = """
+EDI_LIKE_HTML_SOURCE = """

Hello ${object.partner_id.name},

A new invoice is available for you: