[MERGE] from trunk

bzr revid: rco@openerp.com-20120628131210-hyx2t1lqbl5hwm9g

6 files changed, 10 insertions, 10 deletions

diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index ec489ff4d14..db77719a85b 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -59,7 +59,7 @@ class base_action_rule(osv.osv):
         else:
             reply_to = emailfrom
         if not emailfrom:
-            raise osv.except_osv(_('Error!'), _("No E-Mail Found for your Company address!"))
+            raise osv.except_osv(_('Error!'), _("No Email Found for your Company address!"))
         return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model=obj._name, reply_to=reply_to, res_id=obj.id)
 
     def do_check(self, cr, uid, action, obj, context=None):
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index bab3e4bca5f..4ca40a691f5 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -11,7 +11,7 @@
             <field name="name">direct</field>
         </record>
         <record model="crm.case.channel">
-            <field name="name">e-mail</field>
+            <field name="name">email</field>
         </record>
         <record model="crm.case.section" id="section_sales_department">
             <field name="name">Sales Department</field>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index addd26785a1..fa4643db156 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -193,7 +193,7 @@ class crm_lead(base_stage, osv.osv):
         'active': fields.boolean('Active', required=False),
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
-        'email_from': fields.char('Email', size=128, help="E-mail address of the contact", select=1),
+        'email_from': fields.char('Email', size=128, help="Email address of the contact", select=1),
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help='When sending mails, the default email address is taken from the sales team.'),
         'create_date': fields.datetime('Creation Date' , readonly=True),
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 8fc6beabe8b..7f8cbdf77aa 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -263,7 +263,7 @@
             <field name="categ_id" ref="crm.categ_oppor3"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="'Interest in your Kitchen Design Project'" name="name"/>
-            <field eval="'Send Catalogue by E-Mail'" name="title_action"/>
+            <field eval="'Send Catalogue by Email'" name="title_action"/>
             <field eval="time.strftime('%Y-01-10')" name="date_action"/>
             <field eval="time.strftime('%Y-02-23')" name="date_deadline"/>
             <field name="partner_name">Lucie Vonck</field>
diff --git a/addons/crm/crm_segmentation.py b/addons/crm/crm_segmentation.py
index 690948a8817..9cafe950410 100644
--- a/addons/crm/crm_segmentation.py
+++ b/addons/crm/crm_segmentation.py
@@ -61,7 +61,7 @@ added to partners that match the segmentation criterions after computation.'),
         for categ in categs:
             if start:
                 if categ['exclusif']:
-                    cr.execute('delete from res_partner_category_rel \
+                    cr.execute('delete from res_partner_res_partner_category_rel \
                             where category_id=%s', (categ['categ_id'][0],))
 
             id = categ['id']
@@ -81,7 +81,7 @@ added to partners that match the segmentation criterions after computation.'),
                     partners.remove(pid)
 
             for partner_id in partners:
-                cr.execute('insert into res_partner_category_rel (category_id,partner_id) \
+                cr.execute('insert into res_partner_res_partner_category_rel (category_id,partner_id) \
                         values (%s,%s)', (categ['categ_id'][0], partner_id))
 
             self.write(cr, uid, [id], {'state':'not running', 'partner_id':0})
diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot
index 85e1f493643..f3d70b709af 100644
--- a/addons/crm/i18n/crm.pot
+++ b/addons/crm/i18n/crm.pot
@@ -540,7 +540,7 @@ msgstr ""
 
 #. module: crm
 #: field:crm.lead,email:0
-msgid "E-Mail"
+msgid "Email"
 msgstr ""
 
 #. module: crm
@@ -2675,7 +2675,7 @@ msgstr ""
 
 #. module: crm
 #: help:crm.lead,email_from:0
-msgid "E-mail address of the contact"
+msgid "Email address of the contact"
 msgstr ""
 
 #. module: crm
@@ -3401,7 +3401,7 @@ msgstr ""
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
-msgid "No E-Mail Found for your Company address!"
+msgid "No Email Found for your Company address!"
 msgstr ""
 
 #. module: crm
@@ -3563,7 +3563,7 @@ msgstr ""
 
 #. module: crm
 #: model:ir.model,name:crm.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: crm