From 6e3bffdee47ec508eb8aabb668e3d12d4b7eef5c Mon Sep 17 00:00:00 2001
From: "Guewen Baconnier @ Camptocamp" <guewen.baconnier@camptocamp.com>
Date: Wed, 7 Nov 2012 13:58:18 +0100
Subject: [PATCH] [FIX] missing references of mail (lp:c2c-addons/6.1  rev
 89.1.57)

---
 account_credit_control/data.xml               | 22 ++++++++---------
 account_credit_control/line_view.xml          |  4 ++--
 account_credit_control/policy_view.xml        |  8 +++----
 .../report/credit_control_summary.html.mako   |  2 +-
 .../wizard/credit_control_communication.py    |  2 +-
 .../wizard/credit_control_emailer_view.xml    | 24 +++++++++----------
 6 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/account_credit_control/data.xml b/account_credit_control/data.xml
index 5b236a1aa..f465a703e 100644
--- a/account_credit_control/data.xml
+++ b/account_credit_control/data.xml
@@ -2,14 +2,14 @@
   <data noupdate="0">
     <!--Email template -->
     <record id="email_template_credit_control_base" model="email.template">
-      <field name="name">Credit Control Mail</field>
+      <field name="name">Credit Control Email</field>
       <field name="email_from">noreply@localhost</field>
       <field name="subject">Credit Control: (${object.current_policy_level.name or 'n/a' })</field>
-      <field name="email_to">${object.get_mail() or  ''}</field>
+      <field name="email_to">${object.get_email() or  ''}</field>
       <field name="model_id" ref="model_credit_control_communication"/>
       <field name="auto_delete" eval="True"/>
       <field name="body_html"><![CDATA[
-      <%page args="object, user=None, ctx=None, quote=None, format_exception=True, mode='mail'" />
+      <%page args="object, user=None, ctx=None, quote=None, format_exception=True, mode='email'" />
       %if mode != 'pdf':
       <!-- your css here -->
       <style type="text/css">
@@ -93,9 +93,9 @@
       <field name="level" eval="1"/>
       <field name="computation_mode">net_days</field>
       <field name="delay_days" eval="10"/>
-      <field name="mail_template_id" ref="email_template_credit_control_base"/>
+      <field name="email_template_id" ref="email_template_credit_control_base"/>
       <field name="policy_id" ref="credit_control_3_time"/>
-      <field name="channel">mail</field>
+      <field name="channel">email</field>
       <field name="custom_text">Dear Sir or Madam,
 
 Our records indicate that we have not received the payment of the
@@ -115,9 +115,9 @@ Best regards,
       <field name="level" eval="2"/>
       <field name="computation_mode">end_of_month</field>
       <field name="delay_days" eval="30"/>
-      <field name="mail_template_id" ref="email_template_credit_control_base"/>
+      <field name="email_template_id" ref="email_template_credit_control_base"/>
       <field name="policy_id" ref="credit_control_3_time"/>
-      <field name="channel">mail</field>
+      <field name="channel">email</field>
       <field name="custom_text">Dear Sir or Madam,
 
 Our records indicate that we have not yet received the payment of the
@@ -137,7 +137,7 @@ Best regards,
       <field name="level" eval="3"/>
       <field name="computation_mode">previous_date</field>
       <field name="delay_days" eval="10"/>
-      <field name="mail_template_id" ref="email_template_credit_control_base"/>
+      <field name="email_template_id" ref="email_template_credit_control_base"/>
       <field name="policy_id" ref="credit_control_3_time"/>
       <field name="channel">letter</field>
       <field name="custom_text">Dear Sir or Madam,
@@ -170,9 +170,9 @@ Best regards,
       <field name="level" eval="1"/>
       <field name="computation_mode">end_of_month</field>
       <field name="delay_days" eval="30"/>
-      <field name="mail_template_id" ref="email_template_credit_control_base"/>
+      <field name="email_template_id" ref="email_template_credit_control_base"/>
       <field name="policy_id" ref="credit_control_2_time"/>
-      <field name="channel">mail</field>
+      <field name="channel">email</field>
       <field name="custom_text">Dear Sir or Madam,
 
 Our records indicate that we have not received the payment of the
@@ -192,7 +192,7 @@ Best regards,
       <field name="level" eval="2"/>
       <field name="computation_mode">previous_date</field>
       <field name="delay_days" eval="60"/>
-      <field name="mail_template_id" ref="email_template_credit_control_base"/>
+      <field name="email_template_id" ref="email_template_credit_control_base"/>
       <field name="policy_id" ref="credit_control_2_time"/>
       <field name="channel">letter</field>
       <field name="custom_text">Dear Sir or Madam,
diff --git a/account_credit_control/line_view.xml b/account_credit_control/line_view.xml
index 4b38e2604..726790f78 100644
--- a/account_credit_control/line_view.xml
+++ b/account_credit_control/line_view.xml
@@ -44,7 +44,7 @@
                     help="New lines"/>
             <separator orientation="vertical"/>
             <filter icon="terp-gtk-stop" string="Error"
-                    domain="[('state', 'in', ('error', 'mail_error'))]"
+                    domain="[('state', 'in', ('error', 'email_error'))]"
                     help="New lines"/>
             <separator orientation="vertical"/>
 
@@ -97,7 +97,7 @@
       <field name="model">credit.control.line</field>
       <field name="type">tree</field>
       <field name="arch" type="xml">
-        <tree editable="bottom" string="Control Credit Lines" colors="green:state == 'sent';red:state in ('error', 'mail_error');">
+        <tree editable="bottom" string="Control Credit Lines" colors="green:state == 'sent';red:state in ('error', 'email_error');">
           <field name="date"/>
           <field name="date_due"/>
           <field name="level"/>
diff --git a/account_credit_control/policy_view.xml b/account_credit_control/policy_view.xml
index 4e85ba8b2..f4ae3f43a 100644
--- a/account_credit_control/policy_view.xml
+++ b/account_credit_control/policy_view.xml
@@ -19,7 +19,7 @@
                   <field name="channel"/>
                   <field name="delay_days"/>
                   <field name="computation_mode"/>
-                  <field name="mail_template_id"/>
+                  <field name="email_template_id"/>
                 </tree>
                 <form>
                   <field name="name"/>
@@ -31,7 +31,7 @@
                       <field name="computation_mode"/>
                     </page>
                     <page string="Mail and reporting">
-                      <field name="mail_template_id"/>
+                      <field name="email_template_id"/>
                       <field name="custom_text"/>
                     </page>
                   </notebook>
@@ -94,7 +94,7 @@
               <field name="computation_mode"/>
             </page>
             <page string="Mail and reporting">
-              <field name="mail_template_id"/>
+              <field name="email_template_id"/>
               <field name="custom_text"/>
             </page>
           </notebook>
@@ -113,7 +113,7 @@
           <field name="channel"/>
           <field name="delay_days"/>
           <field name="computation_mode"/>
-          <field name="mail_template_id"/>
+          <field name="email_template_id"/>
         </tree>
       </field>
     </record>
diff --git a/account_credit_control/report/credit_control_summary.html.mako b/account_credit_control/report/credit_control_summary.html.mako
index b006b994a..0e06111e8 100644
--- a/account_credit_control/report/credit_control_summary.html.mako
+++ b/account_credit_control/report/credit_control_summary.html.mako
@@ -11,7 +11,7 @@
         setLang(comm.partner_id.lang)
         current_uri = '%s_policy_template' % (comm.partner_id.lang)
         if not context.lookup.has_template(current_uri):
-          context.lookup.put_string(current_uri, comm.current_policy_level.mail_template_id.body_html)
+          context.lookup.put_string(current_uri, comm.current_policy_level.email_template_id.body_html)
       %>
       <!--
       move the inner part in the mail template once done and reactivate this
diff --git a/account_credit_control/wizard/credit_control_communication.py b/account_credit_control/wizard/credit_control_communication.py
index 7240dc5f2..8f4ac37b2 100644
--- a/account_credit_control/wizard/credit_control_communication.py
+++ b/account_credit_control/wizard/credit_control_communication.py
@@ -157,7 +157,7 @@ class CreditCommunication(TransientModel):
 
             cr_line_obj.write(
                     cr, uid, cl_ids,
-                    {'mail_message_id': mail_id,
+                    {'mail_message_id': email_id,
                      'state': state},
                     context=context)
 
diff --git a/account_credit_control/wizard/credit_control_emailer_view.xml b/account_credit_control/wizard/credit_control_emailer_view.xml
index 764dfe101..ba28fd139 100644
--- a/account_credit_control/wizard/credit_control_emailer_view.xml
+++ b/account_credit_control/wizard/credit_control_emailer_view.xml
@@ -1,40 +1,40 @@
 <openerp>
   <data>
 
-    <record id="credit_line_mailer_form" model="ir.ui.view">
-      <field name="name">credit.line.mailer.form</field>
-      <field name="model">credit.control.mailer</field>
+    <record id="credit_line_emailer_form" model="ir.ui.view">
+      <field name="name">credit.line.emailer.form</field>
+      <field name="model">credit.control.emailer</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form>
-          <separator string="Send e-mails for the selected lines" colspan="4"/>
+          <separator string="Send emails for the selected lines" colspan="4"/>
           <newline/>
           <field name="line_ids" colspan="4" nolabel="1" />
           <newline/>
           <group colspan="4">
             <button special="cancel" string="Cancel" icon='gtk-cancel'/>
-            <button name="mail_lines" string="Send the e-mails" type="object" icon="gtk-execute"/>
+            <button name="email_lines" string="Send the emails" type="object" icon="gtk-execute"/>
           </group>
         </form>
       </field>
     </record>
 
     <!-- for menu -->
-    <act_window name="Send By E-mail"
-        res_model="credit.control.mailer"
+    <act_window name="Send By Email"
+        res_model="credit.control.emailer"
         src_model="credit.control.line"
         view_mode="form"
         target="new"
         key2="client_action_multi"
-        id="open_credit_line_mailer_wizard_menu_action"/>
+        id="open_credit_line_emailer_wizard_menu_action"/>
 
     <!-- for button -->
-    <record id="open_credit_line_mailer_wizard" model="ir.actions.act_window">
-      <field name="name">Send By E-mail</field>
-      <field name="res_model">credit.control.mailer</field>
+    <record id="open_credit_line_emailer_wizard" model="ir.actions.act_window">
+      <field name="name">Send By Email</field>
+      <field name="res_model">credit.control.emailer</field>
       <field name="view_type">form</field>
       <field name="view_mode">form</field>
-      <field name="view_id" ref="credit_line_mailer_form"/>
+      <field name="view_id" ref="credit_line_emailer_form"/>
       <field name="target">new</field>
       <field name="help">Send an email for the selected lines.</field>
     </record>