[REM] email.template: remove all text versions of demo/data templates
authorOlivier Dony <odo@openerp.com>
Tue, 4 Sep 2012 13:28:03 +0000 (15:28 +0200)
committerOlivier Dony <odo@openerp.com>
Tue, 4 Sep 2012 13:28:03 +0000 (15:28 +0200)
bzr revid: odo@openerp.com-20120904132803-9cgj4g10xtm121ko

addons/account/edi/invoice_action_data.xml
addons/auth_reset_password/auth_reset_password.xml
addons/event/email_template.xml
addons/marketing_campaign/marketing_campaign_demo.xml
addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
addons/purchase/edi/purchase_order_action_data.xml
addons/sale/edi/sale_order_action_data.xml

index 9aa1a4b..53fa03a 100644 (file)
     </div>
 </div>
             ]]></field>
-            <field name="body"><![CDATA[
-Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
-
-A new invoice is available for ${object.partner_id.name}:
-       | Invoice number: *${object.number}*
-       | Invoice total: *${object.amount_total} ${object.currency_id.name}*
-       | Invoice date: ${object.date_invoice}
-       % if object.origin:
-       | Order reference: ${object.origin}
-       % endif
-       | Your contact: ${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''}
-
-You can view the invoice document, download it and pay online using the following link:
-    ${ctx.get('edi_web_url_view') or 'n/a'}
-
-% if object.company_id.paypal_account and object.type in ('out_invoice', 'in_refund'):
-<% 
-comp_name = quote(object.company_id.name)
-inv_number = quote(object.number)
-paypal_account = quote(object.company_id.paypal_account)
-inv_amount = quote(str(object.amount_total))
-cur_name = quote(object.currency_id.name)
-paypal_url = "https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s"\
-             "&invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Invoice_PayNow_%s" % \
-             (paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)
-%>
-It is also possible to directly pay with Paypal:
-    ${paypal_url}
-% endif
-
-If you have any question, do not hesitate to contact us.
-
-
-Thank you for choosing ${object.company_id.name}!
-
-
---
-${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''}
-${object.company_id.name}
-% if object.company_id.street:
-${object.company_id.street or ''}
-% endif
-% if object.company_id.street2:
-${object.company_id.street2}
-% endif
-% if object.company_id.city or object.company_id.zip:
-${object.company_id.zip or ''} ${object.company_id.city or ''}
-% endif
-% if object.company_id.country_id:
-${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
-% endif
-% if object.company_id.phone:
-Phone: ${object.company_id.phone}
-% endif
-% if object.company_id.website:
-${object.company_id.website or ''}
-% endif
-            ]]></field>
         </record>
     </data>
 </openerp>
index d2256a8..b7d7e0b 100644 (file)
@@ -9,16 +9,13 @@
             <field name="email_from"><![CDATA[${object.company_id.name} <${object.company_id.email}>]]></field>
             <field name="email_to" eval="False"><!--(set by reset_password module)--></field>
             <field name="subject">Password reset</field>
-            <field name="body"><![CDATA[
-A password reset was requested the OpenERP account linked to this email on ${object._auth_reset_password_host()}
+            <field name="body_html"><![CDATA[
+<p>A password reset was requested the OpenERP account linked to this email on ${object._auth_reset_password_host()}</p>
 
-You may change your password following this link:
+<p>You may change your password following this <a href="${object._auth_reset_password_link()}">link</a>,
+or by copy-pasting the following URL in your browser: ${object._auth_reset_password_link()}</p>
 
-${object._auth_reset_password_link()}
-
-If you don't have asked for password reset, you can safely ignore this email.
-
-]]></field>
+<p>Note: If you did not ask for a password reset, you can safely ignore this email.</p>]]></field>
         </record>
 
         <!-- TODO get own css -->
index 4973818..95ffbf4 100644 (file)
@@ -7,15 +7,12 @@
         <field name="email_from" >${object.user_id.email or object.company_id.email or 'noreply@' + object.company_id.name + '.com'}</field>
         <field name="email_to" >${object.email}</field>
         <field name="subject">Your registration at ${object.event_id.name}</field>
-        <field name="body">
-        hello ${object.name},
-
-        The event ${object.event_id.name} that you registered for is confirmed and will be held from ${object.event_id.date_begin} to ${object.event_id.date_end}. For any further information please contact our event department.
-
-        we thank you for your participation
-
-        best regards
-        </field>
+        <field name="body_html"><![CDATA[
+        <p>Hello ${object.name},</p>
+        <p>The event ${object.event_id.name} that you registered for is confirmed and will be held from ${object.event_id.date_begin} to ${object.event_id.date_end}.
+        For any further information please contact our event department.</p>
+        <p>Thank you for your participation!</p>
+        <p>Best regards</p>]]></field>
         </record>
 
     </data>
         <field name="email_from" >${object.user_id.email or object.company_id.email or 'noreply@' + object.company_id.name + '.com'}</field>
         <field name="email_to" >${object.email}</field>
         <field name="subject">Your registration at ${object.event_id.name}</field>
-        <field name="body">
-        hello ${object.name},
-
-        We confirm you that your registration to the event ${object.event_id.name} has been recorded. You will automatically receive an email providing you more practical information (such as the schedule, the plan...) as soon as the event will be confirmed to be held.
-
-        we thank you for your participation
-
-        best regards
-        </field>
+        <field name="body_html"><![CDATA[
+        <p>Hello ${object.name},</p>
+        <p>We confirm that your registration to the event ${object.event_id.name} has been recorded.
+        You will automatically receive an email providing you more practical information (such as the schedule, the agenda...) as soon as the event is confirmed.</p>
+        <p>Thank you for your participation!</p>
+        <p>Best regards</p>]]></field>
         </record>
 
         <!-- Default Values -->
index 0c2d7f3..92443fe 100644 (file)
@@ -3,29 +3,29 @@
     <data>
         <!-- Email tempalte -->
         <record id="email_template_1" model="email.template">
-            <field name="name">Template for New Partner</field>
+            <field name="name">welcome new partner</field>
             <field name="email_from">info@openerp.com</field>
-            <field name="subject">Welcome in OpenERP Partner Channel!</field>
+            <field name="subject">Welcome to the OpenERP Partner Channel!</field>
             <field name="email_to">${object.email or ''}</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="body">Hello, We are very happy to send Welcome message.</field>
+            <field name="body_html">Hello, you will receive your welcome pack via email shortly.</field>
         </record>
         <record id="email_template_2" model="email.template">
-            <field name="name">Template for Silver Partner</field>
+            <field name="name">congrats silver partner</field>
             <field name="email_from">info@openerp.com</field>
-            <field name="subject">Congratulation! You become now our Silver Partner.</field>
+            <field name="subject">Congratulations! You are now a Silver Partner!</field>
             <field name="email_to">${object.email or ''}</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="body">Hello, We are happy to announce that you now become our Silver Partner.</field>
+            <field name="body_html">Hi, we are delighted to welcome you among our Silver Partners as of today!</field>
         </record>
 
         <record id="email_template_3" model="email.template">
-            <field name="name">Template for Gold Partner</field>
+            <field name="name">congrats gold partner</field>
             <field name="email_from">info@openerp.com</field>
-            <field name="subject">Congratulation! You become our Gold Partner.</field>
+            <field name="subject">Congratulations! You are now one of our Gold Partners!</field>
             <field name="email_to">${object.email or ''}</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="body">Hello, We are happy to announce that you become our Gold Partner.</field>
+            <field name="body_html">Hi, we are delighted to let you know that you have entered the select circle of our Gold Partners</field>
         </record>
 
 
index 6545dd9..141981a 100644 (file)
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body">Hello,Thanks for generous interest you have shown in the openERP.Regards,OpenERP Team,</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>Thanks for the genuine interest you have shown in OpenERP.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
             <field name="name">For OpenERP OnDemand Free Trial 2010</field>
         </record>
         <record id="email_template_2" model="email.template">
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body">Hello,We have very good offer that might suit you.
-            We propose you to subscribe to the OpenERP Discovery Day on May 2010.
-            If any further information required kindly revert back.
-            We really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>We have very good offer that might suit you.
+            We suggest you subscribe to the OpenERP Discovery Day on May 2010.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
             <field name="name">For OpenERP Discovery Day on May 2010</field>
         </record>
 
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body">Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day.
-             If any further information required kindly revert back.
-             I really appreciate your co-operation on this.
-             Regards,OpenERP Team,</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>Thanks for showing interest and for subscribing to the OpenERP Discovery Day.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
             <field name="name">For OpenERP Discovery Day</field>
         </record>
 
            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
              <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body">Hello,Thanks for showing intrest and buying the OpenERP book.
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>Thanks for showing interest and buying the OpenERP book.</p>
             If any further information required kindly revert back.
-            I really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
+            <p>Regards,OpenERP Team,</p>]]></field>
             <field name="name">For OpenERP book</field>
         </record>
 
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field eval="0" name="user_signature"/>
-            <field name="body">Hello, We have very good offer that might suit you.
-            For our gold partners,We are arranging free technical training on june,2010.
-            If any further information required kindly revert back.
-            I really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
-            <field name="name">For technical training to Gold partners</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>We have very good offer that might suit you.
+            For our gold partners,We are arranging free technical training on june,2010.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="name">technical training to gold partners</field>
         </record>
 
           <record id="email_template_6" model="email.template">
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body">Hello, We have very good offer that might suit you.
-            For our silver partners,We are  paid technical training on june,2010.
-            If any further information required kindly revert back.
-            I really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
-            <field name="name">For training to Silver partners</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>We have very good offer that might suit you.
+            For our silver partners,We are  paid technical training on june,2010.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="name">training to silver partners</field>
         </record>
 
         <record id="email_template_7" model="email.template">
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body">Hello, We have very good offer that might suit you.
-            For our silver partners,We are  offering Gold partnership.
-            If any further information required kindly revert back.
-            I really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
-            <field name="name">For gold partnership to silver partners</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>We have very good offer that might suit you.
+            For our silver partners, we are  offering Gold partnership.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="name">gold partnership to silver partners</field>
         </record>
 
         <record id="email_template_8" model="email.template">
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body">Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
-            <field name="name">For subscribing to technical training</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>Thanks for showing interest and for subscribing to technical training.</p>
+            If any further information required kindly revert back.I really appreciate your co-operation on this.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="name">subscribing to technical training</field>
         </record>
         <!-- Report -->
 
index 95e6add..daad446 100644 (file)
     </div>
 </div>
             ]]></field>
-            <field name="body"><![CDATA[
-Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
-
-Here is a ${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order confirmation'} from ${object.company_id.name}:
-       | Order number: *${object.name}*
-       | Order total: *${object.amount_total} ${object.pricelist_id.currency_id.name}*
-       | Order date: ${object.date_order}
-       % if object.origin:
-       | Order reference: ${object.origin}
-       % endif
-       % if object.partner_ref:
-       | Your reference: ${object.partner_ref}<br />
-       % endif
-       | Your contact: ${object.validator.name} ${object.validator.email and '<%s>'%(object.validator.email) or ''}
-
-You can view the ${object.state in ('draft', 'sent') and 'request for quotation' or 'order confirmation'} and download it using the following link:
-    ${ctx.get('edi_web_url_view') or 'n/a'}
-
-If you have any question, do not hesitate to contact us.
-
-Thank you!
-
-
---
-${object.validator.name} ${object.validator.email and '<%s>'%(object.validator.email) or ''}
-${object.company_id.name}
-% if object.company_id.street:
-${object.company_id.street or ''}
-% endif
-% if object.company_id.street2:
-${object.company_id.street2}
-% endif
-% if object.company_id.city or object.company_id.zip:
-${object.company_id.zip or ''} ${object.company_id.city or ''}
-% endif
-% if object.company_id.country_id:
-${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
-% endif
-% if object.company_id.phone:
-Phone: ${object.company_id.phone}
-% endif
-% if object.company_id.website:
-${object.company_id.website or ''}
-% endif
-            ]]></field>
         </record>
     </data>
 </openerp>
index 478f0b1..49ebe60 100644 (file)
     </div>
 </div>
             ]]></field>
-            <field name="body"><![CDATA[
-Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
-
-Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}:
-       | Order number: *${object.name}*
-       | Order total: *${object.amount_total} ${object.pricelist_id.currency_id.name}*
-       | Order date: ${object.date_order}
-       % if object.origin:
-       | Order reference: ${object.origin}
-       % endif
-       % if object.client_order_ref:
-       | Your reference: ${object.client_order_ref}<br />
-       % endif
-       | Your contact: ${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''}
-
-You can view the ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'}, download it and even pay online using the following link:
-    ${ctx.get('edi_web_url_view') or 'n/a'}
-
-% if object.order_policy in ('prepaid','manual') and object.company_id.paypal_account and object.state not in ('draft', 'sent'):
-<%
-comp_name = quote(object.company_id.name)
-order_name = quote(object.name)
-paypal_account = quote(object.company_id.paypal_account)
-order_amount = quote(str(object.amount_total))
-cur_name = quote(object.pricelist_id.currency_id.name)
-paypal_url = "https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amount=%s" \
-             "&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow_%s" % \
-             (paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_name)
-%>
-It is also possible to directly pay with Paypal:
-    ${paypal_url}
-% endif
-
-If you have any question, do not hesitate to contact us.
-
-
-Thank you for choosing ${object.company_id.name}!
-
-
---
-${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''}
-${object.company_id.name}
-% if object.company_id.street:
-${object.company_id.street or ''}
-% endif
-% if object.company_id.street2:
-${object.company_id.street2}
-% endif
-% if object.company_id.city or object.company_id.zip:
-${object.company_id.zip or ''} ${object.company_id.city or ''}
-% endif
-% if object.company_id.country_id:
-${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
-% endif
-% if object.company_id.phone:
-Phone: ${object.company_id.phone}
-% endif
-% if object.company_id.website:
-${object.company_id.website or ''}
-% endif
-            ]]></field>
         </record>
     </data>
 </openerp>