From 157f1db551d4cb11a12856e8ffacbb4adc5a714d Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 14 Dec 2012 10:10:57 +0100
Subject: [PATCH] [IMP] email_template: small simplification in email templates

bzr revid: rco@openerp.com-20121214091057-ztar9xgmxx56cvae
---
 addons/account/edi/invoice_action_data.xml         | 2 +-
 addons/portal_sale/portal_sale_data.xml            | 4 ++--
 addons/purchase/edi/purchase_order_action_data.xml | 2 +-
 addons/sale/edi/sale_order_action_data.xml         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml
index 36bb31b1db3..93c32b1cdc5 100644
--- a/addons/account/edi/invoice_action_data.xml
+++ b/addons/account/edi/invoice_action_data.xml
@@ -33,7 +33,7 @@
             <field name="body_html"><![CDATA[
 <div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; ">
 
-    <p>Hello ${object.partner_id.name or ''},</p>
+    <p>Hello ${object.partner_id.name},</p>
 
     <p>A new invoice is available for you: </p>
     
diff --git a/addons/portal_sale/portal_sale_data.xml b/addons/portal_sale/portal_sale_data.xml
index 60f11a5f767..d2c8d656bcb 100644
--- a/addons/portal_sale/portal_sale_data.xml
+++ b/addons/portal_sale/portal_sale_data.xml
@@ -16,7 +16,7 @@
             <field name="body_html"><![CDATA[
 <div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); ">
 
-    <p>Hello ${object.partner_id.name or ''},</p>
+    <p>Hello ${object.partner_id.name},</p>
     
     <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}: </p>
 
@@ -118,7 +118,7 @@
             <field name="body_html"><![CDATA[
 <div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); ">
 
-    <p>Hello ${object.partner_id.name or ''},</p>
+    <p>Hello ${object.partner_id.name},</p>
 
     <p>A new invoice is available for you: </p>
     
diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
index 06a68aaab83..d616ff1d116 100644
--- a/addons/purchase/edi/purchase_order_action_data.xml
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -30,7 +30,7 @@
             <field name="body_html"><![CDATA[
 <div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; ">
 
-    <p>Hello$ ${object.partner_id.name or ''},</p>
+    <p>Hello$ ${object.partner_id.name},</p>
     
     <p>Here is a ${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order confirmation'} from ${object.company_id.name}: </p>
     
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index eebb63fb624..371233b96c7 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -32,7 +32,7 @@
             <field name="body_html"><![CDATA[
 <div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; ">
 
-    <p>Hello ${object.partner_id.name or ''},</p>
+    <p>Hello ${object.partner_id.name},</p>
     
     <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}: </p>