From c0ef0105445453601696e97efc5e2027720448ab Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Mon, 10 Jun 2013 18:20:57 +0530
Subject: [PATCH 01/94] [IMP] Improved Wizard

bzr revid: pga@tinyerp.com-20130610125057-3guyl18ktcnmhbch
---
 addons/crm_partner_assign/__openerp__.py      |   1 +
 addons/crm_partner_assign/crm_lead_view.xml   |  67 ++++---
 .../crm_partner_assign/crm_partner_assign.py  |  22 ++-
 .../crm_partner_assign/res_partner_view.xml   |  94 ++++-----
 .../wizard/crm_forward_to_partner.py          | 187 +++++++++---------
 .../wizard/crm_forward_to_partner_view.xml    |  49 ++---
 6 files changed, 221 insertions(+), 199 deletions(-)

diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index b9b21ca7a6a..69a7f226cde 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -47,6 +47,7 @@ You can also use the geolocalization without using the GPS coordinates.
         'crm_partner_assign_data.xml',
         'report/crm_lead_report_view.xml',
         'report/crm_partner_report_view.xml',
+        'data/lead_mail_template_data.xml'
     ],
     'test': ['test/partner_assign.yml'],
     'installable': True,
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 0d2837d6ca5..7e97ea9c027 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -8,26 +8,34 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//notebook/page[@string='Lead']" position="after">
-                        <page string="Assignation">
+                        <page string="Assigned Partner" groups="base.group_sale_manager">
                             <group name="partner_assign_group">
-                                <group string="Partner Assignation">
-                                    <field name="partner_assigned_id" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
-                                    <label for="date_assign"/>
+                               <group string="Partner Assignation" col="3" colspan="1">
+                                    <field name="partner_assigned_id" class="oe_inline" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
+                                    <button string="Automatic Assignation" name="action_assign_partner" type="object" colspan="1"
+                                        class="oe_link oe_inline"  attrs="{'invisible':[('partner_assigned_id','!=', False)]}"/>
                                     <div>
-                                        <field name="date_assign"/>
                                         <button string="Forward"
                                             attrs="{'invisible':[('partner_assigned_id','=',False)]}"
                                             name="%(crm_lead_forward_to_partner_act)d"
-                                            icon="terp-mail-forward" type="action"
-                                            context="{'default_composition_mode': 'forward', 'default_partner_ids': [partner_assigned_id]}"/>
+                                            class="oe_link" type="action"
+                                            context="{'default_composition_mode': 'forward','hide_forward_type': 1 , 'default_partner_ids': [partner_assigned_id]}"/>
                                     </div>
                                 </group>
-                                <group string="Geo Assignation">
-                                    <field name="partner_latitude"/>
-                                    <field name="partner_longitude"/>
-                                    <span/>
-                                    <button string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
-                                        icon="gtk-apply"/>
+                               <group string="Latitude and Longitude">
+                                <div class="oe_title">
+                                    <h5>
+                                    <span class="oe_grey">( </span>
+                                    <field name="partner_latitude" nolabel="1" class="oe_inline"/>
+                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&lt;=',0)]}">N </span>
+                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&gt;=',0)]}">S </span>
+                                    <field name="partner_longitude"  class="oe_inline" nolabel="1"/>
+                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&lt;=',0)]}">E </span>
+                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&gt;=',0)]}">W </span>
+                                    <span class="oe_grey">) </span>
+                                    </h5>
+                                    
+                                 </div>
                                 </group>
                             </group>
                         </page>
@@ -69,26 +77,33 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//notebook/page[@string='Extra Info']" position="after">
-                        <page string="Assignation">
+                        <page string="Assigned Partner" groups="base.group_sale_manager">
                             <group name="partner_assign_group">
-                                <group string="Partner Assignation">
-                                    <field name="partner_assigned_id" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
-                                    <label for="date_assign"/>
+                               <group string="Partner Assignation" col="3" colspan="1">
+                                    <field name="partner_assigned_id" class="oe_inline" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
+                                    <button string="Automatic Assignation" name="action_assign_partner" type="object" colspan="1"
+                                        class="oe_link oe_inline"  attrs="{'invisible':[('partner_assigned_id','!=', False)]}"/>
                                     <div>
-                                        <field name="date_assign"/>
                                         <button string="Forward"
                                             attrs="{'invisible':[('partner_assigned_id','=',False)]}"
                                             name="%(crm_lead_forward_to_partner_act)d"
-                                            icon="terp-mail-forward" type="action"
-                                            context="{'default_composition_mode': 'forward', 'default_partner_ids': [partner_assigned_id]}"/>
+                                            class="oe_link" type="action"
+                                            context="{'default_composition_mode': 'forward','hide_forward_type': 1 , 'default_partner_ids': [partner_assigned_id]}"/>
                                     </div>
                                 </group>
-                                <group string="Geo Assignation">
-                                    <field name="partner_latitude"/>
-                                    <field name="partner_longitude"/>
-                                    <span/>
-                                    <button string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
-                                        icon="gtk-apply"/>
+                                <group string="Latitude and Longitude">
+                                <div class="oe_title">
+                                    <h5>
+                                    <span class="oe_grey">( </span>
+                                    <field name="partner_latitude" nolabel="1" class="oe_inline"/>
+                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&lt;=',0)]}">N </span>
+                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&gt;=',0)]}">S </span>
+                                    <field name="partner_longitude"  class="oe_inline" nolabel="1"/>
+                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&lt;=',0)]}">E </span>
+                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&gt;=',0)]}">W </span>
+                                    <span class="oe_grey">) </span>
+                                    </h5>
+                                 </div>
                                 </group>
                             </group>
                         </page>
diff --git a/addons/crm_partner_assign/crm_partner_assign.py b/addons/crm_partner_assign/crm_partner_assign.py
index b13a75a2591..daf3d844fe6 100644
--- a/addons/crm_partner_assign/crm_partner_assign.py
+++ b/addons/crm_partner_assign/crm_partner_assign.py
@@ -66,10 +66,13 @@ class res_partner_grade(osv.osv):
     _columns = {
         'sequence': fields.integer('Sequence'),
         'active': fields.boolean('Active'),
-        'name': fields.char('Grade Name', size=32)
+        'name': fields.char('Grade Name', size=32),
+        'partner_weight': fields.integer('Grade Weight',
+            help="Gives the probability to assign a lead to this partner. (0 means no assignation.)"),
     }
     _defaults = {
-        'active': lambda *args: 1
+        'active': lambda *args: 1,
+        'partner_weight':1
     }
 
 class res_partner_activation(osv.osv):
@@ -88,11 +91,11 @@ class res_partner(osv.osv):
         'partner_latitude': fields.float('Geo Latitude'),
         'partner_longitude': fields.float('Geo Longitude'),
         'date_localization': fields.date('Geo Localization Date'),
-        'partner_weight': fields.integer('Weight',
+        'partner_weight': fields.integer('Grade Weight',
             help="Gives the probability to assign a lead to this partner. (0 means no assignation.)"),
         'opportunity_assigned_ids': fields.one2many('crm.lead', 'partner_assigned_id',\
             'Assigned Opportunities'),
-        'grade_id': fields.many2one('res.partner.grade', 'Partner Level'),
+        'grade_id': fields.many2one('res.partner.grade', 'Grade'),
         'activation' : fields.many2one('res.partner.activation', 'Activation', select=1),
         'date_partnership' : fields.date('Partnership Date'),
         'date_review' : fields.date('Latest Partner Review'),
@@ -101,6 +104,13 @@ class res_partner(osv.osv):
     _defaults = {
         'partner_weight': lambda *args: 0
     }
+    
+    def onchange_grade_id(self, cr, uid, ids, grade_id, context=None):
+        res = {'value' :{'partner_weight':0}}
+        if grade_id:
+            partner_grade = self.pool.get('res.partner.grade').browse(cr, uid, grade_id)
+            res['value']['partner_weight'] = partner_grade.partner_weight
+        return res
     def geo_localize(self, cr, uid, ids, context=None):
         # Don't pass context to browse()! We need country names in english below
         for partner in self.browse(cr, uid, ids):
@@ -124,7 +134,7 @@ class crm_lead(osv.osv):
     _columns = {
         'partner_latitude': fields.float('Geo Latitude'),
         'partner_longitude': fields.float('Geo Longitude'),
-        'partner_assigned_id': fields.many2one('res.partner', 'Assigned Partner', help="Partner this case has been forwarded/assigned to.", select=True),
+        'partner_assigned_id': fields.many2one('res.partner', 'Assigned Partner',track_visibility='onchange' , help="Partner this case has been forwarded/assigned to.", select=True),
         'date_assign': fields.date('Assignation Date', help="Last date this case was forwarded/assigned to a partner"),
     }
     def _merge_data(self, cr, uid, ids, oldest, fields, context=None):
@@ -134,6 +144,7 @@ class crm_lead(osv.osv):
     def onchange_assign_id(self, cr, uid, ids, partner_assigned_id, context=None):
         """This function updates the "assignation date" automatically, when manually assign a partner in the geo assign tab
         """
+
         if not partner_assigned_id:
             return {'value':{'date_assign': False}}
         else:
@@ -261,4 +272,3 @@ class crm_lead(osv.osv):
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index 9e70835a3f1..364d7208e40 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -54,10 +54,20 @@
         <field name="arch" type="xml">
             <form string="Partner Grade" version="7.0">
                 <group col="4">
+                    <group>
                     <field name="name"/>
+                    <field name="partner_weight"/>
+                    <div>
+                    <p class="oe_grey">
+                        Define a weight to this grade. The weight will be used as default in the partner form to compute the chance for this partner to get leads. For instance, for business purpose, you can define a target revenue for each grade. To give the same chance to each partner to get leads, keep 1 in this field.
+                     </p>
+                    </div>
+                    </group>
+                    <group>
                     <field name="sequence"/>
                     <field name="active"/>
-                </group>
+                    </group>
+                                    </group>
             </form>
         </field>
     </record>
@@ -104,13 +114,17 @@
         <field name="inherit_id" ref="base.view_partner_form"/>
         <field name="arch" type="xml">
             <xpath expr="//notebook[last()]" position="inside">
-                <page string="Geo Localization">
+                <page string="Forwarded Leads">
                     <group>
                         <group>
                             <separator string="Partner Activation" colspan="2"/>
-                            <field name="grade_id" widget="selection"/>
-                            <field name="activation" widget="selection"/>
-                            <field name="partner_weight"/>
+                            <field name="grade_id" widget="selection" on_change="onchange_grade_id(grade_id)"/>
+                            <field name="partner_weight" class="oe_inline"/>
+                            <div colspan="2">
+                            <p class="oe_grey">
+                                The scale of partner weight is between [1] to [100]. To increase the probability for this partner to get more leads, choose higher value. To decrease, choose  lower value.
+                            </p>
+                            </div>
                         </group>
                         <group>
                             <separator string="Partner Review" colspan="2"/>
@@ -118,53 +132,41 @@
                             <field name="date_review_next"/>
                             <field name="date_partnership"/>
                         </group>
+                        <group>
+                        </group>
                     </group>
-                    <group colspan="2" col="2">
-                        <separator string="Geo Localization" colspan="2"/>
-                        <button
-                            string="Geo Localize"
-                            name="geo_localize"
-                            colspan="2"
-                            icon="gtk-apply"
-                            type="object"/>
-                        <field name="partner_latitude"/>
-                        <field name="partner_longitude"/>
-                        <field name="date_localization"/>
-                    </group>
-                    <newline/>
+                    <group string="Latitude and Longitude">
+                                <div class="oe_title">
+                                    <h3 class="oe_inline">
+                                    <span class="oe_grey">( </span>
+                                    <field name="partner_latitude" nolabel="1" class="oe_inline"/>
+                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&lt;=',0)]}">N </span>
+                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&gt;=',0)]}">S </span>
+                                    <field name="partner_longitude"  class="oe_inline" nolabel="1"/>
+                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&lt;=',0)]}">E </span>
+                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&gt;=',0)]}">W </span>
+                                    <span class="oe_grey">) </span>
+	                                <button
+	                                string="Calculate Geo Localize"
+	                                name="geo_localize"
+	                                colspan="2"
+	                                class="oe_link oe_inline"
+	                                type="object"/>
+                                    </h3>
+	                                 </div>
+	                                </group>
+                  
 
+                    <newline/>
+                     <separator string="Forwarded Leads" colspan="2"/>
                     <field name="opportunity_assigned_ids" colspan="4" nolabel="1">
                          <tree string="Assigned Opportunities"  colors="blue:state=='pending';gray:state=='cancel'">
-                             <field name="create_date"/>
                              <field name="name"/>
-                             <field name="type"/>
+                             <field name="contact_name"/>
+                             <field name="email_from"/>
+                             <field name="phone"/>
                              <field name="stage_id"/>
-                             <button name="stage_previous" string="Previous"
-                                    states="open,pending" type="object" icon="gtk-go-back" />
-                             <button name="stage_next" string="Next"
-                                    states="open,pending" type="object"
-                                    icon="gtk-go-forward" />
-                             <field name="section_id"
-                                    invisible="context.get('invisible_section', True)"
-                                    groups="base.group_multi_salesteams"/>
-                             <field name="user_id" />
-                             <field name="state" />
-                             <button name="case_cancel" string="Cancel"
-                                    states="draft,open,pending" type="object"
-                                    icon="gtk-cancel" />
-                             <button name="case_open" string="Open"
-                                    states="draft,pending" type="object"
-                                    icon="gtk-go-forward" />
-                             <button name="case_close" string="Close"
-                                    states="open,draft,pending" type="object"
-                                    icon="gtk-close" />
-                             <button string="Convert to Opportunity"
-                                    name="convert_opportunity"
-                                    states="draft,open,pending" icon="gtk-index"
-                                    type="object" attrs="{'invisible':[('type','=','opportunity')]}" />
-                             <button name="case_escalate" string="Escalate"
-                                    states="open,draft,pending" type="object"
-                                    icon="gtk-go-up" />
+                             <field name="state" invisible="1"/>
                          </tree>
                     </field>
                 </page>
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 724102a84b1..b14b1a265bc 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -22,112 +22,101 @@
 
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
-
+from urllib import urlencode
+from urlparse import urljoin
 
 class crm_lead_forward_to_partner(osv.TransientModel):
     """ Forward info history to partners. """
     _name = 'crm.lead.forward.to.partner'
-    _inherit = "mail.compose.message"
-
-    def _get_composition_mode_selection(self, cr, uid, context=None):
-        composition_mode = super(crm_lead_forward_to_partner, self)._get_composition_mode_selection(cr, uid, context=context)
-        composition_mode.append(('forward', 'Forward'))
-        return composition_mode
-
-    _columns = {
-        'partner_ids': fields.many2many('res.partner',
-            'lead_forward_to_partner_res_partner_rel',
-            'wizard_id', 'partner_id', 'Additional contacts'),
-        'attachment_ids': fields.many2many('ir.attachment',
-            'lead_forward_to_partner_attachment_rel',
-            'wizard_id', 'attachment_id', 'Attachments'),
-        'history_mode': fields.selection([('info', 'Internal notes'),
-            ('latest', 'Latest email'), ('whole', 'Whole Story')],
-            'Send history', required=True),
-    }
-
-    _defaults = {
-        'history_mode': 'info',
-    }
-
+    
+    def get_partner(self, cr, uid, ids, context):
+        lead_obj = self.pool.get('crm.lead')
+        partner_id = lead_obj.search_geo_partner(cr, uid, ids, context)
+        if partner_id:
+            partner_id = partner_id[ids[0]]
+        else:
+            partner_id = False
+        return partner_id
+    
     def default_get(self, cr, uid, fields, context=None):
         if context is None:
             context = {}
-        # set as comment, perform overrided document-like action that calls get_record_data
-        old_mode = context.get('default_composition_mode', 'forward')
-        context['default_composition_mode'] = 'comment'
+        lead_obj = self.pool.get('crm.lead')
+        email_template_obj=self.pool.get('email.template')
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        template_id=email_template_obj.search(cr, uid,[('name','=','Lead Mass Mail'),('model_id.name','=','crm.lead.forward.to.partner')])
         res = super(crm_lead_forward_to_partner, self).default_get(cr, uid, fields, context=context)
-        # back to forward mode
-        context['default_composition_mode'] = old_mode
-        res['composition_mode'] = context['default_composition_mode']
+        active_ids = context.get('active_ids')
+        default_composition_mode = context.get('default_composition_mode')
+        res['assignation_lines'] = []
+        if template_id:
+            res['body'] =  email_template_obj.get_email_template(cr, uid, template_id[0]).body_html
+        if active_ids:
+            leads = lead_obj.browse(cr, uid, active_ids, context=context)
+            for lead in leads:
+                if (not lead.partner_assigned_id) and default_composition_mode =='mass_mail':
+                    partner_id=self.get_partner(cr, uid, [lead.id], context)
+                    res['assignation_lines'].append({'lead_id': lead.id,
+                                                     'subject': lead.name,
+                                                     'city':lead.city,
+                                                     'country_id':lead.country_id.id,
+                                                     'partner_assigned_id': partner_id,
+                                                    'lead_link':"%s/?db=%s#id=%s&model=crm.lead"%(base_url,cr.dbname,lead.id)
+                                                     })
+                elif default_composition_mode =='forward':
+                    res['assignation_lines'].append({'lead_id': lead.id,
+                                                     'subject': lead.name,
+                                                     'city':lead.city,
+                                                     'country_id':lead.country_id.id,
+                                                     'partner_assigned_id': lead.partner_assigned_id.id,
+                                                    'lead_link':"%s/?db=%s#id=%s&model=crm.lead"%(base_url,cr.dbname,lead.id)
+                                                     })
+                    res['partner_id']=lead.partner_assigned_id.id
         return res
-
-    def get_record_data(self, cr, uid, model, res_id, context=None):
-        """ Override of mail.compose.message, to add default values coming
-            form the related lead.
-        """
-        if context is None:
-            context = {}
-        res = super(crm_lead_forward_to_partner, self).get_record_data(cr, uid, model, res_id, context=context)
-        if model not in ('crm.lead') or not res_id:
-            return res
-        template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', 'crm_partner_assign_email_template')[1]
-        context['history_mode'] = context.get('history_mode','whole')
-        mail_body_fields = ['partner_id', 'partner_name', 'title', 'function', 'street', 'street2', 'zip', 'city', 'country_id', 'state_id', 'email_from', 'phone', 'fax', 'mobile', 'description']
-        lead = self.pool.get('crm.lead').browse(cr, uid, res_id, context=context)
-        context['mail_body'] = self.pool.get('crm.lead')._mail_body(cr, uid, lead, mail_body_fields, context=context)
-        template = self.generate_email_for_composer(cr, uid, template_id, res_id, context)
-        res['subject'] = template['subject']
-        res['body'] = template['body']
-        return res
-
-    def on_change_history_mode(self, cr, uid, ids, history_mode, model, res_id, context=None):
-        """ Update body when changing history_mode """
-        if context is None:
-            context = {}
-        if model and model == 'crm.lead' and res_id:
-            lead = self.pool[model].browse(cr, uid, res_id, context=context)
-            context['history_mode'] = history_mode
-            body = self.get_record_data(cr, uid, 'crm.lead', res_id, context=context)['body']
-            return {'value': {'body': body}}
-
-    def create(self, cr, uid, values, context=None):
-        """ TDE-HACK: remove 'type' from context, because when viewing an
-            opportunity form view, a default_type is set and propagated
-            to the wizard, that has a not matching type field. """
-        default_type = context.pop('default_type', None)
-        new_id = super(crm_lead_forward_to_partner, self).create(cr, uid, values, context=context)
-        if default_type:
-            context['default_type'] = default_type
-        return new_id
-
+    
     def action_forward(self, cr, uid, ids, context=None):
-        """ Forward the lead to a partner """
-        if context is None:
-            context = {}
-        # TDE FIX in 7.0: force mass_mailing mode; this way, the message will be
-        # send only to partners; default subtype of mass_mailing is indeed False
-        # Chatter will show 'logged a note', but partner_ids (aka, the assigned partner)
-        # will effectively receive the message if present in the composition window
-        self.write(cr, uid, ids, {'composition_mode': 'mass_mail'}, context=context)
-        res = {'type': 'ir.actions.act_window_close'}
-        wizard = self.browse(cr, uid, ids[0], context=context)
-        if wizard.model not in ('crm.lead'):
-            return res
-        if context.get('active_ids') is None:
-            context['active_ids'] = [wizard.res_id]
-
-        lead = self.pool[wizard.model]
-        lead_ids = wizard.res_id and [wizard.res_id] or []
-
-        if wizard.composition_mode == 'mass_mail':
-            lead_ids = context and context.get('active_ids', []) or []
-            value = self.default_get(cr, uid, ['body', 'email_to', 'email_cc', 'subject', 'history_mode'], context=context)
-            value.pop('composition_mode')
-            self.pool.get('crm.lead').message_subscribe(cr, uid, lead_ids, [partner.id for partner in wizard.partner_ids], context=context)
-            self.write(cr, uid, ids, value, context=context)
-
-        return self.send_mail(cr, uid, ids, context=context)
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+        lead_obj = self.pool.get('crm.lead')
+        record = self.browse(cr, uid, ids, context=context)
+        email_template_obj=self.pool.get('email.template')
+        tamplate_id=email_template_obj.search(cr, uid,[('name','=','Lead Mass Mail'),('model_id.name','=','crm.lead.forward.to.partner')])
+        if record[0].forward_type == "single":
+            email_template_obj.send_mail(cr, uid, tamplate_id[0],ids[0])
+            active_ids = context.get('active_ids')
+            if active_ids:
+                lead_obj.write(cr, uid, active_ids, {'partner_assigned_id': record[0].partner_id.id , 'user_id': record[0].partner_id.user_id.id})
+        else:
+            for lead in record[0].assignation_lines:
+                self.write(cr, uid, ids, {'partner_id':lead.partner_assigned_id.id,
+                                          'lead_single_link': lead.lead_link,
+                                          'lead_single_id':lead.lead_id.id
+                                          })
+                email_template_obj.send_mail(cr, uid,tamplate_id[0],ids[0])
+                lead_obj.write(cr, uid, [lead.lead_id.id], {'partner_assigned_id': lead.partner_assigned_id.id ,'user_id': lead.partner_assigned_id.user_id.id})
+        return True
+    
+    _columns = {
+        'forward_type':fields.selection([ ('single','a single partner: manual selection of partner'), ('assigned',"several partners: automatic assignation, using GPS coordinates and partner's grades"), ],'Forward selected leads to'),
+        'partner_id':fields.many2one('res.partner', 'Forward Leads To'),
+        'assignation_lines': fields.one2many('crm.lead.assignation', 'forward_id', 'Partner Assignation'),
+        'show_mail': fields.boolean('Show the email will be sent'),
+        'body': fields.html('Contents', help='Automatically sanitized HTML contents'),
+        'lead_single_id':fields.many2one('crm.lead', 'Lead'),
+        'lead_single_link': fields.char('Lead  Single Links',  size=128),
+    }
+    
+    _defaults = {
+        'forward_type': 'single',
+    }
+    
+class crm_lead_assignation (osv.TransientModel):
+    _name = 'crm.lead.assignation'
+    _columns = {
+        'forward_id':fields.many2one('crm.lead.forward.to.partner', 'Partner Assignation'),
+        'lead_id':fields.many2one('crm.lead', 'Lead'),
+        'subject': fields.char('Subject', size=64),
+        'city': fields.char('City', size=128),
+        'country_id': fields.many2one('res.country', 'Country'),
+        'partner_assigned_id': fields.many2one('res.partner', 'Assigned Partner'),
+        'lead_link': fields.char('Lead  Single Links',  size=128),
+    }
+# # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 0fda8c8beaa..7ba5aa04800 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -7,30 +7,35 @@
             <field name="model">crm.lead.forward.to.partner</field>
             <field name="arch" type="xml">
                 <form string="Send Mail" version="7.0">
-                    <field name="composition_mode" colspan="2" nolabel="1" invisible="1"/>
-                    <field name="model" colspan="2" nolabel="1" invisible="1"/>
-                    <field name="res_id" colspan="2" nolabel="1" invisible="1"/>
-                    <separator string="Forward to Partner" colspan="4"/>
-                    <group col="4">
-                        <field name="history_mode" colspan="4"
-                            on_change="on_change_history_mode(history_mode, model, res_id)"/>
-                        <field name="subject" colspan="4"/>
-                        <field name="partner_ids" colspan="4" widget="many2many_tags_email"/>
-                        <notebook colspan="4">
-                            <page string="Body">
-                                <field name="body"/>
-                            </page>
-                            <page string="Attachments">
-                                <field name="attachment_ids"/>
-                            </page>
-                        </notebook>
+                    <group>
+                        <field name="forward_type" widget="radio" invisible="context.get('hide_forward_type',False)"/>
                     </group>
+                    <group>
+                        <group>
+                            <field name="partner_id" attrs="{'invisible': [('forward_type', 'in', ['assigned',False])]}"/>
+                        </group>
+                        <group>
+                        </group>
+                    </group>
+                    <field name="assignation_lines" attrs="{'invisible': [('forward_type', 'in', ['single',False])]}">
+                        <tree create="false" editable="bottom">
+                            <field name="lead_id" invisible="1"/>
+                            <field name="subject" readonly="1"/>
+                            <field name="city" readonly="1"/>
+                            <field name="country_id" readonly="1"/>
+                            <field name="partner_assigned_id"/>
+                        </tree>
+                    </field>
+                    <field name="show_mail"/><label for="show_mail"/>
+                    <notebook colspan="4" attrs="{'invisible': [('show_mail', '=', False)]}">
+                        <page string="Body">
+                            <field name="body"  readonly="1"/>
+                        </page>
+                    </notebook>
                     <footer>
-                        <button name="action_forward" string="Send" type="object"
-                            class="oe_highlight"/>
+                        <button name="action_forward" string="Send" type="object" class="oe_highlight"/>
                         or
-                        <button string="Cancel" special="cancel"
-                            class="oe_link"/>
+                        <button string="Cancel" special="cancel" class="oe_link"/>
                     </footer>
                 </form>
             </field>
@@ -47,7 +52,7 @@
 
         <act_window id="action_crm_send_mass_forward"
             multi="True"
-            key2="client_action_multi" name="Mass forward to partner"
+            key2="client_action_multi" name="Forward to Partner"
             res_model="crm.lead.forward.to.partner" src_model="crm.lead"
             view_mode="form" target="new" view_type="form"
             context="{'default_composition_mode' : 'mass_mail'}"

From 20662159e03b83075b81d9ce148da9c4d0a4cdf5 Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Tue, 11 Jun 2013 10:40:11 +0530
Subject: [PATCH 02/94] [ADD] Added Template Data File

bzr revid: pga@tinyerp.com-20130611051011-frmrewlinl88z166
---
 .../data/lead_mail_template_data.xml          | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 addons/crm_partner_assign/data/lead_mail_template_data.xml

diff --git a/addons/crm_partner_assign/data/lead_mail_template_data.xml b/addons/crm_partner_assign/data/lead_mail_template_data.xml
new file mode 100644
index 00000000000..1710b69160e
--- /dev/null
+++ b/addons/crm_partner_assign/data/lead_mail_template_data.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data noupdate="1">
+      <record id="email_template_lead_forward_mail" model="email.template">
+            <field name="name">Lead Mass Mail</field>
+            <field name="model_id" model="ir.model" search="[('name', '=', 'crm.lead.forward.to.partner')]"></field>
+            <field name="auto_delete" eval="True"/>
+            <field name="email_to">${object.partner_id.email}</field>
+            <field name="email_from">${user.email or ''}</field>
+            <field name="body_html"><![CDATA[
+            
+Hello ${object.partner_id.name},
+</br>
+</br>
+% if object.forward_type == 'single':
+
+<blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;">Some leads have been assigned to you. Here are the various leads we propose: </blockquote></br></br>
+<b>
+<ol><ol>
+% for lead in object.assignation_lines:
+     <li><a href="${lead.lead_link}">${lead.subject}</a>, ${lead.lead_id.contact_name}, ${lead.lead_id.country_id.name}, ${lead.lead_id.email_from}, ${lead.lead_id.phone} </li></br>
+% endfor
+</ol></ol>
+</b>
+% endif
+
+
+
+% if object.forward_type == 'assigned':
+<blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;">One leads have been assigned to you. Here given lead we propose:</blockquote> </br></br>
+<b>
+<ol><ol>
+<li><a href="${object.lead_single_link}">${object.lead_single_id.name}</a>, ${object.lead_single_id.contact_name}, ${object.lead_single_id.country_id.name}, ${object.lead_single_id.email_from}, ${object.lead_single_id.phone} </br></li>
+</ol></ol>
+</b>
+% endif
+</br>
+<blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;">Connect you to your  Partner Portal to see leads details.</blockquote>
+
+</br>   
+Thanks,</br>
+    Account Manager
+            ]]></field>
+        </record>
+    </data>
+</openerp>

From b9fd2226ba10b9a30f5e63a3635b399b7245696c Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Tue, 11 Jun 2013 12:19:10 +0530
Subject: [PATCH 03/94] [IMP] improved code

bzr revid: pga@tinyerp.com-20130611064910-50u7hfdq7wkpym34
---
 .../wizard/crm_forward_to_partner.py          | 49 +++++++------------
 1 file changed, 19 insertions(+), 30 deletions(-)

diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index b14b1a265bc..9d1a325a8bd 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -22,65 +22,54 @@
 
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
-from urllib import urlencode
-from urlparse import urljoin
 
 class crm_lead_forward_to_partner(osv.TransientModel):
     """ Forward info history to partners. """
     _name = 'crm.lead.forward.to.partner'
-    
-    def get_partner(self, cr, uid, ids, context):
-        lead_obj = self.pool.get('crm.lead')
-        partner_id = lead_obj.search_geo_partner(cr, uid, ids, context)
-        if partner_id:
-            partner_id = partner_id[ids[0]]
-        else:
-            partner_id = False
-        return partner_id
-    
+
     def default_get(self, cr, uid, fields, context=None):
         if context is None:
             context = {}
         lead_obj = self.pool.get('crm.lead')
-        email_template_obj=self.pool.get('email.template')
+        email_template_obj = self.pool.get('email.template')
         base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
-        template_id=email_template_obj.search(cr, uid,[('name','=','Lead Mass Mail'),('model_id.name','=','crm.lead.forward.to.partner')])
+        model, template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', 'email_template_lead_forward_mail')
         res = super(crm_lead_forward_to_partner, self).default_get(cr, uid, fields, context=context)
         active_ids = context.get('active_ids')
         default_composition_mode = context.get('default_composition_mode')
         res['assignation_lines'] = []
         if template_id:
-            res['body'] =  email_template_obj.get_email_template(cr, uid, template_id[0]).body_html
+            res['body'] = email_template_obj.get_email_template(cr, uid, template_id).body_html
         if active_ids:
             leads = lead_obj.browse(cr, uid, active_ids, context=context)
             for lead in leads:
-                if (not lead.partner_assigned_id) and default_composition_mode =='mass_mail':
-                    partner_id=self.get_partner(cr, uid, [lead.id], context)
+                if (not lead.partner_assigned_id) and default_composition_mode == 'mass_mail':
+                    partner_id = lead_obj.search_geo_partner(cr, uid, [lead.id], context)
                     res['assignation_lines'].append({'lead_id': lead.id,
                                                      'subject': lead.name,
                                                      'city':lead.city,
                                                      'country_id':lead.country_id.id,
-                                                     'partner_assigned_id': partner_id,
-                                                    'lead_link':"%s/?db=%s#id=%s&model=crm.lead"%(base_url,cr.dbname,lead.id)
+                                                     'partner_assigned_id': partner_id and partner_id[lead.id] or False,
+                                                     'lead_link':"%s/?db=%s#id=%s&model=crm.lead" % (base_url, cr.dbname, lead.id)
                                                      })
-                elif default_composition_mode =='forward':
+                elif default_composition_mode == 'forward':
                     res['assignation_lines'].append({'lead_id': lead.id,
                                                      'subject': lead.name,
                                                      'city':lead.city,
                                                      'country_id':lead.country_id.id,
                                                      'partner_assigned_id': lead.partner_assigned_id.id,
-                                                    'lead_link':"%s/?db=%s#id=%s&model=crm.lead"%(base_url,cr.dbname,lead.id)
+                                                     'lead_link':"%s/?db=%s#id=%s&model=crm.lead" % (base_url, cr.dbname, lead.id)
                                                      })
-                    res['partner_id']=lead.partner_assigned_id.id
+                    res['partner_id'] = lead.partner_assigned_id.id
         return res
     
     def action_forward(self, cr, uid, ids, context=None):
         lead_obj = self.pool.get('crm.lead')
         record = self.browse(cr, uid, ids, context=context)
-        email_template_obj=self.pool.get('email.template')
-        tamplate_id=email_template_obj.search(cr, uid,[('name','=','Lead Mass Mail'),('model_id.name','=','crm.lead.forward.to.partner')])
+        email_template_obj = self.pool.get('email.template')
+        model, template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', 'email_template_lead_forward_mail')
         if record[0].forward_type == "single":
-            email_template_obj.send_mail(cr, uid, tamplate_id[0],ids[0])
+            email_template_obj.send_mail(cr, uid, template_id, ids[0])
             active_ids = context.get('active_ids')
             if active_ids:
                 lead_obj.write(cr, uid, active_ids, {'partner_assigned_id': record[0].partner_id.id , 'user_id': record[0].partner_id.user_id.id})
@@ -90,18 +79,18 @@ class crm_lead_forward_to_partner(osv.TransientModel):
                                           'lead_single_link': lead.lead_link,
                                           'lead_single_id':lead.lead_id.id
                                           })
-                email_template_obj.send_mail(cr, uid,tamplate_id[0],ids[0])
-                lead_obj.write(cr, uid, [lead.lead_id.id], {'partner_assigned_id': lead.partner_assigned_id.id ,'user_id': lead.partner_assigned_id.user_id.id})
+                email_template_obj.send_mail(cr, uid, template_id, ids[0])
+                lead_obj.write(cr, uid, [lead.lead_id.id], {'partner_assigned_id': lead.partner_assigned_id.id, 'user_id': lead.partner_assigned_id.user_id.id})
         return True
     
     _columns = {
-        'forward_type':fields.selection([ ('single','a single partner: manual selection of partner'), ('assigned',"several partners: automatic assignation, using GPS coordinates and partner's grades"), ],'Forward selected leads to'),
+        'forward_type':fields.selection([ ('single', 'a single partner: manual selection of partner'), ('assigned', "several partners: automatic assignation, using GPS coordinates and partner's grades"), ], 'Forward selected leads to'),
         'partner_id':fields.many2one('res.partner', 'Forward Leads To'),
         'assignation_lines': fields.one2many('crm.lead.assignation', 'forward_id', 'Partner Assignation'),
         'show_mail': fields.boolean('Show the email will be sent'),
         'body': fields.html('Contents', help='Automatically sanitized HTML contents'),
         'lead_single_id':fields.many2one('crm.lead', 'Lead'),
-        'lead_single_link': fields.char('Lead  Single Links',  size=128),
+        'lead_single_link': fields.char('Lead  Single Links', size=128),
     }
     
     _defaults = {
@@ -117,6 +106,6 @@ class crm_lead_assignation (osv.TransientModel):
         'city': fields.char('City', size=128),
         'country_id': fields.many2one('res.country', 'Country'),
         'partner_assigned_id': fields.many2one('res.partner', 'Assigned Partner'),
-        'lead_link': fields.char('Lead  Single Links',  size=128),
+        'lead_link': fields.char('Lead  Single Links', size=128),
     }
 # # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 65f12180c5b1ae7f83b5d1e814d004998929dc21 Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Tue, 11 Jun 2013 17:27:30 +0530
Subject: [PATCH 04/94] [IMP] Added Validation and some code improvement

bzr revid: pga@tinyerp.com-20130611115730-035v1wo2nwy2083m
---
 addons/crm_partner_assign/crm_lead_view.xml   |  67 +++--
 .../crm_partner_assign/res_partner_view.xml   | 243 +++++++++---------
 .../wizard/crm_forward_to_partner.py          |   4 +
 .../wizard/crm_forward_to_partner_view.xml    |  20 +-
 4 files changed, 160 insertions(+), 174 deletions(-)

diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 7e97ea9c027..6eb7fd5ae31 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -10,7 +10,7 @@
                     <xpath expr="//notebook/page[@string='Lead']" position="after">
                         <page string="Assigned Partner" groups="base.group_sale_manager">
                             <group name="partner_assign_group">
-                               <group string="Partner Assignation" col="3" colspan="1">
+                                <group string="Partner Assignation" col="3" colspan="1">
                                     <field name="partner_assigned_id" class="oe_inline" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
                                     <button string="Automatic Assignation" name="action_assign_partner" type="object" colspan="1"
                                         class="oe_link oe_inline"  attrs="{'invisible':[('partner_assigned_id','!=', False)]}"/>
@@ -22,20 +22,19 @@
                                             context="{'default_composition_mode': 'forward','hide_forward_type': 1 , 'default_partner_ids': [partner_assigned_id]}"/>
                                     </div>
                                 </group>
-                               <group string="Latitude and Longitude">
-                                <div class="oe_title">
-                                    <h5>
-                                    <span class="oe_grey">( </span>
-                                    <field name="partner_latitude" nolabel="1" class="oe_inline"/>
-                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&lt;=',0)]}">N </span>
-                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&gt;=',0)]}">S </span>
-                                    <field name="partner_longitude"  class="oe_inline" nolabel="1"/>
-                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&lt;=',0)]}">E </span>
-                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&gt;=',0)]}">W </span>
-                                    <span class="oe_grey">) </span>
-                                    </h5>
-                                    
-                                 </div>
+                                <group string="Latitude and Longitude">
+                                    <div class="oe_title">
+                                        <h3>
+                                            <span class="oe_grey">( </span>
+                                            <field name="partner_latitude" nolabel="1" readonly="1" class="oe_inline"/>
+                                            <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&lt;=',0)]}">N </span>
+                                            <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&gt;=',0)]}">S </span>
+                                            <field name="partner_longitude"  class="oe_inline" readonly="1" nolabel="1"/>
+                                            <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&lt;=',0)]}">E </span>
+                                            <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&gt;=',0)]}">W </span>
+                                            <span class="oe_grey">) </span>
+                                        </h3>
+                                    </div>
                                 </group>
                             </group>
                         </page>
@@ -51,7 +50,7 @@
             <field name="arch" type="xml">
                 <field name="partner_id" position="after">
                     <field name="partner_assigned_id"/>
-                 </field>
+                </field>
             </field>
         </record>
 
@@ -63,14 +62,13 @@
                 <filter string="Team" position="after">
                     <filter string="Assigned Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_assigned_id'}"/>
                 </filter>
-
                 <field name="partner_id" position="after">
                     <field name="partner_assigned_id"/>
                 </field>
             </field>
-         </record>
+        </record>
 
-         <record id="view_crm_lead_geo_assign_form" model="ir.ui.view">
+        <record id="view_crm_lead_geo_assign_form" model="ir.ui.view">
             <field name="name">crm.lead.lead.geo_assign.inherit</field>
             <field name="model">crm.lead</field>
             <field name="inherit_id" ref="crm.crm_case_form_view_leads"/>
@@ -79,7 +77,7 @@
                     <xpath expr="//notebook/page[@string='Extra Info']" position="after">
                         <page string="Assigned Partner" groups="base.group_sale_manager">
                             <group name="partner_assign_group">
-                               <group string="Partner Assignation" col="3" colspan="1">
+                                <group string="Partner Assignation" col="3" colspan="1">
                                     <field name="partner_assigned_id" class="oe_inline" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
                                     <button string="Automatic Assignation" name="action_assign_partner" type="object" colspan="1"
                                         class="oe_link oe_inline"  attrs="{'invisible':[('partner_assigned_id','!=', False)]}"/>
@@ -92,18 +90,18 @@
                                     </div>
                                 </group>
                                 <group string="Latitude and Longitude">
-                                <div class="oe_title">
-                                    <h5>
-                                    <span class="oe_grey">( </span>
-                                    <field name="partner_latitude" nolabel="1" class="oe_inline"/>
-                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&lt;=',0)]}">N </span>
-                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&gt;=',0)]}">S </span>
-                                    <field name="partner_longitude"  class="oe_inline" nolabel="1"/>
-                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&lt;=',0)]}">E </span>
-                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&gt;=',0)]}">W </span>
-                                    <span class="oe_grey">) </span>
-                                    </h5>
-                                 </div>
+                                    <div class="oe_title">
+                                        <h3>
+                                            <span class="oe_grey">( </span>
+                                            <field name="partner_latitude" nolabel="1" readonly="1" class="oe_inline"/>
+                                            <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&lt;=',0)]}">N </span>
+                                            <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&gt;=',0)]}">S </span>
+                                            <field name="partner_longitude"  class="oe_inline" readonly="1" nolabel="1"/>
+                                            <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&lt;=',0)]}">E </span>
+                                            <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&gt;=',0)]}">W </span>
+                                            <span class="oe_grey">) </span>
+                                        </h3>
+                                    </div>
                                 </group>
                             </group>
                         </page>
@@ -119,7 +117,7 @@
             <field name="arch" type="xml">
                 <field name="partner_id" position="after">
                     <field name="partner_assigned_id"/>
-                 </field>
+                </field>
             </field>
         </record>
 
@@ -131,12 +129,11 @@
                 <filter string="Team" position="after">
                     <filter string="Assigned Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_assigned_id'}"/>
                 </filter>
-
                 <field name="partner_id" position="after">
                     <field name="partner_assigned_id"/>
                 </field>
             </field>
-         </record>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index 364d7208e40..d376576a9d7 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-    <!--Partner Activation -->
+        <!--Partner Activation -->
 
         <record model="ir.ui.view" id="res_partner_activation_form">
             <field name="name">openerp_custom.res.partner.activation.form</field>
@@ -33,147 +33,136 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem id="res_partner_activation_config_mi" parent="base.menu_config_address_book" action="res_partner_activation_act" groups="base.group_no_one"/>
+        <menuitem id="res_partner_activation_config_mi" parent="base.menu_config_address_book" action="res_partner_activation_act" groups="base.group_no_one" />
 
-    <!--Partner Grade -->
+        <!--Partner Grade -->
 
-
-    <record id="view_partner_grade_tree" model="ir.ui.view">
-        <field name="name">res.partner.grade.tree</field>
-        <field name="model">res.partner.grade</field>
-        <field name="arch" type="xml">
-            <tree string="Partner Grade">
-                <field name="sequence" invisible="1"/>
-                <field name="name"/>
-            </tree>
-        </field>
-    </record>
-    <record id="view_partner_grade_form" model="ir.ui.view">
-        <field name="name">res.partner.grade.form</field>
-        <field name="model">res.partner.grade</field>
-        <field name="arch" type="xml">
-            <form string="Partner Grade" version="7.0">
-                <group col="4">
-                    <group>
-                    <field name="name"/>
-                    <field name="partner_weight"/>
-                    <div>
-                    <p class="oe_grey">
-                        Define a weight to this grade. The weight will be used as default in the partner form to compute the chance for this partner to get leads. For instance, for business purpose, you can define a target revenue for each grade. To give the same chance to each partner to get leads, keep 1 in this field.
-                     </p>
-                    </div>
-                    </group>
-                    <group>
-                    <field name="sequence"/>
-                    <field name="active"/>
-                    </group>
-                                    </group>
-            </form>
-        </field>
-    </record>
-    <record id="res_partner_grade_action" model="ir.actions.act_window">
-        <field name="name">Partner Grade</field>
-        <field name="res_model">res.partner.grade</field>
-        <field name="view_type">form</field>
-    </record>
-    <menuitem action="res_partner_grade_action" id="menu_res_partner_grade_action"
-        groups="base.group_no_one"
-        parent="base.menu_crm_config_lead" />
-
-    <!-- Partner form -->
-    <record id="view_res_partner_filter_assign_tree" model="ir.ui.view">
-        <field name="name">res.partner.geo.inherit.tree</field>
-        <field name="model">res.partner</field>
-        <field name="inherit_id" ref="base.view_partner_tree"/>
-        <field name="arch" type="xml">
-            <field name="user_id" position="after">
-                <field name="date_review_next"/>
-                <field name="grade_id"/>
-                <field name="activation"/>
+        <record id="view_partner_grade_tree" model="ir.ui.view">
+            <field name="name">res.partner.grade.tree</field>
+            <field name="model">res.partner.grade</field>
+            <field name="arch" type="xml">
+                <tree string="Partner Grade">
+                    <field name="sequence" invisible="1" />
+                    <field name="name" />
+                </tree>
             </field>
-        </field>
-    </record>
-
-    <record id="view_res_partner_filter_assign" model="ir.ui.view">
-        <field name="name">res.partner.geo.inherit.search</field>
-        <field name="model">res.partner</field>
-        <field name="inherit_id" ref="base.view_res_partner_filter"/>
-        <field name="arch" type="xml">
-            <filter string="Salesperson" position="after">
-                <filter string="Activation" context="{'group_by' : 'activation'}" domain="[]" icon="terp-personal" />
-            </filter>
-            <field name="category_id" position="after">
-                <field name="grade_id"/>
-            </field>
-        </field>
-    </record>
-
-    <record id="view_crm_partner_geo_form" model="ir.ui.view">
-        <field name="name">res.partner.geo.inherit</field>
-        <field name="model">res.partner</field>
-        <field name="inherit_id" ref="base.view_partner_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//notebook[last()]" position="inside">
-                <page string="Forwarded Leads">
-                    <group>
+        </record>
+        <record id="view_partner_grade_form" model="ir.ui.view">
+            <field name="name">res.partner.grade.form</field>
+            <field name="model">res.partner.grade</field>
+            <field name="arch" type="xml">
+                <form string="Partner Grade" version="7.0">
+                    <group col="4">
                         <group>
-                            <separator string="Partner Activation" colspan="2"/>
-                            <field name="grade_id" widget="selection" on_change="onchange_grade_id(grade_id)"/>
-                            <field name="partner_weight" class="oe_inline"/>
-                            <div colspan="2">
-                            <p class="oe_grey">
-                                The scale of partner weight is between [1] to [100]. To increase the probability for this partner to get more leads, choose higher value. To decrease, choose  lower value.
-                            </p>
+                            <field name="name" />
+                            <field name="partner_weight" />
+                            <div>
+                                <p class="oe_grey">
+                                    Define a weight to this grade. The weight will be used as default in the partner form to compute the chance for this partner to get leads. For instance, for business purpose, you can define a target revenue for each grade. To give the same chance to each partner to get leads, keep 1 in this field.
+                                </p>
                             </div>
                         </group>
                         <group>
-                            <separator string="Partner Review" colspan="2"/>
-                            <field name="date_review"/>
-                            <field name="date_review_next"/>
-                            <field name="date_partnership"/>
-                        </group>
-                        <group>
+                            <field name="sequence" />
+                            <field name="active" />
                         </group>
                     </group>
-                    <group string="Latitude and Longitude">
-                                <div class="oe_title">
-                                    <h3 class="oe_inline">
+                </form>
+            </field>
+        </record>
+        <record id="res_partner_grade_action" model="ir.actions.act_window">
+            <field name="name">Partner Grade</field>
+            <field name="res_model">res.partner.grade</field>
+            <field name="view_type">form</field>
+        </record>
+        <menuitem action="res_partner_grade_action" id="menu_res_partner_grade_action" groups="base.group_no_one" parent="base.menu_crm_config_lead" />
+
+        <!-- Partner form -->
+        <record id="view_res_partner_filter_assign_tree" model="ir.ui.view">
+            <field name="name">res.partner.geo.inherit.tree</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_tree" />
+            <field name="arch" type="xml">
+                <field name="user_id" position="after">
+                    <field name="date_review_next" />
+                    <field name="grade_id" />
+                    <field name="activation" />
+                </field>
+            </field>
+        </record>
+
+        <record id="view_res_partner_filter_assign" model="ir.ui.view">
+            <field name="name">res.partner.geo.inherit.search</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_res_partner_filter" />
+            <field name="arch" type="xml">
+                <filter string="Salesperson" position="after">
+                    <filter string="Activation" context="{'group_by' : 'activation'}" domain="[]" icon="terp-personal" />
+                </filter>
+                <field name="category_id" position="after">
+                    <field name="grade_id" />
+                </field>
+            </field>
+        </record>
+
+        <record id="view_crm_partner_geo_form" model="ir.ui.view">
+            <field name="name">res.partner.geo.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="arch" type="xml">
+                <xpath expr="//notebook[last()]" position="inside">
+                    <page string="Forwarded Leads">
+                        <group>
+                            <group>
+                                <separator string="Partner Activation" colspan="2" />
+                                <field name="grade_id" widget="selection" on_change="onchange_grade_id(grade_id)" />
+                                <field name="partner_weight" class="oe_inline" />
+                                <div colspan="2">
+                                    <p class="oe_grey">
+                                        The scale of partner weight is between [1] to [100]. To increase the probability for this partner to get more leads, choose higher value. To decrease, choose lower value.
+                                    </p>
+                                </div>
+                            </group>
+                            <group>
+                                <separator string="Partner Review" colspan="2" />
+                                <field name="date_review" />
+                                <field name="date_review_next" />
+                                <field name="date_partnership" />
+                            </group>
+                            <group>
+                            </group>
+                        </group>
+                        <group string="Latitude and Longitude">
+                            <div class="oe_title">
+                                <h3 class="oe_inline">
                                     <span class="oe_grey">( </span>
-                                    <field name="partner_latitude" nolabel="1" class="oe_inline"/>
+                                    <field name="partner_latitude" nolabel="1" readonly="1" class="oe_inline" />
                                     <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&lt;=',0)]}">N </span>
                                     <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&gt;=',0)]}">S </span>
-                                    <field name="partner_longitude"  class="oe_inline" nolabel="1"/>
+                                    <field name="partner_longitude" class="oe_inline" readonly="1" nolabel="1" />
                                     <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&lt;=',0)]}">E </span>
                                     <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&gt;=',0)]}">W </span>
                                     <span class="oe_grey">) </span>
-	                                <button
-	                                string="Calculate Geo Localize"
-	                                name="geo_localize"
-	                                colspan="2"
-	                                class="oe_link oe_inline"
-	                                type="object"/>
-                                    </h3>
-	                                 </div>
-	                                </group>
-                  
-
-                    <newline/>
-                     <separator string="Forwarded Leads" colspan="2"/>
-                    <field name="opportunity_assigned_ids" colspan="4" nolabel="1">
-                         <tree string="Assigned Opportunities"  colors="blue:state=='pending';gray:state=='cancel'">
-                             <field name="name"/>
-                             <field name="contact_name"/>
-                             <field name="email_from"/>
-                             <field name="phone"/>
-                             <field name="stage_id"/>
-                             <field name="state" invisible="1"/>
-                         </tree>
-                    </field>
-                </page>
-            </xpath>
-        </field>
-    </record>
-
+                                    <button string="Calculate Geo Localize" name="geo_localize" colspan="2" class="oe_link oe_inline" type="object" />
+                                </h3>
+                            </div>
+                        </group>
+                        <newline />
+                        <separator string="Forwarded Leads" colspan="2" />
+                        <field name="opportunity_assigned_ids" colspan="4" nolabel="1">
+                            <tree string="Assigned Opportunities" colors="blue:state=='pending';gray:state=='cancel'">
+                                <field name="name" />
+                                <field name="contact_name" />
+                                <field name="email_from" />
+                                <field name="phone" />
+                                <field name="stage_id" />
+                                <field name="state" invisible="1" />
+                            </tree>
+                        </field>
+                    </page>
+                </xpath>
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 9d1a325a8bd..d92bb042f9e 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -74,6 +74,10 @@ class crm_lead_forward_to_partner(osv.TransientModel):
             if active_ids:
                 lead_obj.write(cr, uid, active_ids, {'partner_assigned_id': record[0].partner_id.id , 'user_id': record[0].partner_id.user_id.id})
         else:
+            for lead in record[0].assignation_lines:
+                if not lead.partner_assigned_id:
+                    raise osv.except_osv(_('Assignation Error'),
+                             _('Some leads have not been assigned to any partner so assign partners manualy'))
             for lead in record[0].assignation_lines:
                 self.write(cr, uid, ids, {'partner_id':lead.partner_assigned_id.id,
                                           'lead_single_link': lead.lead_link,
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 7ba5aa04800..3cf2b96a956 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-
         <record model="ir.ui.view" id="crm_lead_forward_to_partner_form">
             <field name="name">crm_lead_forward_to_partner</field>
             <field name="model">crm.lead.forward.to.partner</field>
@@ -12,7 +11,7 @@
                     </group>
                     <group>
                         <group>
-                            <field name="partner_id" attrs="{'invisible': [('forward_type', 'in', ['assigned',False])]}"/>
+                            <field name="partner_id" attrs="{'invisible': [('forward_type', 'in', ['assigned',False])], 'required': [('forward_type', '=', 'single')]}"  />
                         </group>
                         <group>
                         </group>
@@ -26,10 +25,11 @@
                             <field name="partner_assigned_id"/>
                         </tree>
                     </field>
-                    <field name="show_mail"/><label for="show_mail"/>
+                    <field name="show_mail" />
+                    <label for="show_mail" />
                     <notebook colspan="4" attrs="{'invisible': [('show_mail', '=', False)]}">
                         <page string="Body">
-                            <field name="body"  readonly="1"/>
+                            <field name="body" readonly="1"/>
                         </page>
                     </notebook>
                     <footer>
@@ -50,14 +50,10 @@
             <field name="target">new</field>
         </record>
 
-        <act_window id="action_crm_send_mass_forward"
-            multi="True"
-            key2="client_action_multi" name="Forward to Partner"
-            res_model="crm.lead.forward.to.partner" src_model="crm.lead"
-            view_mode="form" target="new" view_type="form"
-            context="{'default_composition_mode' : 'mass_mail'}"
-            view_id="crm_lead_forward_to_partner_form"
-        />
+        <act_window id="action_crm_send_mass_forward" multi="True"
+            key2="client_action_multi" name="Forward to Partner" res_model="crm.lead.forward.to.partner"
+            src_model="crm.lead" view_mode="form" target="new" view_type="form"
+            context="{'default_composition_mode' : 'mass_mail'}" view_id="crm_lead_forward_to_partner_form" />
 
     </data>
 </openerp>

From 76e04a8ea07b02902cab784d2d4ee39106772a5d Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 11 Jun 2013 18:38:51 +0200
Subject: [PATCH 05/94] added noauth and nodb

bzr revid: nicolas.vanhoren@openerp.com-20130611163851-okd35aitcj4jnh5i
---
 addons/web/http.py    | 62 ++++++++++++++++++++++++++++++++++---------
 addons/web/session.py | 27 ++++++++++++++-----
 2 files changed, 70 insertions(+), 19 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 2dc41c8cad9..20431eb4233 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -83,10 +83,13 @@ class WebRequest(object):
 
         ``bool``, indicates whether the debug mode is active on the client
     """
-    def __init__(self, request):
-        self.httprequest = request
+    def __init__(self, httprequest, method):
+        self.httprequest = httprequest
         self.httpresponse = None
-        self.httpsession = request.session
+        self.httpsession = httprequest.session
+        self.db = None
+        self.uid = None
+        self.method = method
 
     def init(self, params):
         self.params = dict(params)
@@ -97,6 +100,9 @@ class WebRequest(object):
             self.session = session.OpenERPSession()
             self.httpsession[self.session_id] = self.session
 
+        self.authenticate()
+
+        # TODO: remove this shit
         # set db/uid trackers - they're cleaned up at the WSGI
         # dispatching phase in openerp.service.wsgi_server.application
         if self.session._db:
@@ -121,12 +127,38 @@ class WebRequest(object):
         # we use _ as seprator where RFC2616 uses '-'
         self.lang = lang.replace('-', '_')
 
+    def authenticate(self):
+        if self.method.auth == "nodb":
+            self.db = None
+            self.uid = None
+        elif self.method.auth == "noauth":
+            self.db = (self.session._db or openerp.addons.web.controllers.main.db_monodb(self)).lower()
+            self.uid = None
+        else:
+            self.session.check_security()
+            self.db = self.session._db
+            self.uid = self.session_uid
+
+    def registry(self):
+        return openerp.modules.registry.RegistryManager.get(self.db)
+
+    @contextlib.contextmanager
+    def cr(self):
+        with registry.cursor() as cr:
+            yield cr
+
     @contextlib.contextmanager
     def registry_cr(self):
-        dbname = self.session._db or openerp.addons.web.controllers.main.db_monodb(self)
-        registry = openerp.modules.registry.RegistryManager.get(dbname.lower())
-        with registry.cursor() as cr:
-            yield (registry, cr)
+        with self.cr() as cr:
+            yield (self.registry(), cr)
+
+def noauth(f):
+    f.auth = "noauth"
+    return f
+
+def nodb(f):
+    f.auth = "nodb"
+    return f
 
 def reject_nonliteral(dct):
     if '__ref' in dct:
@@ -167,13 +199,14 @@ class JsonRequest(WebRequest):
            "id": null}
 
     """
-    def dispatch(self, method):
+    def dispatch(self):
         """ Calls the method asked for by the JSON-RPC2 or JSONP request
 
         :param method: the method which received the request
 
         :returns: an utf8 encoded JSON-RPC2 or JSONP reply
         """
+        method = self.method
         args = self.httprequest.args
         jsonp = args.get('jsonp')
         requestf = None
@@ -291,7 +324,8 @@ def jsonrequest(f):
 class HttpRequest(WebRequest):
     """ Regular GET/POST request
     """
-    def dispatch(self, method):
+    def dispatch(self):
+        method = self.method
         params = dict(self.httprequest.args)
         params.update(self.httprequest.form)
         params.update(self.httprequest.files)
@@ -658,20 +692,22 @@ class Root(object):
                     method = getattr(c, method_name, None)
                     if method:
                         exposed = getattr(method, 'exposed', False)
+                        auth = getattr(method, 'auth', None)
                         method = c.get_wrapped_method(method_name)
+                        method.auth = auth
                         if exposed == 'json':
                             _logger.debug("Dispatch json to %s %s %s", ps, c, method_name)
                             def fct(_request):
-                                _req = JsonRequest(_request)
+                                _req = JsonRequest(_request, method)
                                 with set_request(_req):
-                                    return request.dispatch(method)
+                                    return request.dispatch()
                             return fct
                         elif exposed == 'http':
                             _logger.debug("Dispatch http to %s %s %s", ps, c, method_name)
                             def fct(_request):
-                                _req = HttpRequest(_request)
+                                _req = HttpRequest(_request, method)
                                 with set_request(_req):
-                                    return request.dispatch(method)
+                                    return request.dispatch()
                             return fct
                     if method_name != "index":
                         method_name = "index"
diff --git a/addons/web/session.py b/addons/web/session.py
index 13c3bc7cb94..9568da261f0 100644
--- a/addons/web/session.py
+++ b/addons/web/session.py
@@ -20,6 +20,7 @@ class AuthenticationError(Exception):
 class SessionExpiredException(Exception):
     pass
 
+# deprecated
 class Service(object):
     def __init__(self, session, service_name):
         self.session = session
@@ -31,6 +32,7 @@ class Service(object):
             return result
         return proxy_method
 
+# deprecated
 class Model(object):
     def __init__(self, session, model):
         self.session = session
@@ -84,12 +86,6 @@ class OpenERPSession(object):
         self.context = {}
         self.jsonp_requests = {}     # FIXME use a LRU
 
-    def send(self, service_name, method, *args):
-        return openerp.netsvc.dispatch_rpc(service_name, method, args)
-
-    def proxy(self, service):
-        return Service(self, service)
-
     def bind(self, db, uid, login, password):
         self._db = db
         self._uid = uid
@@ -103,6 +99,21 @@ class OpenERPSession(object):
         if uid: self.get_context()
         return uid
 
+    def check_security(self):
+        import openerp.service.security as security
+        if not self._db or not self._uid:
+            raise SessionExpiredException("Session expired")
+        security.check(self._db, self._uid, self._password)
+
+    #deprecated
+    def send(self, service_name, method, *args):
+        return openerp.netsvc.dispatch_rpc(service_name, method, args)
+
+    #deprecated
+    def proxy(self, service):
+        return Service(self, service)
+
+    #deprecated
     def assert_valid(self, force=False):
         """
         Ensures this session is valid (logged into the openerp server)
@@ -114,6 +125,7 @@ class OpenERPSession(object):
         if not self._uid:
             raise AuthenticationError("Authentication failure")
 
+    #deprecated
     def ensure_valid(self):
         if self._uid:
             try:
@@ -121,16 +133,19 @@ class OpenERPSession(object):
             except Exception:
                 self._uid = None
 
+    #deprecated
     def execute(self, model, func, *l, **d):
         model = self.model(model)
         r = getattr(model, func)(*l, **d)
         return r
 
+    #deprecated
     def exec_workflow(self, model, id, signal):
         self.assert_valid()
         r = self.proxy('object').exec_workflow(self._db, self._uid, self._password, model, signal, id)
         return r
 
+    #deprecated
     def model(self, model):
         """ Get an RPC proxy for the object ``model``, bound to this session.
 

From c6b4e77df4bb29e4057df48f9fed2536f3b4344d Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 11 Jun 2013 18:59:01 +0200
Subject: [PATCH 06/94] Put @nodb on all methods where it is required in
 main.py

bzr revid: nicolas.vanhoren@openerp.com-20130611165901-l1pyzpvpniq41a29
---
 addons/web/controllers/main.py | 25 ++++++++++++++++++++++++-
 addons/web/http.py             | 19 +++++++++++--------
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 8683ef177bc..db0a124f2f4 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -36,7 +36,7 @@ from openerp.tools.translate import _
 from .. import http
 openerpweb = http
 
-from openerp.addons.web.http import request as req
+from openerp.addons.web.http import request as req, noauth, nodb
 
 #----------------------------------------------------------
 # OpenERP Web helpers
@@ -574,6 +574,7 @@ class Home(openerpweb.Controller):
     _cp_path = '/'
 
     @openerpweb.httprequest
+    @nodb
     def index(self, s_action=None, db=None, **kw):
         db, redir = db_monodb_redirect()
         if redir:
@@ -603,18 +604,22 @@ class WebClient(openerpweb.Controller):
     _cp_path = "/web/webclient"
 
     @openerpweb.jsonrequest
+    @nodb
     def csslist(self, mods=None):
         return manifest_list('css', mods=mods)
 
     @openerpweb.jsonrequest
+    @nodb
     def jslist(self, mods=None):
         return manifest_list('js', mods=mods)
 
     @openerpweb.jsonrequest
+    @nodb
     def qweblist(self, mods=None):
         return manifest_list('qweb', mods=mods)
 
     @openerpweb.httprequest
+    @nodb
     def css(self, mods=None, db=None):
         files = list(manifest_glob('css', addons=mods, db=db))
         last_modified = get_last_modified(f[0] for f in files)
@@ -666,6 +671,7 @@ class WebClient(openerpweb.Controller):
             last_modified, checksum)
 
     @openerpweb.httprequest
+    @nodb
     def js(self, mods=None, db=None):
         files = [f[0] for f in manifest_glob('js', addons=mods, db=db)]
         last_modified = get_last_modified(files)
@@ -679,6 +685,7 @@ class WebClient(openerpweb.Controller):
             last_modified, checksum)
 
     @openerpweb.httprequest
+    @nodb
     def qweb(self, mods=None, db=None):
         files = [f[0] for f in manifest_glob('qweb', addons=mods, db=db)]
         last_modified = get_last_modified(files)
@@ -692,6 +699,7 @@ class WebClient(openerpweb.Controller):
             last_modified, checksum)
 
     @openerpweb.jsonrequest
+    @nodb
     def bootstrap_translations(self, mods):
         """ Load local translations from *.po files, as a temporary solution
             until we have established a valid session. This is meant only
@@ -715,6 +723,7 @@ class WebClient(openerpweb.Controller):
                 "lang_parameters": None}
 
     @openerpweb.jsonrequest
+    @nodb
     def translations(self, mods, lang):
         res_lang = req.session.model('res.lang')
         ids = res_lang.search([("code", "=", lang)])
@@ -740,6 +749,7 @@ class WebClient(openerpweb.Controller):
                 "lang_parameters": lang_params}
 
     @openerpweb.jsonrequest
+    @nodb
     def version_info(self):
         return openerp.service.common.exp_version()
 
@@ -747,6 +757,7 @@ class Proxy(openerpweb.Controller):
     _cp_path = '/web/proxy'
 
     @openerpweb.jsonrequest
+    @nodb
     def load(self, path):
         """ Proxies an HTTP request through a JSON request.
 
@@ -765,10 +776,12 @@ class Database(openerpweb.Controller):
     _cp_path = "/web/database"
 
     @openerpweb.jsonrequest
+    @nodb
     def get_list(self):
         return db_list()
 
     @openerpweb.jsonrequest
+    @nodb
     def create(self, fields):
         params = dict(map(operator.itemgetter('name', 'value'), fields))
         return req.session.proxy("db").create_database(
@@ -779,6 +792,7 @@ class Database(openerpweb.Controller):
             params['create_admin_pwd'])
 
     @openerpweb.jsonrequest
+    @nodb
     def duplicate(self, fields):
         params = dict(map(operator.itemgetter('name', 'value'), fields))
         return req.session.proxy("db").duplicate_database(
@@ -787,6 +801,7 @@ class Database(openerpweb.Controller):
             params['db_name'])
 
     @openerpweb.jsonrequest
+    @nodb
     def duplicate(self, fields):
         params = dict(map(operator.itemgetter('name', 'value'), fields))
         duplicate_attrs = (
@@ -798,6 +813,7 @@ class Database(openerpweb.Controller):
         return req.session.proxy("db").duplicate_database(*duplicate_attrs)
 
     @openerpweb.jsonrequest
+    @nodb
     def drop(self, fields):
         password, db = operator.itemgetter(
             'drop_pwd', 'drop_db')(
@@ -811,6 +827,7 @@ class Database(openerpweb.Controller):
             return {'error': _('Could not drop database !'), 'title': _('Drop Database')}
 
     @openerpweb.httprequest
+    @nodb
     def backup(self, backup_db, backup_pwd, token):
         try:
             db_dump = base64.b64decode(
@@ -829,6 +846,7 @@ class Database(openerpweb.Controller):
             return simplejson.dumps([[],[{'error': openerp.tools.ustr(e), 'title': _('Backup Database')}]])
 
     @openerpweb.httprequest
+    @nodb
     def restore(self, db_file, restore_pwd, new_db):
         try:
             data = base64.b64encode(db_file.read())
@@ -838,6 +856,7 @@ class Database(openerpweb.Controller):
             raise Exception("AccessDenied")
 
     @openerpweb.jsonrequest
+    @nodb
     def change_password(self, fields):
         old_password, new_password = operator.itemgetter(
             'old_pwd', 'new_pwd')(
@@ -863,10 +882,12 @@ class Session(openerpweb.Controller):
         }
 
     @openerpweb.jsonrequest
+    @nodb
     def get_session_info(self):
         return self.session_info()
 
     @openerpweb.jsonrequest
+    @nodb
     def authenticate(self, db, login, password, base_location=None):
         wsgienv = req.httprequest.environ
         env = dict(
@@ -907,6 +928,7 @@ class Session(openerpweb.Controller):
             return {"error": e, "title": _("Languages")}
 
     @openerpweb.jsonrequest
+    @nodb
     def modules(self):
         # return all installed modules. Web client is smart enough to not load a module twice
         return module_installed()
@@ -986,6 +1008,7 @@ class Menu(openerpweb.Controller):
         return Menus.search(menu_domain, 0, False, False, req.context)
 
     @openerpweb.jsonrequest
+    @nodb
     def load(self):
         """ Loads all menu items (all applications and their sub-menus).
 
diff --git a/addons/web/http.py b/addons/web/http.py
index 20431eb4233..0d55a12311b 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -83,13 +83,14 @@ class WebRequest(object):
 
         ``bool``, indicates whether the debug mode is active on the client
     """
-    def __init__(self, httprequest, method):
+    def __init__(self, httprequest, method, auth_method=None):
         self.httprequest = httprequest
         self.httpresponse = None
         self.httpsession = httprequest.session
         self.db = None
         self.uid = None
         self.method = method
+        self.auth_method = auth_method
 
     def init(self, params):
         self.params = dict(params)
@@ -128,16 +129,19 @@ class WebRequest(object):
         self.lang = lang.replace('-', '_')
 
     def authenticate(self):
-        if self.method.auth == "nodb":
+        if self.auth_method == "nodb":
             self.db = None
             self.uid = None
-        elif self.method.auth == "noauth":
+        elif self.auth_method == "noauth":
             self.db = (self.session._db or openerp.addons.web.controllers.main.db_monodb(self)).lower()
             self.uid = None
         else:
-            self.session.check_security()
+            try:
+                self.session.check_security()
+            except session.SessionExpiredException, e:
+                raise session.SessionExpiredException("Session expired for request %s" % self.httprequest)
             self.db = self.session._db
-            self.uid = self.session_uid
+            self.uid = self.session._uid
 
     def registry(self):
         return openerp.modules.registry.RegistryManager.get(self.db)
@@ -694,18 +698,17 @@ class Root(object):
                         exposed = getattr(method, 'exposed', False)
                         auth = getattr(method, 'auth', None)
                         method = c.get_wrapped_method(method_name)
-                        method.auth = auth
                         if exposed == 'json':
                             _logger.debug("Dispatch json to %s %s %s", ps, c, method_name)
                             def fct(_request):
-                                _req = JsonRequest(_request, method)
+                                _req = JsonRequest(_request, method, auth)
                                 with set_request(_req):
                                     return request.dispatch()
                             return fct
                         elif exposed == 'http':
                             _logger.debug("Dispatch http to %s %s %s", ps, c, method_name)
                             def fct(_request):
-                                _req = HttpRequest(_request, method)
+                                _req = HttpRequest(_request, method, auth)
                                 with set_request(_req):
                                     return request.dispatch()
                             return fct

From f3bd6b3baf9e569d96dfba0b490c79a152f90ec1 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 11 Jun 2013 18:59:47 +0200
Subject: [PATCH 07/94] Added @nodb where it is required

bzr revid: nicolas.vanhoren@openerp.com-20130611165947-36997uizrxtnore0
---
 addons/auth_signup/controllers/main.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 924e1546862..047e5e38e12 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -23,6 +23,7 @@ import logging
 import openerp
 from openerp.modules.registry import RegistryManager
 from ..res_users import SignupError
+from openerp.addons.web.http import nodb, noauth
 
 _logger = logging.getLogger(__name__)
 
@@ -30,6 +31,7 @@ class Controller(openerp.addons.web.http.Controller):
     _cp_path = '/auth_signup'
 
     @openerp.addons.web.http.jsonrequest
+    @nodb
     def get_config(self, req, dbname):
         """ retrieve the module config (which features are enabled) for the login page """
         registry = RegistryManager.get(dbname)

From b2684b01b0289b9b6370991bb69a56a8f413a8ed Mon Sep 17 00:00:00 2001
From: "Parth Gajjar (Open ERP)" <pga@tinyerp.com>
Date: Wed, 12 Jun 2013 13:05:19 +0530
Subject: [PATCH 08/94] [IMP] Improved Template

bzr revid: pga@tinyerp.com-20130612073519-9tva91agjof11ivl
---
 addons/crm_partner_assign/data/lead_mail_template_data.xml    | 3 ++-
 addons/crm_partner_assign/wizard/crm_forward_to_partner.py    | 4 ++++
 .../crm_partner_assign/wizard/crm_forward_to_partner_view.xml | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/crm_partner_assign/data/lead_mail_template_data.xml b/addons/crm_partner_assign/data/lead_mail_template_data.xml
index 1710b69160e..dac93342f63 100644
--- a/addons/crm_partner_assign/data/lead_mail_template_data.xml
+++ b/addons/crm_partner_assign/data/lead_mail_template_data.xml
@@ -7,6 +7,7 @@
             <field name="auto_delete" eval="True"/>
             <field name="email_to">${object.partner_id.email}</field>
             <field name="email_from">${user.email or ''}</field>
+            <field name="subject">Fwd: Lead: ${object.partner_id.name}</field>
             <field name="body_html"><![CDATA[
             
 Hello ${object.partner_id.name},
@@ -35,7 +36,7 @@ Hello ${object.partner_id.name},
 </b>
 % endif
 </br>
-<blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;">Connect you to your  Partner Portal to see leads details.</blockquote>
+<blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;">Connect you to your <b><a href="${object.get_portal_url()}">Partner Portal</a></b> to see leads details.</blockquote>
 
 </br>   
 Thanks,</br>
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index d92bb042f9e..25849f5a868 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -87,6 +87,10 @@ class crm_lead_forward_to_partner(osv.TransientModel):
                 lead_obj.write(cr, uid, [lead.lead_id.id], {'partner_assigned_id': lead.partner_assigned_id.id, 'user_id': lead.partner_assigned_id.user_id.id})
         return True
     
+    def get_portal_url(self, cr, uid, ids, context=None):
+        portal_link = "%s/?db=%s" % (self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url'), cr.dbname)
+        return portal_link
+    
     _columns = {
         'forward_type':fields.selection([ ('single', 'a single partner: manual selection of partner'), ('assigned', "several partners: automatic assignation, using GPS coordinates and partner's grades"), ], 'Forward selected leads to'),
         'partner_id':fields.many2one('res.partner', 'Forward Leads To'),
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 3cf2b96a956..1a3cf0b06ed 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -53,6 +53,7 @@
         <act_window id="action_crm_send_mass_forward" multi="True"
             key2="client_action_multi" name="Forward to Partner" res_model="crm.lead.forward.to.partner"
             src_model="crm.lead" view_mode="form" target="new" view_type="form"
+            groups="base.group_sale_manager"
             context="{'default_composition_mode' : 'mass_mail'}" view_id="crm_lead_forward_to_partner_form" />
 
     </data>

From f58374357e4ffff72a59cdbb655c9d65f752e7af Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 12 Jun 2013 16:56:47 +0200
Subject: [PATCH 09/94] minor cosmetic improvements

bzr revid: nicolas.vanhoren@openerp.com-20130612145647-5wwy71u6lrm7g744
---
 addons/web/http.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 0d55a12311b..101229d0024 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -83,13 +83,13 @@ class WebRequest(object):
 
         ``bool``, indicates whether the debug mode is active on the client
     """
-    def __init__(self, httprequest, method, auth_method=None):
+    def __init__(self, httprequest, func, auth_method="auth"):
         self.httprequest = httprequest
         self.httpresponse = None
         self.httpsession = httprequest.session
         self.db = None
         self.uid = None
-        self.method = method
+        self.func = func
         self.auth_method = auth_method
 
     def init(self, params):
@@ -135,7 +135,7 @@ class WebRequest(object):
         elif self.auth_method == "noauth":
             self.db = (self.session._db or openerp.addons.web.controllers.main.db_monodb(self)).lower()
             self.uid = None
-        else:
+        else: # auth
             try:
                 self.session.check_security()
             except session.SessionExpiredException, e:
@@ -146,6 +146,7 @@ class WebRequest(object):
     def registry(self):
         return openerp.modules.registry.RegistryManager.get(self.db)
 
+    @property
     @contextlib.contextmanager
     def cr(self):
         with registry.cursor() as cr:
@@ -206,11 +207,11 @@ class JsonRequest(WebRequest):
     def dispatch(self):
         """ Calls the method asked for by the JSON-RPC2 or JSONP request
 
-        :param method: the method which received the request
+        :param func: the func which received the request
 
         :returns: an utf8 encoded JSON-RPC2 or JSONP reply
         """
-        method = self.method
+        func = self.func
         args = self.httprequest.args
         jsonp = args.get('jsonp')
         requestf = None
@@ -245,9 +246,9 @@ class JsonRequest(WebRequest):
                 self.jsonrequest = simplejson.loads(request, object_hook=reject_nonliteral)
             self.init(self.jsonrequest.get("params", {}))
             #if _logger.isEnabledFor(logging.DEBUG):
-            #    _logger.debug("--> %s.%s\n%s", method.im_class.__name__, method.__name__, pprint.pformat(self.jsonrequest))
+            #    _logger.debug("--> %s.%s\n%s", func.im_class.__name__, func.__name__, pprint.pformat(self.jsonrequest))
             response['id'] = self.jsonrequest.get('id')
-            response["result"] = method(**self.params)
+            response["result"] = func(**self.params)
         except session.AuthenticationError, e:
             se = serialize_exception(e)
             error = {
@@ -329,7 +330,7 @@ class HttpRequest(WebRequest):
     """ Regular GET/POST request
     """
     def dispatch(self):
-        method = self.method
+        func = self.func
         params = dict(self.httprequest.args)
         params.update(self.httprequest.form)
         params.update(self.httprequest.files)
@@ -340,9 +341,9 @@ class HttpRequest(WebRequest):
                 akw[key] = value
             else:
                 akw[key] = type(value)
-        #_logger.debug("%s --> %s.%s %r", self.httprequest.method, method.im_class.__name__, method.__name__, akw)
+        #_logger.debug("%s --> %s.%s %r", self.httprequest.func, func.im_class.__name__, func.__name__, akw)
         try:
-            r = method(**self.params)
+            r = func(**self.params)
         except werkzeug.exceptions.HTTPException, e:
             r = e
         except Exception, e:

From 9ee7c3f41a9941a81249c8ed5835883406dc8356 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 13 Jun 2013 11:58:42 +0200
Subject: [PATCH 10/94] added cr property

bzr revid: nicolas.vanhoren@openerp.com-20130613095842-29da30ppr6c06xac
---
 addons/web/http.py | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 101229d0024..c92e2f2244b 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -91,6 +91,7 @@ class WebRequest(object):
         self.uid = None
         self.func = func
         self.auth_method = auth_method
+        self._cr = None
 
     def init(self, params):
         self.params = dict(params)
@@ -101,8 +102,6 @@ class WebRequest(object):
             self.session = session.OpenERPSession()
             self.httpsession[self.session_id] = self.session
 
-        self.authenticate()
-
         # TODO: remove this shit
         # set db/uid trackers - they're cleaned up at the WSGI
         # dispatching phase in openerp.service.wsgi_server.application
@@ -143,19 +142,30 @@ class WebRequest(object):
             self.db = self.session._db
             self.uid = self.session._uid
 
+    @property
     def registry(self):
-        return openerp.modules.registry.RegistryManager.get(self.db)
+        return openerp.modules.registry.RegistryManager.get(self.db) if self.db else None
 
     @property
-    @contextlib.contextmanager
     def cr(self):
-        with registry.cursor() as cr:
-            yield cr
+        return self._cr
 
     @contextlib.contextmanager
     def registry_cr(self):
-        with self.cr() as cr:
-            yield (self.registry(), cr)
+        return (self.registry, cr)
+
+    def call_function(self, *args, **kwargs):
+        self.authenticate()
+        if self.registry:
+            with self.registry.cursor() as cr:
+                self._cr = cr
+                try:
+                    return self.func(*args, **kwargs)
+                finally:
+                    self._cr = None
+        else:
+            return self.func(*args, **kwargs)
+
 
 def noauth(f):
     f.auth = "noauth"
@@ -207,11 +217,8 @@ class JsonRequest(WebRequest):
     def dispatch(self):
         """ Calls the method asked for by the JSON-RPC2 or JSONP request
 
-        :param func: the func which received the request
-
         :returns: an utf8 encoded JSON-RPC2 or JSONP reply
         """
-        func = self.func
         args = self.httprequest.args
         jsonp = args.get('jsonp')
         requestf = None
@@ -248,7 +255,7 @@ class JsonRequest(WebRequest):
             #if _logger.isEnabledFor(logging.DEBUG):
             #    _logger.debug("--> %s.%s\n%s", func.im_class.__name__, func.__name__, pprint.pformat(self.jsonrequest))
             response['id'] = self.jsonrequest.get('id')
-            response["result"] = func(**self.params)
+            response["result"] = self.call_function(**self.params)
         except session.AuthenticationError, e:
             se = serialize_exception(e)
             error = {
@@ -330,7 +337,6 @@ class HttpRequest(WebRequest):
     """ Regular GET/POST request
     """
     def dispatch(self):
-        func = self.func
         params = dict(self.httprequest.args)
         params.update(self.httprequest.form)
         params.update(self.httprequest.files)
@@ -343,7 +349,7 @@ class HttpRequest(WebRequest):
                 akw[key] = type(value)
         #_logger.debug("%s --> %s.%s %r", self.httprequest.func, func.im_class.__name__, func.__name__, akw)
         try:
-            r = func(**self.params)
+            r = self.call_function(**self.params)
         except werkzeug.exceptions.HTTPException, e:
             r = e
         except Exception, e:

From 4cc12c7f44325b4d1f271b82d033cf8d7cb45248 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 13 Jun 2013 12:07:43 +0200
Subject: [PATCH 11/94] Made cr lazy

bzr revid: nicolas.vanhoren@openerp.com-20130613100743-m5tcv0anibiw820f
---
 addons/web/http.py | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index c92e2f2244b..f54488c13e7 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -148,23 +148,39 @@ class WebRequest(object):
 
     @property
     def cr(self):
+        # some magic to lazy create the cr
+        if not self._cr:
+            self._cr = self.registry.cursor()
+            self._cr.__enter__()
         return self._cr
 
+    #TODO: remove
     @contextlib.contextmanager
     def registry_cr(self):
         return (self.registry, cr)
 
-    def call_function(self, *args, **kwargs):
+    def _call_function(self, *args, **kwargs):
         self.authenticate()
-        if self.registry:
-            with self.registry.cursor() as cr:
-                self._cr = cr
-                try:
+        try:
+            if self.registry:
+                # ugly syntax only to get the __exit__ arguments to pass to self._cr
+                request = self
+                class with_obj(object):
+                    def __enter__(self):
+                        pass
+                    def __exit__(self, *args):
+                        if request._cr:
+                            request._cr.__exit__(*args)
+                            request._cr = None
+
+                with with_obj():
                     return self.func(*args, **kwargs)
-                finally:
-                    self._cr = None
-        else:
-            return self.func(*args, **kwargs)
+            else:
+                return self.func(*args, **kwargs)
+        finally:
+            # just to be sure no one tries to re-use the request
+            self.db = None
+            self.uid = None
 
 
 def noauth(f):
@@ -255,7 +271,7 @@ class JsonRequest(WebRequest):
             #if _logger.isEnabledFor(logging.DEBUG):
             #    _logger.debug("--> %s.%s\n%s", func.im_class.__name__, func.__name__, pprint.pformat(self.jsonrequest))
             response['id'] = self.jsonrequest.get('id')
-            response["result"] = self.call_function(**self.params)
+            response["result"] = self._call_function(**self.params)
         except session.AuthenticationError, e:
             se = serialize_exception(e)
             error = {
@@ -349,7 +365,7 @@ class HttpRequest(WebRequest):
                 akw[key] = type(value)
         #_logger.debug("%s --> %s.%s %r", self.httprequest.func, func.im_class.__name__, func.__name__, akw)
         try:
-            r = self.call_function(**self.params)
+            r = self._call_function(**self.params)
         except werkzeug.exceptions.HTTPException, e:
             r = e
         except Exception, e:
@@ -703,7 +719,7 @@ class Root(object):
                     method = getattr(c, method_name, None)
                     if method:
                         exposed = getattr(method, 'exposed', False)
-                        auth = getattr(method, 'auth', None)
+                        auth = getattr(method, 'auth', "auth")
                         method = c.get_wrapped_method(method_name)
                         if exposed == 'json':
                             _logger.debug("Dispatch json to %s %s %s", ps, c, method_name)

From 50a5a612dae47a2075dbce11c9573ab82e28e830 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 13 Jun 2013 13:00:05 +0200
Subject: [PATCH 12/94] Now uses request.cr for Model

bzr revid: nicolas.vanhoren@openerp.com-20130613110005-idverfbs9xe6l32w
---
 addons/web/controllers/main.py |  4 ----
 addons/web/http.py             | 14 +++++++++-----
 addons/web/session.py          | 11 ++++++++++-
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index db0a124f2f4..2e470314ec3 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -723,7 +723,6 @@ class WebClient(openerpweb.Controller):
                 "lang_parameters": None}
 
     @openerpweb.jsonrequest
-    @nodb
     def translations(self, mods, lang):
         res_lang = req.session.model('res.lang')
         ids = res_lang.search([("code", "=", lang)])
@@ -882,7 +881,6 @@ class Session(openerpweb.Controller):
         }
 
     @openerpweb.jsonrequest
-    @nodb
     def get_session_info(self):
         return self.session_info()
 
@@ -928,7 +926,6 @@ class Session(openerpweb.Controller):
             return {"error": e, "title": _("Languages")}
 
     @openerpweb.jsonrequest
-    @nodb
     def modules(self):
         # return all installed modules. Web client is smart enough to not load a module twice
         return module_installed()
@@ -1008,7 +1005,6 @@ class Menu(openerpweb.Controller):
         return Menus.search(menu_domain, 0, False, False, req.context)
 
     @openerpweb.jsonrequest
-    @nodb
     def load(self):
         """ Loads all menu items (all applications and their sub-menus).
 
diff --git a/addons/web/http.py b/addons/web/http.py
index f54488c13e7..c09321693aa 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -91,6 +91,7 @@ class WebRequest(object):
         self.uid = None
         self.func = func
         self.auth_method = auth_method
+        self._cr_cm = None
         self._cr = None
 
     def init(self, params):
@@ -149,9 +150,9 @@ class WebRequest(object):
     @property
     def cr(self):
         # some magic to lazy create the cr
-        if not self._cr:
-            self._cr = self.registry.cursor()
-            self._cr.__enter__()
+        if not self._cr_cm:
+            self._cr_cm = self.registry.cursor()
+            self._cr = self._cr_cm.__enter__()
         return self._cr
 
     #TODO: remove
@@ -169,8 +170,9 @@ class WebRequest(object):
                     def __enter__(self):
                         pass
                     def __exit__(self, *args):
-                        if request._cr:
-                            request._cr.__exit__(*args)
+                        if request._cr_cm:
+                            request._cr_cm.__exit__(*args)
+                            request._cr_cm = None
                             request._cr = None
 
                 with with_obj():
@@ -273,6 +275,7 @@ class JsonRequest(WebRequest):
             response['id'] = self.jsonrequest.get('id')
             response["result"] = self._call_function(**self.params)
         except session.AuthenticationError, e:
+            _logger.exception("Exception during JSON request handling.")
             se = serialize_exception(e)
             error = {
                 'code': 100,
@@ -280,6 +283,7 @@ class JsonRequest(WebRequest):
                 'data': se
             }
         except Exception, e:
+            _logger.exception("Exception during JSON request handling.")
             se = serialize_exception(e)
             error = {
                 'code': 200,
diff --git a/addons/web/session.py b/addons/web/session.py
index 9568da261f0..05749d35ee3 100644
--- a/addons/web/session.py
+++ b/addons/web/session.py
@@ -8,6 +8,7 @@ import traceback
 import sys
 
 import openerp
+import http
 
 _logger = logging.getLogger(__name__)
 
@@ -42,7 +43,15 @@ class Model(object):
     def __getattr__(self, method):
         self.session.assert_valid()
         def proxy(*args, **kw):
-            result = self.proxy.execute_kw(self.session._db, self.session._uid, self.session._password, self.model, method, args, kw)
+            # Can't provide any retro-compatibility for this case, so we check it and raise an Exception
+            # to tell the programmer to adapt his code
+            if self.session._db != http.request.db or self.session._uid != http.request.uid:
+                raise Exception("Trying to use Model with badly configured database or user.")
+                
+            mod = http.request.registry.get(self.model)
+            meth = getattr(mod, method)
+            cr = http.request.cr
+            result = meth(cr, http.request.uid, *args, **kw)
             # reorder read
             if method == "read":
                 if isinstance(result, list) and len(result) > 0 and "id" in result[0]:

From 1c0282d09d4e5d192fe44fcacd846b31f1459306 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 13 Jun 2013 13:20:27 +0200
Subject: [PATCH 13/94] fixed lot of problem with nodb

bzr revid: nicolas.vanhoren@openerp.com-20130613112027-1fps4v7h6zx5omo0
---
 addons/web/controllers/main.py |  4 ++++
 addons/web/http.py             | 27 ++++++++++++---------------
 addons/web/session.py          |  2 ++
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 2e470314ec3..697db75797d 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -881,7 +881,10 @@ class Session(openerpweb.Controller):
         }
 
     @openerpweb.jsonrequest
+    @nodb
     def get_session_info(self):
+        req.uid = req.session._uid
+        req.db = req.session._db
         return self.session_info()
 
     @openerpweb.jsonrequest
@@ -1382,6 +1385,7 @@ class Binary(openerpweb.Controller):
         return out % (simplejson.dumps(callback), simplejson.dumps(args))
 
     @openerpweb.httprequest
+    @nodb
     def company_logo(self, dbname=None):
         # TODO add etag, refactor to use /image code for etag
         uid = None
diff --git a/addons/web/http.py b/addons/web/http.py
index c09321693aa..d9ee06a201e 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -158,26 +158,23 @@ class WebRequest(object):
     #TODO: remove
     @contextlib.contextmanager
     def registry_cr(self):
-        return (self.registry, cr)
+        return (self.registry, self.cr)
 
     def _call_function(self, *args, **kwargs):
         self.authenticate()
         try:
-            if self.registry:
-                # ugly syntax only to get the __exit__ arguments to pass to self._cr
-                request = self
-                class with_obj(object):
-                    def __enter__(self):
-                        pass
-                    def __exit__(self, *args):
-                        if request._cr_cm:
-                            request._cr_cm.__exit__(*args)
-                            request._cr_cm = None
-                            request._cr = None
+            # ugly syntax only to get the __exit__ arguments to pass to self._cr
+            request = self
+            class with_obj(object):
+                def __enter__(self):
+                    pass
+                def __exit__(self, *args):
+                    if request._cr_cm:
+                        request._cr_cm.__exit__(*args)
+                        request._cr_cm = None
+                        request._cr = None
 
-                with with_obj():
-                    return self.func(*args, **kwargs)
-            else:
+            with with_obj():
                 return self.func(*args, **kwargs)
         finally:
             # just to be sure no one tries to re-use the request
diff --git a/addons/web/session.py b/addons/web/session.py
index 05749d35ee3..fa5b83b6892 100644
--- a/addons/web/session.py
+++ b/addons/web/session.py
@@ -104,6 +104,8 @@ class OpenERPSession(object):
     def authenticate(self, db, login, password, env=None):
         uid = self.proxy('common').authenticate(db, login, password, env)
         self.bind(db, uid, login, password)
+        http.request.db = db
+        http.request.uid = uid
 
         if uid: self.get_context()
         return uid

From 8fe3da4d557252f77c65ca4a7340916f380f91d0 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 13 Jun 2013 13:25:17 +0200
Subject: [PATCH 14/94] cosmetic

bzr revid: nicolas.vanhoren@openerp.com-20130613112517-90hwu5l6h3c2dvsd
---
 addons/web/session.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/session.py b/addons/web/session.py
index fa5b83b6892..56f2da9c582 100644
--- a/addons/web/session.py
+++ b/addons/web/session.py
@@ -111,9 +111,9 @@ class OpenERPSession(object):
         return uid
 
     def check_security(self):
-        import openerp.service.security as security
         if not self._db or not self._uid:
             raise SessionExpiredException("Session expired")
+        import openerp.service.security as security
         security.check(self._db, self._uid, self._password)
 
     #deprecated

From 085d34bec3e24c0479ed78548d5da17b6623d6b3 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 13 Jun 2013 13:32:03 +0200
Subject: [PATCH 15/94] some polish in session.py

bzr revid: nicolas.vanhoren@openerp.com-20130613113203-w0vralvme3coz0sf
---
 addons/web/session.py | 73 +++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 38 deletions(-)

diff --git a/addons/web/session.py b/addons/web/session.py
index 56f2da9c582..0dbda02352d 100644
--- a/addons/web/session.py
+++ b/addons/web/session.py
@@ -95,15 +95,12 @@ class OpenERPSession(object):
         self.context = {}
         self.jsonp_requests = {}     # FIXME use a LRU
 
-    def bind(self, db, uid, login, password):
+    def authenticate(self, db, login, password, env=None):
+        uid = openerp.netsvc.dispatch_rpc('common', 'authenticate', [db, login, password, env])
         self._db = db
         self._uid = uid
         self._login = login
         self._password = password
-
-    def authenticate(self, db, login, password, env=None):
-        uid = self.proxy('common').authenticate(db, login, password, env)
-        self.bind(db, uid, login, password)
         http.request.db = db
         http.request.uid = uid
 
@@ -116,6 +113,39 @@ class OpenERPSession(object):
         import openerp.service.security as security
         security.check(self._db, self._uid, self._password)
 
+    def get_context(self):
+        """ Re-initializes the current user's session context (based on
+        his preferences) by calling res.users.get_context() with the old
+        context
+
+        :returns: the new context
+        """
+        assert self._uid, "The user needs to be logged-in to initialize his context"
+        self.context = http.request.registry.get('res.users').context_get(http.request.cr, http.request.uid) or {}
+        self.context['uid'] = self._uid
+        self._fix_lang(self.context)
+        return self.context
+
+    def _fix_lang(self, context):
+        """ OpenERP provides languages which may not make sense and/or may not
+        be understood by the web client's libraries.
+
+        Fix those here.
+
+        :param dict context: context to fix
+        """
+        lang = context['lang']
+
+        # inane OpenERP locale
+        if lang == 'ar_AR':
+            lang = 'ar'
+
+        # lang to lang_REGION (datejs only handles lang_REGION, no bare langs)
+        if lang in babel.core.LOCALE_ALIASES:
+            lang = babel.core.LOCALE_ALIASES[lang]
+
+        context['lang'] = lang or 'en_US'
+
     #deprecated
     def send(self, service_name, method, *args):
         return openerp.netsvc.dispatch_rpc(service_name, method, args)
@@ -169,37 +199,4 @@ class OpenERPSession(object):
 
         return Model(self, model)
 
-    def get_context(self):
-        """ Re-initializes the current user's session context (based on
-        his preferences) by calling res.users.get_context() with the old
-        context
-
-        :returns: the new context
-        """
-        assert self._uid, "The user needs to be logged-in to initialize his context"
-        self.context = self.model('res.users').context_get() or {}
-        self.context['uid'] = self._uid
-        self._fix_lang(self.context)
-        return self.context
-
-    def _fix_lang(self, context):
-        """ OpenERP provides languages which may not make sense and/or may not
-        be understood by the web client's libraries.
-
-        Fix those here.
-
-        :param dict context: context to fix
-        """
-        lang = context['lang']
-
-        # inane OpenERP locale
-        if lang == 'ar_AR':
-            lang = 'ar'
-
-        # lang to lang_REGION (datejs only handles lang_REGION, no bare langs)
-        if lang in babel.core.LOCALE_ALIASES:
-            lang = babel.core.LOCALE_ALIASES[lang]
-
-        context['lang'] = lang or 'en_US'
-
 # vim:et:ts=4:sw=4:

From 2c959246b762ffe18cd1cfa028f1335fc9889f84 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 13 Jun 2013 13:34:58 +0200
Subject: [PATCH 16/94] even more security

bzr revid: nicolas.vanhoren@openerp.com-20130613113458-2ww1cbb9q5nz6ayk
---
 addons/web/session.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/session.py b/addons/web/session.py
index 0dbda02352d..a0c924975ca 100644
--- a/addons/web/session.py
+++ b/addons/web/session.py
@@ -45,7 +45,8 @@ class Model(object):
         def proxy(*args, **kw):
             # Can't provide any retro-compatibility for this case, so we check it and raise an Exception
             # to tell the programmer to adapt his code
-            if self.session._db != http.request.db or self.session._uid != http.request.uid:
+            if not http.request.db or not http.request.uid or self.session._db != http.request.db \
+                or self.session._uid != http.request.uid:
                 raise Exception("Trying to use Model with badly configured database or user.")
                 
             mod = http.request.registry.get(self.model)

From 787cb04b2dba0276e2bedcd239b9e62aa9fd08b1 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 13 Jun 2013 13:40:30 +0200
Subject: [PATCH 17/94] wip

bzr revid: nicolas.vanhoren@openerp.com-20130613114030-hmrc7881jp8ctjic
---
 addons/web/session.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/session.py b/addons/web/session.py
index a0c924975ca..b51c540aec5 100644
--- a/addons/web/session.py
+++ b/addons/web/session.py
@@ -29,7 +29,7 @@ class Service(object):
 
     def __getattr__(self, method):
         def proxy_method(*args):
-            result = self.session.send(self.service_name, method, *args)
+            result = openerp.netsvc.dispatch_rpc(self.service_name, method, args)
             return result
         return proxy_method
 

From 20c0e6fbb7e6494bdaeb13d4b5b20a1d05e31a27 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 13 Jun 2013 13:44:21 +0200
Subject: [PATCH 18/94] fixed get_lang_list

bzr revid: nicolas.vanhoren@openerp.com-20130613114421-hv3rgj0rxghpwlgp
---
 addons/web/controllers/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 697db75797d..361db5567e3 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -922,6 +922,7 @@ class Session(openerpweb.Controller):
             req.session._uid, "ir.ui.menu", req.context)
 
     @openerpweb.jsonrequest
+    @nodb
     def get_lang_list(self):
         try:
             return req.session.proxy("db").list_lang() or []

From ef6779f484a3b8251c88050c8cf0a008360a025a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 13 Jun 2013 16:03:43 +0200
Subject: [PATCH 19/94] Added some doc

bzr revid: nicolas.vanhoren@openerp.com-20130613140343-hjvlc697eimgcb55
---
 addons/web/doc/index.rst           | 37 +++++++++----
 addons/web/doc/web_controllers.rst | 85 ++++++++++++++++++++++++++++++
 2 files changed, 112 insertions(+), 10 deletions(-)
 create mode 100644 addons/web/doc/web_controllers.rst

diff --git a/addons/web/doc/index.rst b/addons/web/doc/index.rst
index 7127bb975ed..650c12f55ec 100644
--- a/addons/web/doc/index.rst
+++ b/addons/web/doc/index.rst
@@ -6,32 +6,49 @@
 Welcome to OpenERP Web's documentation!
 =======================================
 
-Contents:
+Basics
+------
 
 .. toctree::
     :maxdepth: 1
 
     module
-    widget
+    changelog-7.0
 
+Server-Side Web Framework
+-------------------------
 
-    async
-    rpc
-    qweb
-    client_action
+.. toctree::
+    :maxdepth: 1
+
+    web_controllers
+
+Javascript
+----------
+
+.. toctree::
+    :maxdepth: 1
 
     guidelines
-
+    widget
+    rpc
+    async
+    qweb
+    client_action
     testing
 
+Views
+-----
+
+.. toctree::
+    :maxdepth: 1
+
     search_view
     list_view
     form_view
 
-    changelog-7.0
-
 Indices and tables
-==================
+------------------
 
 * :ref:`genindex`
 * :ref:`modindex`
diff --git a/addons/web/doc/web_controllers.rst b/addons/web/doc/web_controllers.rst
new file mode 100644
index 00000000000..4694b72070f
--- /dev/null
+++ b/addons/web/doc/web_controllers.rst
@@ -0,0 +1,85 @@
+
+Web Controllers
+===============
+
+Web controllers are classes in OpenERP able to catch the http requests sent by any browser. They allow to generate
+html pages to be served like any web server, implement new methods to be used by the Javascript client, etc...
+
+Controllers File
+----------------
+
+By convention the controllers should be placed in the controllers directory of the module. Example:
+
+.. code-block:: text
+
+    web_example
+    ├── controllers
+    │   ├── __init__.py
+    │   └── my_controllers.py
+    ├── __init__.py
+    └── __openerp__.py
+
+In ``__init__.py`` you must add:
+
+::
+
+    import controllers
+
+And here is the content of ``controllers/__init__.py``:
+
+::
+    
+    import my_controllers
+
+Now you can put the following content in ``controllers/my_controllers.py``:
+
+::
+
+    import openerp.addons.web.http as http
+    from openerp.addons.web.http import request
+
+
+Controller Declaration
+----------------------
+
+In your controllers file, you can now declare a controller this way:
+
+::
+
+    class MyController(http.Controller):
+        _cp_path = '/my_url'
+
+        @http.httprequest
+        def some_html(self):
+            return "<h1>This is a test</h1>"
+
+        @http.jsonrequest
+        def some_json(self):
+            return {"sample_dictionary": "This is a sample JSON dictionary"}
+
+A controller must inherit from ``http.Controller``. When defining a controller, you must define the url it will match.
+This is the ``_cp_path`` class attribute.
+
+Each time you define a method with ``@http.httprequest`` or ``@http.jsonrequest`` it defines a new part of url to
+match. As example, the ``some_html()`` method will be called a client query the ``/my_url/some_html`` url.
+
+If you want to match precisely the ``/my_url`` url, you must a define a method called ``index``. This is an exception
+compared to other methods:
+
+::
+
+    @http.httprequest
+    def index(self):
+        return "<div>This is the /my_url</div>"
+
+Pure HTTP Requests
+------------------
+
+You can define methods to get any requests using the ``@http.httprequest`` decorator. When doing so, you get the
+HTTP parameters as named parameters of the method:
+
+::
+
+    @http.httprequest
+    def some_html(self, name):
+        return "<h1>You name is %s</h1>" % name

From d6c89cdb7c7f9770f2e0c92ffd0b9670e49cb588 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 13 Jun 2013 16:04:18 +0200
Subject: [PATCH 20/94] Implemented jsonrpc method

bzr revid: nicolas.vanhoren@openerp.com-20130613140418-2i1qsb6jykhx5jaz
---
 addons/web/controllers/main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 361db5567e3..d2f425e0c49 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -596,9 +596,10 @@ class Home(openerpweb.Controller):
         return login_and_redirect(db, login, key)
 
     @openerpweb.jsonrequest
+    @nodb
     def jsonrpc(self, service, method, args):
         """ Method used by client APIs to contact OpenERP. """
-        return getattr(req.session.proxy(service), method)(*args)
+        return openerp.netsvc.dispatch_rpc(service, method, args)
 
 class WebClient(openerpweb.Controller):
     _cp_path = "/web/webclient"

From 7c916c593653fae8f32203b17dc6efdd018c204e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 13 Jun 2013 16:27:17 +0200
Subject: [PATCH 21/94] added doc

bzr revid: nicolas.vanhoren@openerp.com-20130613142717-nj3ox24vip56buc0
---
 addons/web/doc/web_controllers.rst | 56 ++++++++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 2 deletions(-)

diff --git a/addons/web/doc/web_controllers.rst b/addons/web/doc/web_controllers.rst
index 4694b72070f..32b49f768ee 100644
--- a/addons/web/doc/web_controllers.rst
+++ b/addons/web/doc/web_controllers.rst
@@ -81,5 +81,57 @@ HTTP parameters as named parameters of the method:
 ::
 
     @http.httprequest
-    def some_html(self, name):
-        return "<h1>You name is %s</h1>" % name
+    def say_hello(self, name):
+        return "<h1>Hello %s</h1>" % name
+
+This url could be contacted by typing this url in a browser: ``http://localhost:8069/my_url/say_hello?name=Nicolas``.
+
+JSON Requests
+-------------
+
+The ``@http.jsonrequest`` decorator is used to define JSON requests. The OpenERP Javascript client can contact these
+methods using the JSON-RPC protocol. JSON methods must return JSON. Like the HTTP methods they receive arguments
+as named parameters (except these arguments are JSON-RPC parameters).
+
+::
+
+    @http.jsonrequest
+    def division(self, i, j):
+        return i / j # returns a number
+
+Contacting Models
+-----------------
+
+To use the database you must access the OpenERP models. The global ``request`` object provides the necessary objects:
+
+::
+
+    @http.httprequest
+    def my_name(self):
+        my_user_record = request.registry.get("res.users").browse(request.cr, request.uid, request.ui)
+        return "<h1>Your name is %s</h1>" % my_user_record.name
+
+``request.registry`` is the registry that gives you access to the models. It is the equivalent of ``self.pool`` when
+working inside OpenERP models.
+
+``request.cr`` is the cursor object. This is the ``cr`` parameter you have to pass as first argument of every model
+method in OpenERP.
+
+``request.uid`` is the id of the current logged in user. This is the ``uid`` parameter you have to pass as second
+argument of every model method in OpenERP.
+
+Authorization Levels
+--------------------
+
+By default, all methods can only be used by users logged into OpenERP (OpenERP uses cookies to track logged users).
+There are some cases when you need to enable not-logged in users to access some methods. To do so, add the
+``http.noauth`` decorator to your method:
+
+::
+
+    @http.httprequest
+    @http.noauth
+    def hello(self):
+        return "<div>Hello unknown user!</div>"
+
+Please note the ``request.cr`` cursor will not be available in this case.

From 1e70a1f2e11e6926644dfb4b87a6b9f1213aee88 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 13 Jun 2013 16:27:38 +0200
Subject: [PATCH 22/94] fix bug with monodb

bzr revid: nicolas.vanhoren@openerp.com-20130613142738-s4zp2b89xlxoaot4
---
 addons/web/http.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index d9ee06a201e..42ba0c2e35f 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -133,7 +133,7 @@ class WebRequest(object):
             self.db = None
             self.uid = None
         elif self.auth_method == "noauth":
-            self.db = (self.session._db or openerp.addons.web.controllers.main.db_monodb(self)).lower()
+            self.db = (self.session._db or openerp.addons.web.controllers.main.db_monodb()).lower()
             self.uid = None
         else: # auth
             try:

From 213a1a53a346595a3b603a100fdd4ff4fa2ffeb1 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 13 Jun 2013 16:29:28 +0200
Subject: [PATCH 23/94] doc

bzr revid: nicolas.vanhoren@openerp.com-20130613142928-8z4ivvhb9jjm5gxc
---
 addons/web/doc/web_controllers.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/doc/web_controllers.rst b/addons/web/doc/web_controllers.rst
index 32b49f768ee..6c0137e8282 100644
--- a/addons/web/doc/web_controllers.rst
+++ b/addons/web/doc/web_controllers.rst
@@ -134,4 +134,5 @@ There are some cases when you need to enable not-logged in users to access some
     def hello(self):
         return "<div>Hello unknown user!</div>"
 
-Please note the ``request.cr`` cursor will not be available in this case.
+Please note the ``request.uid`` user id will be ``None`` inside this method call. This is due to the fact no user was
+authenticated.

From 03d32a781f0f03ee97feb60bbd0b23cb90ff3083 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 13 Jun 2013 16:36:01 +0200
Subject: [PATCH 24/94] [FIX]crm_partner_assign: flake8 + try catch for get
 object reference + replace country,city of lead in view by one concatened
 char field with country and city, same for partner location

bzr revid: dle@openerp.com-20130613143601-dfsytrwij03fdov0
---
 .../wizard/crm_forward_to_partner.py          | 100 +++++++++++++-----
 .../wizard/crm_forward_to_partner_view.xml    |   9 +-
 2 files changed, 76 insertions(+), 33 deletions(-)

diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 25849f5a868..b4eb0d81f6a 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -23,6 +23,7 @@
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 
+
 class crm_lead_forward_to_partner(osv.TransientModel):
     """ Forward info history to partners. """
     _name = 'crm.lead.forward.to.partner'
@@ -31,9 +32,13 @@ class crm_lead_forward_to_partner(osv.TransientModel):
         if context is None:
             context = {}
         lead_obj = self.pool.get('crm.lead')
+        partner_obj = self.pool.get('res.partner')
         email_template_obj = self.pool.get('email.template')
         base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
-        model, template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', 'email_template_lead_forward_mail')
+        try:
+            template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', 'email_template_lead_forward_mail')[1]
+        except ValueError:
+            template_id = False
         res = super(crm_lead_forward_to_partner, self).default_get(cr, uid, fields, context=context)
         active_ids = context.get('active_ids')
         default_composition_mode = context.get('default_composition_mode')
@@ -41,28 +46,40 @@ class crm_lead_forward_to_partner(osv.TransientModel):
         if template_id:
             res['body'] = email_template_obj.get_email_template(cr, uid, template_id).body_html
         if active_ids:
-            leads = lead_obj.browse(cr, uid, active_ids, context=context)
-            for lead in leads:
+            for lead in lead_obj.browse(cr, uid, active_ids, context=context):
+                lead_location = []
+                partner_location = []
+                if lead.country_id:
+                    lead_location.append(lead.country_id.name)
+                if lead.city:
+                    lead_location.append(lead.city)
                 if (not lead.partner_assigned_id) and default_composition_mode == 'mass_mail':
                     partner_id = lead_obj.search_geo_partner(cr, uid, [lead.id], context)
+                    partner = partner_obj.browse(cr, uid, partner_id, context=context)
+                    if partner.country_id:
+                        partner_location.append(partner.country_id.name)
+                    if partner.city:
+                        partner_location.append(partner.city)
                     res['assignation_lines'].append({'lead_id': lead.id,
-                                                     'subject': lead.name,
-                                                     'city':lead.city,
-                                                     'country_id':lead.country_id.id,
+                                                     'lead_location': ", ".join(lead_location),
                                                      'partner_assigned_id': partner_id and partner_id[lead.id] or False,
-                                                     'lead_link':"%s/?db=%s#id=%s&model=crm.lead" % (base_url, cr.dbname, lead.id)
+                                                     'partner_location': ", ".join(partner_location),
+                                                     'lead_link': "%s/?db=%s#id=%s&model=crm.lead" % (base_url, cr.dbname, lead.id)
                                                      })
                 elif default_composition_mode == 'forward':
+                    if lead.partner_assigned_id.country_id:
+                        partner_location.append(lead.partner_assigned_id.country_id.name)
+                    if lead.partner_assigned_id.city:
+                        partner_location.append(lead.partner_assigned_id.city)
                     res['assignation_lines'].append({'lead_id': lead.id,
-                                                     'subject': lead.name,
-                                                     'city':lead.city,
-                                                     'country_id':lead.country_id.id,
+                                                     'lead_location': ", ".join(lead_location),
                                                      'partner_assigned_id': lead.partner_assigned_id.id,
-                                                     'lead_link':"%s/?db=%s#id=%s&model=crm.lead" % (base_url, cr.dbname, lead.id)
+                                                     'partner_location': ", ".join(partner_location),
+                                                     'lead_link': "%s/?db=%s#id=%s&model=crm.lead" % (base_url, cr.dbname, lead.id)
                                                      })
                     res['partner_id'] = lead.partner_assigned_id.id
         return res
-    
+
     def action_forward(self, cr, uid, ids, context=None):
         lead_obj = self.pool.get('crm.lead')
         record = self.browse(cr, uid, ids, context=context)
@@ -72,48 +89,75 @@ class crm_lead_forward_to_partner(osv.TransientModel):
             email_template_obj.send_mail(cr, uid, template_id, ids[0])
             active_ids = context.get('active_ids')
             if active_ids:
-                lead_obj.write(cr, uid, active_ids, {'partner_assigned_id': record[0].partner_id.id , 'user_id': record[0].partner_id.user_id.id})
+                lead_obj.write(cr, uid, active_ids, {'partner_assigned_id': record[0].partner_id.id, 'user_id': record[0].partner_id.user_id.id})
         else:
             for lead in record[0].assignation_lines:
                 if not lead.partner_assigned_id:
                     raise osv.except_osv(_('Assignation Error'),
-                             _('Some leads have not been assigned to any partner so assign partners manualy'))
+                                         _('Some leads have not been assigned to any partner so assign partners manualy'))
             for lead in record[0].assignation_lines:
-                self.write(cr, uid, ids, {'partner_id':lead.partner_assigned_id.id,
+                self.write(cr, uid, ids, {'partner_id': lead.partner_assigned_id.id,
                                           'lead_single_link': lead.lead_link,
-                                          'lead_single_id':lead.lead_id.id
+                                          'lead_single_id': lead.lead_id.id
                                           })
                 email_template_obj.send_mail(cr, uid, template_id, ids[0])
                 lead_obj.write(cr, uid, [lead.lead_id.id], {'partner_assigned_id': lead.partner_assigned_id.id, 'user_id': lead.partner_assigned_id.user_id.id})
         return True
-    
+
     def get_portal_url(self, cr, uid, ids, context=None):
         portal_link = "%s/?db=%s" % (self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url'), cr.dbname)
         return portal_link
-    
+
     _columns = {
-        'forward_type':fields.selection([ ('single', 'a single partner: manual selection of partner'), ('assigned', "several partners: automatic assignation, using GPS coordinates and partner's grades"), ], 'Forward selected leads to'),
-        'partner_id':fields.many2one('res.partner', 'Forward Leads To'),
+        'forward_type': fields.selection([('single', 'a single partner: manual selection of partner'), ('assigned', "several partners: automatic assignation, using GPS coordinates and partner's grades"), ], 'Forward selected leads to'),
+        'partner_id': fields.many2one('res.partner', 'Forward Leads To'),
         'assignation_lines': fields.one2many('crm.lead.assignation', 'forward_id', 'Partner Assignation'),
         'show_mail': fields.boolean('Show the email will be sent'),
         'body': fields.html('Contents', help='Automatically sanitized HTML contents'),
-        'lead_single_id':fields.many2one('crm.lead', 'Lead'),
+        'lead_single_id': fields.many2one('crm.lead', 'Lead'),
         'lead_single_link': fields.char('Lead  Single Links', size=128),
     }
-    
+
     _defaults = {
         'forward_type': 'single',
     }
-    
+
+
 class crm_lead_assignation (osv.TransientModel):
     _name = 'crm.lead.assignation'
     _columns = {
-        'forward_id':fields.many2one('crm.lead.forward.to.partner', 'Partner Assignation'),
-        'lead_id':fields.many2one('crm.lead', 'Lead'),
-        'subject': fields.char('Subject', size=64),
-        'city': fields.char('City', size=128),
-        'country_id': fields.many2one('res.country', 'Country'),
+        'forward_id': fields.many2one('crm.lead.forward.to.partner', 'Partner Assignation'),
+        'lead_id': fields.many2one('crm.lead', 'Lead'),
+        'lead_location': fields.char('Lead Location', size=128),
         'partner_assigned_id': fields.many2one('res.partner', 'Assigned Partner'),
+        'partner_location': fields.char('Partner Location', size=128),
         'lead_link': fields.char('Lead  Single Links', size=128),
     }
+
+    def on_change_lead_id(self, cr, uid, ids, lead_id, context=None):
+        if not context:
+            context = {}
+        if not lead_id:
+            return {'value': {'lead_location': False}}
+        lead = self.pool.get('crm.lead').browse(cr, uid, lead_id, context=context)
+        lead_location = []
+        if lead.country_id:
+            lead_location.append(lead.country_id.name)
+        if lead.city:
+            lead_location.append(lead.city)
+        return {'value': {'lead_location': ", ".join(lead_location)}}
+
+    def on_change_partner_assigned_id(self, cr, uid, ids, partner_assigned_id, context=None):
+        if not context:
+            context = {}
+        if not partner_assigned_id:
+            return {'value': {'lead_location': False}}
+        partner = self.pool.get('res.partner').browse(cr, uid, partner_assigned_id, context=context)
+        partner_location = []
+        if partner.country_id:
+            partner_location.append(partner.country_id.name)
+        if partner.city:
+            partner_location.append(partner.city)
+        return {'value': {'partner_location': ", ".join(partner_location)}}
+
 # # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 1a3cf0b06ed..fdf02f81219 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -18,11 +18,10 @@
                     </group>
                     <field name="assignation_lines" attrs="{'invisible': [('forward_type', 'in', ['single',False])]}">
                         <tree create="false" editable="bottom">
-                            <field name="lead_id" invisible="1"/>
-                            <field name="subject" readonly="1"/>
-                            <field name="city" readonly="1"/>
-                            <field name="country_id" readonly="1"/>
-                            <field name="partner_assigned_id"/>
+                            <field name="lead_id" readonly="1" on_change="on_change_lead_id(lead_id)"/>
+                            <field name="lead_location" readonly="1"/>
+                            <field name="partner_assigned_id" on_change="on_change_partner_assigned_id(partner_assigned_id)"/>
+                            <field name="partner_location" readonly="1"/>
                         </tree>
                     </field>
                     <field name="show_mail" />

From 5a22702043d5b29d67e27e8c93051716d727357c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 13 Jun 2013 18:23:19 +0200
Subject: [PATCH 25/94] added black magic to detect the user when using http
 requests

bzr revid: nicolas.vanhoren@openerp.com-20130613162319-1w0renis7g2x5cw0
---
 addons/web/doc/web_controllers.rst | 2 +-
 addons/web/http.py                 | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/web/doc/web_controllers.rst b/addons/web/doc/web_controllers.rst
index 6c0137e8282..8938f0adbb8 100644
--- a/addons/web/doc/web_controllers.rst
+++ b/addons/web/doc/web_controllers.rst
@@ -108,7 +108,7 @@ To use the database you must access the OpenERP models. The global ``request`` o
 
     @http.httprequest
     def my_name(self):
-        my_user_record = request.registry.get("res.users").browse(request.cr, request.uid, request.ui)
+        my_user_record = request.registry.get("res.users").browse(request.cr, request.uid, request.uid)
         return "<h1>Your name is %s</h1>" % my_user_record.name
 
 ``request.registry`` is the registry that gives you access to the models. It is the equivalent of ``self.pool`` when
diff --git a/addons/web/http.py b/addons/web/http.py
index 42ba0c2e35f..d919c247bcb 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -29,6 +29,7 @@ import werkzeug.exceptions
 import werkzeug.utils
 import werkzeug.wrappers
 import werkzeug.wsgi
+import urllib2
 
 import openerp
 
@@ -97,7 +98,13 @@ class WebRequest(object):
     def init(self, params):
         self.params = dict(params)
         # OpenERP session setup
-        self.session_id = self.params.pop("session_id", None) or uuid.uuid4().hex
+        self.session_id = self.params.pop("session_id", None)
+        if not self.session_id:
+            i0 = self.httprequest.cookies.get("instance0|session_id", None)
+            if i0:
+                self.session_id = simplejson.loads(urllib2.unquote(i0))
+            else:
+                self.session_id = uuid.uuid4().hex
         self.session = self.httpsession.get(self.session_id)
         if not self.session:
             self.session = session.OpenERPSession()

From 4fc3cc862f5addd9f92a41d0ab4948a8a1ef6ca5 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 13 Jun 2013 18:38:13 +0200
Subject: [PATCH 26/94] [FIX]crm_partner_assign: mass lead forward, now one
 email per partner, even in several partner mode + code/execution time
 optimization/improvement

bzr revid: dle@openerp.com-20130613163813-315l55kle96sn5gh
---
 .../data/lead_mail_template_data.xml          | 28 ++-----
 .../wizard/crm_forward_to_partner.py          | 82 ++++++++++---------
 2 files changed, 51 insertions(+), 59 deletions(-)

diff --git a/addons/crm_partner_assign/data/lead_mail_template_data.xml b/addons/crm_partner_assign/data/lead_mail_template_data.xml
index dac93342f63..a964fc36ddb 100644
--- a/addons/crm_partner_assign/data/lead_mail_template_data.xml
+++ b/addons/crm_partner_assign/data/lead_mail_template_data.xml
@@ -1,40 +1,28 @@
 <?xml version="1.0" ?>
 <openerp>
-    <data noupdate="1">
+    <data noupdate="0">
       <record id="email_template_lead_forward_mail" model="email.template">
             <field name="name">Lead Mass Mail</field>
             <field name="model_id" model="ir.model" search="[('name', '=', 'crm.lead.forward.to.partner')]"></field>
             <field name="auto_delete" eval="True"/>
-            <field name="email_to">${object.partner_id.email}</field>
+            <field name="email_to">${ctx['partner_id'].email}</field>
             <field name="email_from">${user.email or ''}</field>
-            <field name="subject">Fwd: Lead: ${object.partner_id.name}</field>
+            <field name="subject">Fwd: Lead: ${ctx['partner_id'].name}</field>
             <field name="body_html"><![CDATA[
             
-Hello ${object.partner_id.name},
+Hello ${ctx['partner_id'].name},
 </br>
 </br>
-% if object.forward_type == 'single':
 
 <blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;">Some leads have been assigned to you. Here are the various leads we propose: </blockquote></br></br>
 <b>
-<ol><ol>
-% for lead in object.assignation_lines:
-     <li><a href="${lead.lead_link}">${lead.subject}</a>, ${lead.lead_id.contact_name}, ${lead.lead_id.country_id.name}, ${lead.lead_id.email_from}, ${lead.lead_id.phone} </li></br>
+<ol>
+% for lead in ctx['partner_leads']:
+     <li><a href="${lead.lead_link}">${lead.lead_id.name or 'Subject Undefined'}</a>, ${lead.lead_id.contact_name or 'Contact Name Undefined'}, ${lead.lead_id.country_id and lead.lead_id.country_id.name or 'Country Undefined' }, ${lead.lead_id.email_from or 'Email Undefined'}, ${lead.lead_id.phone or 'Phone Number Undefined'} </li></br>
 % endfor
-</ol></ol>
+</ol>
 </b>
-% endif
 
-
-
-% if object.forward_type == 'assigned':
-<blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;">One leads have been assigned to you. Here given lead we propose:</blockquote> </br></br>
-<b>
-<ol><ol>
-<li><a href="${object.lead_single_link}">${object.lead_single_id.name}</a>, ${object.lead_single_id.contact_name}, ${object.lead_single_id.country_id.name}, ${object.lead_single_id.email_from}, ${object.lead_single_id.phone} </br></li>
-</ol></ol>
-</b>
-% endif
 </br>
 <blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;">Connect you to your <b><a href="${object.get_portal_url()}">Partner Portal</a></b> to see leads details.</blockquote>
 
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index b4eb0d81f6a..f4c58279b24 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -46,62 +46,68 @@ class crm_lead_forward_to_partner(osv.TransientModel):
         if template_id:
             res['body'] = email_template_obj.get_email_template(cr, uid, template_id).body_html
         if active_ids:
-            for lead in lead_obj.browse(cr, uid, active_ids, context=context):
+            lead_ids = lead_obj.browse(cr, uid, active_ids, context=context)
+            if default_composition_mode == 'mass_mail':
+                partner_assigned_ids = lead_obj.search_geo_partner(cr, uid, active_ids, context=context)
+            else:
+                partner_assigned_ids = dict((lead.id, lead.partner_assigned_id and lead.partner_assigned_id.id or False) for lead in lead_ids)
+                res['partner_id'] = lead_ids[0].partner_assigned_id.id
+            for lead in lead_ids:
                 lead_location = []
                 partner_location = []
                 if lead.country_id:
                     lead_location.append(lead.country_id.name)
                 if lead.city:
                     lead_location.append(lead.city)
-                if (not lead.partner_assigned_id) and default_composition_mode == 'mass_mail':
-                    partner_id = lead_obj.search_geo_partner(cr, uid, [lead.id], context)
-                    partner = partner_obj.browse(cr, uid, partner_id, context=context)
-                    if partner.country_id:
-                        partner_location.append(partner.country_id.name)
-                    if partner.city:
-                        partner_location.append(partner.city)
+                    partner_id = partner_assigned_ids.get(lead.id) or False
+                    if partner_id:
+                        partner = partner_obj.browse(cr, uid, partner_id, context=context)
+                        if partner.country_id:
+                            partner_location.append(partner.country_id.name)
+                        if partner.city:
+                            partner_location.append(partner.city)
                     res['assignation_lines'].append({'lead_id': lead.id,
                                                      'lead_location': ", ".join(lead_location),
-                                                     'partner_assigned_id': partner_id and partner_id[lead.id] or False,
+                                                     'partner_assigned_id': partner_id,
                                                      'partner_location': ", ".join(partner_location),
                                                      'lead_link': "%s/?db=%s#id=%s&model=crm.lead" % (base_url, cr.dbname, lead.id)
                                                      })
-                elif default_composition_mode == 'forward':
-                    if lead.partner_assigned_id.country_id:
-                        partner_location.append(lead.partner_assigned_id.country_id.name)
-                    if lead.partner_assigned_id.city:
-                        partner_location.append(lead.partner_assigned_id.city)
-                    res['assignation_lines'].append({'lead_id': lead.id,
-                                                     'lead_location': ", ".join(lead_location),
-                                                     'partner_assigned_id': lead.partner_assigned_id.id,
-                                                     'partner_location': ", ".join(partner_location),
-                                                     'lead_link': "%s/?db=%s#id=%s&model=crm.lead" % (base_url, cr.dbname, lead.id)
-                                                     })
-                    res['partner_id'] = lead.partner_assigned_id.id
         return res
 
     def action_forward(self, cr, uid, ids, context=None):
         lead_obj = self.pool.get('crm.lead')
-        record = self.browse(cr, uid, ids, context=context)
+        record = self.browse(cr, uid, ids[0], context=context)
         email_template_obj = self.pool.get('email.template')
-        model, template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', 'email_template_lead_forward_mail')
-        if record[0].forward_type == "single":
-            email_template_obj.send_mail(cr, uid, template_id, ids[0])
-            active_ids = context.get('active_ids')
-            if active_ids:
-                lead_obj.write(cr, uid, active_ids, {'partner_assigned_id': record[0].partner_id.id, 'user_id': record[0].partner_id.user_id.id})
-        else:
-            for lead in record[0].assignation_lines:
+        try:
+            template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', 'email_template_lead_forward_mail')[1]
+        except ValueError:
+            raise osv.except_osv(_('Email Template Error'),
+                                 _('The Forward Email Template is not in the database'))
+        local_context = context.copy()
+        if not (record.forward_type == 'single'):
+            for lead in record.assignation_lines:
                 if not lead.partner_assigned_id:
                     raise osv.except_osv(_('Assignation Error'),
                                          _('Some leads have not been assigned to any partner so assign partners manualy'))
-            for lead in record[0].assignation_lines:
-                self.write(cr, uid, ids, {'partner_id': lead.partner_assigned_id.id,
-                                          'lead_single_link': lead.lead_link,
-                                          'lead_single_id': lead.lead_id.id
-                                          })
-                email_template_obj.send_mail(cr, uid, template_id, ids[0])
-                lead_obj.write(cr, uid, [lead.lead_id.id], {'partner_assigned_id': lead.partner_assigned_id.id, 'user_id': lead.partner_assigned_id.user_id.id})
+        partners_leads = {}
+        for lead in record.assignation_lines:
+            lead_details = {
+                'lead_link': lead.lead_link,
+                'lead_id': lead.lead_id,
+            }
+            partner = record.forward_type == 'single' and record.partner_id or lead.partner_assigned_id
+            partner_leads = partners_leads.get(partner.id)
+            if partner_leads:
+                partner_leads['leads'].append(lead_details)
+            else:
+                partners_leads[partner.id] = {'partner': partner, 'leads': [lead_details]}
+        for partner_id, partner_leads in partners_leads.items():
+            local_context['partner_id'] = partner_leads['partner']
+            local_context['partner_leads'] = partner_leads['leads']
+            email_template_obj.send_mail(cr, uid, template_id, ids[0], context=local_context)
+            lead_ids = [lead['lead_id'].id for lead in partner_leads['leads']]
+            lead_obj.write(cr, uid, lead_ids, {'partner_assigned_id': partner_id, 'user_id': partner_leads['partner'].user_id.id})
+            self.pool.get('crm.lead').message_subscribe(cr, uid, lead_ids, [partner_id], context=context)
         return True
 
     def get_portal_url(self, cr, uid, ids, context=None):
@@ -114,8 +120,6 @@ class crm_lead_forward_to_partner(osv.TransientModel):
         'assignation_lines': fields.one2many('crm.lead.assignation', 'forward_id', 'Partner Assignation'),
         'show_mail': fields.boolean('Show the email will be sent'),
         'body': fields.html('Contents', help='Automatically sanitized HTML contents'),
-        'lead_single_id': fields.many2one('crm.lead', 'Lead'),
-        'lead_single_link': fields.char('Lead  Single Links', size=128),
     }
 
     _defaults = {

From 4257dfed8a99d917e106cb8d4b6339135a8ffa15 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 13 Jun 2013 19:01:47 +0200
Subject: [PATCH 27/94] Added doc in the code

bzr revid: nicolas.vanhoren@openerp.com-20130613170147-d2mfdwlvkg088jtq
---
 addons/web/http.py    | 42 +++++++++++++++++++++++++++++------
 addons/web/session.py | 51 +++++++++++++++++++++++++++++++++----------
 2 files changed, 74 insertions(+), 19 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index d919c247bcb..0f5450ffd30 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -83,6 +83,16 @@ class WebRequest(object):
     .. attribute:: debug
 
         ``bool``, indicates whether the debug mode is active on the client
+
+    .. attribute:: db
+
+        ``str``, the name of the database linked to the current request. Can be ``None``
+        if the current request uses the @nodb decorator.
+
+    .. attribute:: uid
+
+        ``int``, the id of the user related to the current request. Can be ``None``
+        if the current request uses the @nodb or the @noauth decorator.
     """
     def __init__(self, httprequest, func, auth_method="auth"):
         self.httprequest = httprequest
@@ -135,12 +145,14 @@ class WebRequest(object):
         # we use _ as seprator where RFC2616 uses '-'
         self.lang = lang.replace('-', '_')
 
-    def authenticate(self):
+    def _authenticate(self):
         if self.auth_method == "nodb":
             self.db = None
             self.uid = None
         elif self.auth_method == "noauth":
             self.db = (self.session._db or openerp.addons.web.controllers.main.db_monodb()).lower()
+            if not self.db:
+                raise session.SessionExpiredException("No valid database for request %s" % self.httprequest)
             self.uid = None
         else: # auth
             try:
@@ -152,23 +164,26 @@ class WebRequest(object):
 
     @property
     def registry(self):
+        """
+        The registry to the database linked to this request. Can be ``None`` if the current request uses the
+        @nodb decorator.
+        """
         return openerp.modules.registry.RegistryManager.get(self.db) if self.db else None
 
     @property
     def cr(self):
+        """
+        The cursor initialized for the current method call. If the current request uses the @nodb decorator
+        trying to access this property will raise an exception.
+        """
         # some magic to lazy create the cr
         if not self._cr_cm:
             self._cr_cm = self.registry.cursor()
             self._cr = self._cr_cm.__enter__()
         return self._cr
 
-    #TODO: remove
-    @contextlib.contextmanager
-    def registry_cr(self):
-        return (self.registry, self.cr)
-
     def _call_function(self, *args, **kwargs):
-        self.authenticate()
+        self._authenticate()
         try:
             # ugly syntax only to get the __exit__ arguments to pass to self._cr
             request = self
@@ -190,10 +205,20 @@ class WebRequest(object):
 
 
 def noauth(f):
+    """
+    Decorator to put on a controller method to inform it does not require a user to be logged. When this decorator
+    is used, ``request.uid`` will be ``None``. The request will still try to detect the database and an exception
+    will be launched if there is no way to guess it.
+    """
     f.auth = "noauth"
     return f
 
 def nodb(f):
+    """
+    Decorator to put on a controller method to inform it does not require authentication nor any link to a database.
+    When this decorator is used, ``request.uid`` and ``request.db`` will be ``None``. Trying to use ``request.cr``
+    will launch an exception.
+    """
     f.auth = "nodb"
     return f
 
@@ -447,6 +472,9 @@ def set_request(request):
             _request_stack.pop()
     return with_obj()
 
+"""
+    A global proxy that always redirect to the current request object.
+"""
 request = _request_stack()
 
 #----------------------------------------------------------
diff --git a/addons/web/session.py b/addons/web/session.py
index b51c540aec5..aaa712fdedd 100644
--- a/addons/web/session.py
+++ b/addons/web/session.py
@@ -21,8 +21,10 @@ class AuthenticationError(Exception):
 class SessionExpiredException(Exception):
     pass
 
-# deprecated
 class Service(object):
+    """
+        Deprecated. Use ``openerp.netsvc.dispatch_rpc()`` instead.
+    """
     def __init__(self, session, service_name):
         self.session = session
         self.service_name = service_name
@@ -33,8 +35,10 @@ class Service(object):
             return result
         return proxy_method
 
-# deprecated
 class Model(object):
+    """
+        Deprecated. Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
+    """
     def __init__(self, session, model):
         self.session = session
         self.model = model
@@ -97,6 +101,10 @@ class OpenERPSession(object):
         self.jsonp_requests = {}     # FIXME use a LRU
 
     def authenticate(self, db, login, password, env=None):
+        """
+        Authenticate the current user with the given db, login and password. If successful, store
+        the authentication parameters in the current session and request.
+        """
         uid = openerp.netsvc.dispatch_rpc('common', 'authenticate', [db, login, password, env])
         self._db = db
         self._uid = uid
@@ -109,15 +117,21 @@ class OpenERPSession(object):
         return uid
 
     def check_security(self):
+        """
+        Chech the current authentication parameters to know if those are still valid. This method
+        should be called at each request. If the authentication fails, a ``SessionExpiredException``
+        is raised.
+        """
         if not self._db or not self._uid:
             raise SessionExpiredException("Session expired")
         import openerp.service.security as security
         security.check(self._db, self._uid, self._password)
 
     def get_context(self):
-        """ Re-initializes the current user's session context (based on
+        """
+        Re-initializes the current user's session context (based on
         his preferences) by calling res.users.get_context() with the old
-        context
+        context.
 
         :returns: the new context
         """
@@ -147,17 +161,22 @@ class OpenERPSession(object):
 
         context['lang'] = lang or 'en_US'
 
-    #deprecated
     def send(self, service_name, method, *args):
+        """
+        Deprecated. Use ``openerp.netsvc.dispatch_rpc()`` instead.
+        """
         return openerp.netsvc.dispatch_rpc(service_name, method, args)
 
-    #deprecated
     def proxy(self, service):
+        """
+        Deprecated. Use ``openerp.netsvc.dispatch_rpc()`` instead.
+        """
         return Service(self, service)
 
-    #deprecated
     def assert_valid(self, force=False):
         """
+        Deprecated. Use ``check_security()`` instead.
+
         Ensures this session is valid (logged into the openerp server)
         """
         if self._uid and not force:
@@ -167,29 +186,37 @@ class OpenERPSession(object):
         if not self._uid:
             raise AuthenticationError("Authentication failure")
 
-    #deprecated
     def ensure_valid(self):
+        """
+        Deprecated. Use ``check_security()`` instead.
+        """
         if self._uid:
             try:
                 self.assert_valid(True)
             except Exception:
                 self._uid = None
 
-    #deprecated
     def execute(self, model, func, *l, **d):
+        """
+        Deprecated. Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
+        """
         model = self.model(model)
         r = getattr(model, func)(*l, **d)
         return r
 
-    #deprecated
     def exec_workflow(self, model, id, signal):
+        """
+        Deprecated. Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
+        """
         self.assert_valid()
         r = self.proxy('object').exec_workflow(self._db, self._uid, self._password, model, signal, id)
         return r
 
-    #deprecated
     def model(self, model):
-        """ Get an RPC proxy for the object ``model``, bound to this session.
+        """
+        Deprecated. Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
+
+        Get an RPC proxy for the object ``model``, bound to this session.
 
         :param model: an OpenERP model name
         :type model: str

From 617d59cd4176a93d71a92db2d441b171f419d6ee Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 14 Jun 2013 12:10:41 +0200
Subject: [PATCH 28/94] [FIX]crm_partner_assign: some view changes

bzr revid: dle@openerp.com-20130614101041-jegs9jglt0ymehrf
---
 addons/crm_partner_assign/crm_lead_view.xml   | 48 +++++++++----------
 .../crm_partner_assign/res_partner_view.xml   | 32 ++++++-------
 2 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 6eb7fd5ae31..4448bb918ae 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -11,18 +11,7 @@
                         <page string="Assigned Partner" groups="base.group_sale_manager">
                             <group name="partner_assign_group">
                                 <group string="Partner Assignation" col="3" colspan="1">
-                                    <field name="partner_assigned_id" class="oe_inline" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
-                                    <button string="Automatic Assignation" name="action_assign_partner" type="object" colspan="1"
-                                        class="oe_link oe_inline"  attrs="{'invisible':[('partner_assigned_id','!=', False)]}"/>
-                                    <div>
-                                        <button string="Forward"
-                                            attrs="{'invisible':[('partner_assigned_id','=',False)]}"
-                                            name="%(crm_lead_forward_to_partner_act)d"
-                                            class="oe_link" type="action"
-                                            context="{'default_composition_mode': 'forward','hide_forward_type': 1 , 'default_partner_ids': [partner_assigned_id]}"/>
-                                    </div>
-                                </group>
-                                <group string="Latitude and Longitude">
+                                    <label for="partner_latitude" string="Geolocation" />
                                     <div class="oe_title">
                                         <h3>
                                             <span class="oe_grey">( </span>
@@ -35,6 +24,16 @@
                                             <span class="oe_grey">) </span>
                                         </h3>
                                     </div>
+                                    <button string="Automatic Assignation" name="action_assign_partner" type="object" colspan="1"
+                                        class="oe_link oe_inline"  attrs="{'invisible':[('partner_assigned_id','!=', False)]}"/>
+                                    <field name="partner_assigned_id" class="oe_inline" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
+                                    <div colspan="2">
+                                        <button string="Forward"
+                                            attrs="{'invisible':[('partner_assigned_id','=',False)]}"
+                                            name="%(crm_lead_forward_to_partner_act)d"
+                                            class="oe_link" type="action"
+                                            context="{'default_composition_mode': 'forward','hide_forward_type': 1 , 'default_partner_ids': [partner_assigned_id]}"/>
+                                    </div>
                                 </group>
                             </group>
                         </page>
@@ -77,20 +76,9 @@
                     <xpath expr="//notebook/page[@string='Extra Info']" position="after">
                         <page string="Assigned Partner" groups="base.group_sale_manager">
                             <group name="partner_assign_group">
-                                <group string="Partner Assignation" col="3" colspan="1">
-                                    <field name="partner_assigned_id" class="oe_inline" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
-                                    <button string="Automatic Assignation" name="action_assign_partner" type="object" colspan="1"
-                                        class="oe_link oe_inline"  attrs="{'invisible':[('partner_assigned_id','!=', False)]}"/>
+                                <group string="Partner Assignation" col="3">
+                                    <label for="partner_latitude" string="Geolocation" />
                                     <div>
-                                        <button string="Forward"
-                                            attrs="{'invisible':[('partner_assigned_id','=',False)]}"
-                                            name="%(crm_lead_forward_to_partner_act)d"
-                                            class="oe_link" type="action"
-                                            context="{'default_composition_mode': 'forward','hide_forward_type': 1 , 'default_partner_ids': [partner_assigned_id]}"/>
-                                    </div>
-                                </group>
-                                <group string="Latitude and Longitude">
-                                    <div class="oe_title">
                                         <h3>
                                             <span class="oe_grey">( </span>
                                             <field name="partner_latitude" nolabel="1" readonly="1" class="oe_inline"/>
@@ -102,6 +90,16 @@
                                             <span class="oe_grey">) </span>
                                         </h3>
                                     </div>
+                                    <button string="Automatic Assignation" name="action_assign_partner" type="object" colspan="1"
+                                        class="oe_link oe_inline" />
+                                    <field name="partner_assigned_id" class="oe_inline" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
+                                    <div>
+                                        <button string="Forward"
+                                            attrs="{'invisible':[('partner_assigned_id','=',False)]}"
+                                            name="%(crm_lead_forward_to_partner_act)d"
+                                            class="oe_link" type="action"
+                                            context="{'default_composition_mode': 'forward','hide_forward_type': 1 , 'default_partner_ids': [partner_assigned_id]}"/>
+                                    </div>
                                 </group>
                             </group>
                         </page>
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index d376576a9d7..23262397204 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -113,8 +113,21 @@
                 <xpath expr="//notebook[last()]" position="inside">
                     <page string="Forwarded Leads">
                         <group>
-                            <group>
-                                <separator string="Partner Activation" colspan="2" />
+                            <group string="Partner Activation">
+                                <label for="partner_latitude" string="Geolocalisation" />
+                                <div class="oe_title oe_inline">
+                                    <h3 class="oe_inline">
+                                        <span class="oe_grey">( </span>
+                                        <field name="partner_latitude" nolabel="1" readonly="1" class="oe_inline" />
+                                        <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&lt;=',0)]}">N </span>
+                                        <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&gt;=',0)]}">S </span>
+                                        <field name="partner_longitude" class="oe_inline" readonly="1" nolabel="1" />
+                                        <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&lt;=',0)]}">E </span>
+                                        <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&gt;=',0)]}">W </span>
+                                        <span class="oe_grey">) </span>
+                                    </h3>
+                                    <button string="Geolocalize" name="geo_localize" class="oe_link oe_inline" type="object" />
+                                </div>
                                 <field name="grade_id" widget="selection" on_change="onchange_grade_id(grade_id)" />
                                 <field name="partner_weight" class="oe_inline" />
                                 <div colspan="2">
@@ -132,21 +145,6 @@
                             <group>
                             </group>
                         </group>
-                        <group string="Latitude and Longitude">
-                            <div class="oe_title">
-                                <h3 class="oe_inline">
-                                    <span class="oe_grey">( </span>
-                                    <field name="partner_latitude" nolabel="1" readonly="1" class="oe_inline" />
-                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&lt;=',0)]}">N </span>
-                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&gt;=',0)]}">S </span>
-                                    <field name="partner_longitude" class="oe_inline" readonly="1" nolabel="1" />
-                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&lt;=',0)]}">E </span>
-                                    <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&gt;=',0)]}">W </span>
-                                    <span class="oe_grey">) </span>
-                                    <button string="Calculate Geo Localize" name="geo_localize" colspan="2" class="oe_link oe_inline" type="object" />
-                                </h3>
-                            </div>
-                        </group>
                         <newline />
                         <separator string="Forwarded Leads" colspan="2" />
                         <field name="opportunity_assigned_ids" colspan="4" nolabel="1">

From d0aff42a30a338e8552f66d5a525ad77d3d4c9dd Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 14 Jun 2013 13:33:59 +0200
Subject: [PATCH 29/94] [FIX]crm_partner_assign: remove oe_link class from
 button

bzr revid: dle@openerp.com-20130614113359-sxt5fw2tsckgdlyd
---
 addons/crm_partner_assign/crm_lead_view.xml    | 8 ++++----
 addons/crm_partner_assign/res_partner_view.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 4448bb918ae..8511b297fc0 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -25,13 +25,13 @@
                                         </h3>
                                     </div>
                                     <button string="Automatic Assignation" name="action_assign_partner" type="object" colspan="1"
-                                        class="oe_link oe_inline"  attrs="{'invisible':[('partner_assigned_id','!=', False)]}"/>
+                                        class="oe_inline"  attrs="{'invisible':[('partner_assigned_id','!=', False)]}"/>
                                     <field name="partner_assigned_id" class="oe_inline" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
                                     <div colspan="2">
                                         <button string="Forward"
                                             attrs="{'invisible':[('partner_assigned_id','=',False)]}"
                                             name="%(crm_lead_forward_to_partner_act)d"
-                                            class="oe_link" type="action"
+                                            type="action"
                                             context="{'default_composition_mode': 'forward','hide_forward_type': 1 , 'default_partner_ids': [partner_assigned_id]}"/>
                                     </div>
                                 </group>
@@ -91,13 +91,13 @@
                                         </h3>
                                     </div>
                                     <button string="Automatic Assignation" name="action_assign_partner" type="object" colspan="1"
-                                        class="oe_link oe_inline" />
+                                        class="oe_inline" />
                                     <field name="partner_assigned_id" class="oe_inline" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
                                     <div>
                                         <button string="Forward"
                                             attrs="{'invisible':[('partner_assigned_id','=',False)]}"
                                             name="%(crm_lead_forward_to_partner_act)d"
-                                            class="oe_link" type="action"
+                                            type="action"
                                             context="{'default_composition_mode': 'forward','hide_forward_type': 1 , 'default_partner_ids': [partner_assigned_id]}"/>
                                     </div>
                                 </group>
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index 23262397204..b1e0b1bd0e2 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -126,7 +126,7 @@
                                         <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&gt;=',0)]}">W </span>
                                         <span class="oe_grey">) </span>
                                     </h3>
-                                    <button string="Geolocalize" name="geo_localize" class="oe_link oe_inline" type="object" />
+                                    <button string="Geolocalize" name="geo_localize" class="oe_inline" type="object" />
                                 </div>
                                 <field name="grade_id" widget="selection" on_change="onchange_grade_id(grade_id)" />
                                 <field name="partner_weight" class="oe_inline" />

From 0ab2825e343ed2f9afcdd6e2826b5c73a70e86ab Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 14 Jun 2013 14:24:00 +0200
Subject: [PATCH 30/94] corrected test

bzr revid: nicolas.vanhoren@openerp.com-20130614122400-9xns98yv1k42gsoz
---
 addons/web/controllers/testing.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/controllers/testing.py b/addons/web/controllers/testing.py
index b6327bf4622..8b89ab8ac9d 100644
--- a/addons/web/controllers/testing.py
+++ b/addons/web/controllers/testing.py
@@ -89,6 +89,7 @@ class TestRunnerController(http.Controller):
     _cp_path = '/web/tests'
 
     @http.httprequest
+    @http.nodb
     def index(self, req, mod=None, **kwargs):
         ms = module.get_modules()
         manifests = dict(

From cc7b573af86c30bed1090ff643c98f0177f91243 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 14 Jun 2013 15:28:42 +0200
Subject: [PATCH 31/94] [FIX]crm_partner_assign: lead/opp view some changes

bzr revid: dle@openerp.com-20130614132842-tbh09dt1m5cyzob4
---
 addons/crm_partner_assign/crm_lead_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 8511b297fc0..5c14680ee78 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -25,10 +25,10 @@
                                         </h3>
                                     </div>
                                     <button string="Automatic Assignation" name="action_assign_partner" type="object" colspan="1"
-                                        class="oe_inline"  attrs="{'invisible':[('partner_assigned_id','!=', False)]}"/>
+                                        class="oe_inline"/>
                                     <field name="partner_assigned_id" class="oe_inline" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
-                                    <div colspan="2">
-                                        <button string="Forward"
+                                    <div>
+                                        <button string="Send Email"
                                             attrs="{'invisible':[('partner_assigned_id','=',False)]}"
                                             name="%(crm_lead_forward_to_partner_act)d"
                                             type="action"
@@ -94,7 +94,7 @@
                                         class="oe_inline" />
                                     <field name="partner_assigned_id" class="oe_inline" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
                                     <div>
-                                        <button string="Forward"
+                                        <button string="Send Email"
                                             attrs="{'invisible':[('partner_assigned_id','=',False)]}"
                                             name="%(crm_lead_forward_to_partner_act)d"
                                             type="action"

From 15558c64cf97622f6735e6d6ce6b67de5c2e1d35 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 14 Jun 2013 15:29:19 +0200
Subject: [PATCH 32/94] [FIX]crm_partner_assign: partner view typo

bzr revid: dle@openerp.com-20130614132919-2f34su69jvv5xa2x
---
 addons/crm_partner_assign/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index b1e0b1bd0e2..874d2a9f053 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -132,7 +132,7 @@
                                 <field name="partner_weight" class="oe_inline" />
                                 <div colspan="2">
                                     <p class="oe_grey">
-                                        The scale of partner weight is between [1] to [100]. To increase the probability for this partner to get more leads, choose higher value. To decrease, choose lower value.
+                                        Higher is the value, higher is the probability for this partner to get more leads.
                                     </p>
                                 </div>
                             </group>

From faf2ef3d1ac8212d6ce9542cb9617d019513a012 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 14 Jun 2013 17:01:25 +0200
Subject: [PATCH 33/94] Simplefied a little current routing

bzr revid: nicolas.vanhoren@openerp.com-20130614150125-w8fnyclnw0l8b3r7
---
 addons/web/http.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 0f5450ffd30..a9039f38f9e 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -29,6 +29,7 @@ import werkzeug.exceptions
 import werkzeug.utils
 import werkzeug.wrappers
 import werkzeug.wsgi
+import werkzeug.routing as routing
 import urllib2
 
 import openerp
@@ -482,7 +483,6 @@ request = _request_stack()
 #----------------------------------------------------------
 addons_module = {}
 addons_manifest = {}
-controllers_class = []
 controllers_class_path = {}
 controllers_object = {}
 controllers_object_path = {}
@@ -505,9 +505,8 @@ class ControllerType(type):
 
         # store the controller in the controllers list
         name_class = ("%s.%s" % (cls.__module__, cls.__name__), cls)
-        controllers_class.append(name_class)
         path = attrs.get('_cp_path')
-        if path not in controllers_class_path:
+        if path and path not in controllers_class_path:
             controllers_class_path[path] = name_class
 
 class Controller(object):
@@ -655,6 +654,7 @@ class Root(object):
     def __init__(self):
         self.addons = {}
         self.statics = {}
+        self.routing_map = None
 
         self.load_addons()
 
@@ -727,12 +727,11 @@ class Root(object):
                         self.statics['/%s/static' % module] = path_static
 
         for k, v in controllers_class_path.items():
-            if k not in controllers_object_path and hasattr(v[1], '_cp_path'):
-                o = v[1]()
-                controllers_object[v[0]] = o
-                controllers_object_path[k] = o
-                if hasattr(o, '_cp_path'):
-                    controllers_path[o._cp_path] = o
+            o = v[1]()
+            controllers_object[v[0]] = o
+            controllers_object_path[k] = o
+            if hasattr(o, '_cp_path'):
+                controllers_path[o._cp_path] = o
 
         app = werkzeug.wsgi.SharedDataMiddleware(self.dispatch, self.statics)
         self.dispatch = DisableCacheMiddleware(app)

From c44888527bc027a49777bc2394a2ae69e64b547c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 14 Jun 2013 17:26:21 +0200
Subject: [PATCH 34/94] Added werkzeug route building, not yet switched

bzr revid: nicolas.vanhoren@openerp.com-20130614152621-t8jv4474gt9k6yib
---
 addons/web/controllers/main.py |  4 ++--
 addons/web/http.py             | 22 ++++++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index d2f425e0c49..87355d075f3 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1477,8 +1477,8 @@ class Export(openerpweb.Controller):
         """
         return sorted([
             controller.fmt
-            for path, controller in openerpweb.controllers_path.iteritems()
-            if path.startswith(self._cp_path)
+            for controller in openerpweb.controllers_object.itervalues()
+            if (controller._cp_path or "").startswith(self._cp_path)
             if hasattr(controller, 'fmt')
         ], key=operator.itemgetter("label"))
 
diff --git a/addons/web/http.py b/addons/web/http.py
index a9039f38f9e..ddb253c6b22 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -485,7 +485,6 @@ addons_module = {}
 addons_manifest = {}
 controllers_class_path = {}
 controllers_object = {}
-controllers_object_path = {}
 controllers_path = {}
 
 class ControllerType(type):
@@ -680,7 +679,7 @@ class Root(object):
         request.parameter_storage_class = werkzeug.datastructures.ImmutableDict
         request.app = self
 
-        handler = self.find_handler(*(request.path.split('/')[1:]))
+        handler = self.find_handler(request.path)
 
         if not handler:
             response = werkzeug.exceptions.NotFound()
@@ -726,25 +725,32 @@ class Root(object):
                         addons_manifest[module] = manifest
                         self.statics['/%s/static' % module] = path_static
 
-        for k, v in controllers_class_path.items():
+        self.routing_map = routing.Map()
+        for k, v in controllers_class_path.iteritems():
             o = v[1]()
             controllers_object[v[0]] = o
-            controllers_object_path[k] = o
-            if hasattr(o, '_cp_path'):
-                controllers_path[o._cp_path] = o
+            members = inspect.getmembers(o)
+            for mk, mv in members:
+                if inspect.ismethod(mv) and getattr(mv, 'exposed', False):
+                    url = os.path.join(o._cp_path, mk)
+                    url += "/<path:path>"
+                    function = (mv, o.get_wrapped_method(mk))
+                    self.routing_map.add(routing.Rule(url, function))
+            controllers_path[o._cp_path] = o
 
         app = werkzeug.wsgi.SharedDataMiddleware(self.dispatch, self.statics)
         self.dispatch = DisableCacheMiddleware(app)
 
-    def find_handler(self, *l):
+    def find_handler(self, path):
         """
         Tries to discover the controller handling the request for the path
         specified by the provided parameters
 
-        :param l: path sections to a controller or controller method
+        :param path: path to match
         :returns: a callable matching the path sections, or ``None``
         :rtype: ``Controller | None``
         """
+        l = path.split('/')[1:]
         if l:
             ps = '/' + '/'.join(filter(None, l))
             method_name = 'index'

From bd5eaa5f9239d92d8517be56dd524f6ab324cc0a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 14 Jun 2013 17:52:50 +0200
Subject: [PATCH 35/94] Replaced routing by werkzeug routing

bzr revid: nicolas.vanhoren@openerp.com-20130614155250-2a29y2uv2255a79x
---
 addons/web/http.py | 94 +++++++++++++++++++---------------------------
 1 file changed, 39 insertions(+), 55 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index ddb253c6b22..35c68d1ca82 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -681,26 +681,23 @@ class Root(object):
 
         handler = self.find_handler(request.path)
 
-        if not handler:
-            response = werkzeug.exceptions.NotFound()
-        else:
-            sid = request.cookies.get('sid')
-            if not sid:
-                sid = request.args.get('sid')
+        sid = request.cookies.get('sid')
+        if not sid:
+            sid = request.args.get('sid')
 
-            session_gc(self.session_store)
+        session_gc(self.session_store)
 
-            with session_context(request, self.session_store, self.session_lock, sid) as session:
-                result = handler(request)
+        with session_context(request, self.session_store, self.session_lock, sid) as session:
+            result = handler(request)
 
-                if isinstance(result, basestring):
-                    headers=[('Content-Type', 'text/html; charset=utf-8'), ('Content-Length', len(result))]
-                    response = werkzeug.wrappers.Response(result, headers=headers)
-                else:
-                    response = result
+            if isinstance(result, basestring):
+                headers=[('Content-Type', 'text/html; charset=utf-8'), ('Content-Length', len(result))]
+                response = werkzeug.wrappers.Response(result, headers=headers)
+            else:
+                response = result
 
-                if hasattr(response, 'set_cookie'):
-                    response.set_cookie('sid', session.sid)
+            if hasattr(response, 'set_cookie'):
+                response.set_cookie('sid', session.sid)
 
         return response(environ, start_response)
 
@@ -726,16 +723,20 @@ class Root(object):
                         self.statics['/%s/static' % module] = path_static
 
         self.routing_map = routing.Map()
-        for k, v in controllers_class_path.iteritems():
+        for v in controllers_class_path.itervalues():
             o = v[1]()
             controllers_object[v[0]] = o
             members = inspect.getmembers(o)
             for mk, mv in members:
                 if inspect.ismethod(mv) and getattr(mv, 'exposed', False):
-                    url = os.path.join(o._cp_path, mk)
-                    url += "/<path:path>"
-                    function = (mv, o.get_wrapped_method(mk))
-                    self.routing_map.add(routing.Rule(url, function))
+                    if mk == "index":
+                        url = o._cp_path
+                    else:
+                        url = os.path.join(o._cp_path, mk)
+                    function = (o.get_wrapped_method(mk), mv)
+                    self.routing_map.add(routing.Rule(url, endpoint=function))
+                    url = os.path.join(url, "<path:path>")
+                    self.routing_map.add(routing.Rule(url, endpoint=function))
             controllers_path[o._cp_path] = o
 
         app = werkzeug.wsgi.SharedDataMiddleware(self.dispatch, self.statics)
@@ -747,42 +748,25 @@ class Root(object):
         specified by the provided parameters
 
         :param path: path to match
-        :returns: a callable matching the path sections, or ``None``
+        :returns: a callable matching the path sections
         :rtype: ``Controller | None``
         """
-        l = path.split('/')[1:]
-        if l:
-            ps = '/' + '/'.join(filter(None, l))
-            method_name = 'index'
-            while ps:
-                c = controllers_path.get(ps)
-                if c:
-                    method = getattr(c, method_name, None)
-                    if method:
-                        exposed = getattr(method, 'exposed', False)
-                        auth = getattr(method, 'auth', "auth")
-                        method = c.get_wrapped_method(method_name)
-                        if exposed == 'json':
-                            _logger.debug("Dispatch json to %s %s %s", ps, c, method_name)
-                            def fct(_request):
-                                _req = JsonRequest(_request, method, auth)
-                                with set_request(_req):
-                                    return request.dispatch()
-                            return fct
-                        elif exposed == 'http':
-                            _logger.debug("Dispatch http to %s %s %s", ps, c, method_name)
-                            def fct(_request):
-                                _req = HttpRequest(_request, method, auth)
-                                with set_request(_req):
-                                    return request.dispatch()
-                            return fct
-                    if method_name != "index":
-                        method_name = "index"
-                        continue
-                ps, _slash, method_name = ps.rpartition('/')
-                if not ps and method_name:
-                    ps = '/'
-        return None
+        urls = self.routing_map.bind("")
+        func, original = urls.match(path)[0]
+        auth = getattr(original, "auth", "auth")
+
+        if original.exposed == "json":
+            def fct(_request):
+                _req = JsonRequest(_request, func, auth)
+                with set_request(_req):
+                    return request.dispatch()
+            return fct
+        else: # http
+            def fct(_request):
+                _req = HttpRequest(_request, func, auth)
+                with set_request(_req):
+                    return request.dispatch()
+            return fct
 
 def wsgi_postload():
     openerp.wsgi.register_wsgi_handler(Root())

From 0aaa5edd9dd50c03d7e6250481ac0c20874d7ba7 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 18 Jun 2013 13:39:05 +0200
Subject: [PATCH 36/94] removed useless var

bzr revid: nicolas.vanhoren@openerp.com-20130618113905-yyezil4z5dl12k2v
---
 addons/web/http.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 35c68d1ca82..8d7c7fbee9d 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -485,7 +485,6 @@ addons_module = {}
 addons_manifest = {}
 controllers_class_path = {}
 controllers_object = {}
-controllers_path = {}
 
 class ControllerType(type):
     def __init__(cls, name, bases, attrs):
@@ -737,7 +736,6 @@ class Root(object):
                     self.routing_map.add(routing.Rule(url, endpoint=function))
                     url = os.path.join(url, "<path:path>")
                     self.routing_map.add(routing.Rule(url, endpoint=function))
-            controllers_path[o._cp_path] = o
 
         app = werkzeug.wsgi.SharedDataMiddleware(self.dispatch, self.statics)
         self.dispatch = DisableCacheMiddleware(app)

From f83c1d0f4c724fb72a95d7c62dbf158c86dea6fd Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 18 Jun 2013 16:50:28 +0200
Subject: [PATCH 37/94] changed the way controllers are loaded

bzr revid: nicolas.vanhoren@openerp.com-20130618145028-qrhp0uwp03g95u8h
---
 addons/web/http.py | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 8d7c7fbee9d..1cc0e488be8 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -483,7 +483,7 @@ request = _request_stack()
 #----------------------------------------------------------
 addons_module = {}
 addons_manifest = {}
-controllers_class_path = {}
+controllers_per_module = {}
 controllers_object = {}
 
 class ControllerType(type):
@@ -503,9 +503,12 @@ class ControllerType(type):
 
         # store the controller in the controllers list
         name_class = ("%s.%s" % (cls.__module__, cls.__name__), cls)
+        class_path = name_class[0].split(".")
         path = attrs.get('_cp_path')
-        if path and path not in controllers_class_path:
-            controllers_class_path[path] = name_class
+        if not path or not class_path[:2] == ["openerp", "addons"]:
+            return
+        module = class_path[2]
+        controllers_per_module.setdefault(module, []).append(name_class)
 
 class Controller(object):
     __metaclass__ = ControllerType
@@ -722,20 +725,25 @@ class Root(object):
                         self.statics['/%s/static' % module] = path_static
 
         self.routing_map = routing.Map()
-        for v in controllers_class_path.itervalues():
-            o = v[1]()
-            controllers_object[v[0]] = o
-            members = inspect.getmembers(o)
-            for mk, mv in members:
-                if inspect.ismethod(mv) and getattr(mv, 'exposed', False):
-                    if mk == "index":
-                        url = o._cp_path
-                    else:
-                        url = os.path.join(o._cp_path, mk)
-                    function = (o.get_wrapped_method(mk), mv)
-                    self.routing_map.add(routing.Rule(url, endpoint=function))
-                    url = os.path.join(url, "<path:path>")
-                    self.routing_map.add(routing.Rule(url, endpoint=function))
+        modules = controllers_per_module.keys()
+        modules.sort()
+        modules.remove("web")
+        modules = ["web"] + modules
+        for module in modules:
+            for v in controllers_per_module[module]:
+                o = v[1]()
+                controllers_object[v[0]] = o
+                members = inspect.getmembers(o)
+                for mk, mv in members:
+                    if inspect.ismethod(mv) and getattr(mv, 'exposed', False):
+                        if mk == "index":
+                            url = o._cp_path
+                        else:
+                            url = os.path.join(o._cp_path, mk)
+                        function = (o.get_wrapped_method(mk), mv)
+                        self.routing_map.add(routing.Rule(url, endpoint=function))
+                        url = os.path.join(url, "<path:path>")
+                        self.routing_map.add(routing.Rule(url, endpoint=function))
 
         app = werkzeug.wsgi.SharedDataMiddleware(self.dispatch, self.statics)
         self.dispatch = DisableCacheMiddleware(app)

From c2531549ac97fe6ce6a57d3cbad26b7063a55b25 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 18 Jun 2013 17:42:07 +0200
Subject: [PATCH 38/94] small improvements

bzr revid: nicolas.vanhoren@openerp.com-20130618154207-p1n49dwoj2357n5j
---
 addons/web/http.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 1cc0e488be8..ad5b2eee5e6 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -121,7 +121,10 @@ class WebRequest(object):
             self.session = session.OpenERPSession()
             self.httpsession[self.session_id] = self.session
 
-        # TODO: remove this shit
+        with set_request(self):
+            self.db = (self.session._db or openerp.addons.web.controllers.main.db_monodb()).lower()
+
+        # TODO: remove this
         # set db/uid trackers - they're cleaned up at the WSGI
         # dispatching phase in openerp.service.wsgi_server.application
         if self.session._db:
@@ -269,7 +272,6 @@ class JsonRequest(WebRequest):
         """
         args = self.httprequest.args
         jsonp = args.get('jsonp')
-        requestf = None
         request = None
         request_id = args.get('id')
 
@@ -289,16 +291,13 @@ class JsonRequest(WebRequest):
             request = self.session.jsonp_requests.pop(request_id, "")
         else:
             # regular jsonrpc2
-            requestf = self.httprequest.stream
+            request = self.httprequest.stream.read()
 
         response = {"jsonrpc": "2.0" }
         error = None
         try:
             # Read POST content or POST Form Data named "request"
-            if requestf:
-                self.jsonrequest = simplejson.load(requestf, object_hook=reject_nonliteral)
-            else:
-                self.jsonrequest = simplejson.loads(request, object_hook=reject_nonliteral)
+            self.jsonrequest = simplejson.loads(request, object_hook=reject_nonliteral)
             self.init(self.jsonrequest.get("params", {}))
             #if _logger.isEnabledFor(logging.DEBUG):
             #    _logger.debug("--> %s.%s\n%s", func.im_class.__name__, func.__name__, pprint.pformat(self.jsonrequest))

From 424c2e61e638989ebea39a1ea1a0a77831de2a00 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 18 Jun 2013 18:10:50 +0200
Subject: [PATCH 39/94] wip

bzr revid: nicolas.vanhoren@openerp.com-20130618161050-flzsozt2palfqp1t
---
 addons/web/http.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index ad5b2eee5e6..980acfe9509 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -676,20 +676,20 @@ class Root(object):
 
         Call the object directly.
         """
-        request = werkzeug.wrappers.Request(environ)
-        request.parameter_storage_class = werkzeug.datastructures.ImmutableDict
-        request.app = self
+        httprequest = werkzeug.wrappers.Request(environ)
+        httprequest.parameter_storage_class = werkzeug.datastructures.ImmutableDict
+        httprequest.app = self
 
-        handler = self.find_handler(request.path)
+        handler = self.find_handler(httprequest.path)
 
-        sid = request.cookies.get('sid')
+        sid = httprequest.cookies.get('sid')
         if not sid:
-            sid = request.args.get('sid')
+            sid = httprequest.args.get('sid')
 
         session_gc(self.session_store)
 
-        with session_context(request, self.session_store, self.session_lock, sid) as session:
-            result = handler(request)
+        with session_context(httprequest, self.session_store, self.session_lock, sid) as session:
+            result = handler(httprequest)
 
             if isinstance(result, basestring):
                 headers=[('Content-Type', 'text/html; charset=utf-8'), ('Content-Length', len(result))]
@@ -761,14 +761,14 @@ class Root(object):
         auth = getattr(original, "auth", "auth")
 
         if original.exposed == "json":
-            def fct(_request):
-                _req = JsonRequest(_request, func, auth)
+            def fct(httprequest):
+                _req = JsonRequest(httprequest, func, auth)
                 with set_request(_req):
                     return request.dispatch()
             return fct
         else: # http
-            def fct(_request):
-                _req = HttpRequest(_request, func, auth)
+            def fct(httprequest):
+                _req = HttpRequest(httprequest, func, auth)
                 with set_request(_req):
                     return request.dispatch()
             return fct

From fdc08bd64e4b141376f4747b01c05662fcb05484 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 18 Jun 2013 18:20:33 +0200
Subject: [PATCH 40/94] wip

bzr revid: nicolas.vanhoren@openerp.com-20130618162033-pgl073m9g91rgtxg
---
 addons/web/http.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 980acfe9509..1bb03a60093 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -680,8 +680,6 @@ class Root(object):
         httprequest.parameter_storage_class = werkzeug.datastructures.ImmutableDict
         httprequest.app = self
 
-        handler = self.find_handler(httprequest.path)
-
         sid = httprequest.cookies.get('sid')
         if not sid:
             sid = httprequest.args.get('sid')
@@ -689,6 +687,8 @@ class Root(object):
         session_gc(self.session_store)
 
         with session_context(httprequest, self.session_store, self.session_lock, sid) as session:
+            handler = self.find_handler(httprequest.path)
+
             result = handler(httprequest)
 
             if isinstance(result, basestring):

From 14329ab05707738fdcb0be55c44f0ea299857c0f Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 18 Jun 2013 19:20:59 +0200
Subject: [PATCH 41/94] added request typing guessing

bzr revid: nicolas.vanhoren@openerp.com-20130618172059-v34p34jkrr8vclb8
---
 addons/web/http.py | 44 +++++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 1bb03a60093..931d359c542 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -95,14 +95,14 @@ class WebRequest(object):
         ``int``, the id of the user related to the current request. Can be ``None``
         if the current request uses the @nodb or the @noauth decorator.
     """
-    def __init__(self, httprequest, func, auth_method="auth"):
+    def __init__(self, httprequest):
         self.httprequest = httprequest
         self.httpresponse = None
         self.httpsession = httprequest.session
         self.db = None
         self.uid = None
-        self.func = func
-        self.auth_method = auth_method
+        self.func = None
+        self.auth_method = None
         self._cr_cm = None
         self._cr = None
 
@@ -687,9 +687,12 @@ class Root(object):
         session_gc(self.session_store)
 
         with session_context(httprequest, self.session_store, self.session_lock, sid) as session:
-            handler = self.find_handler(httprequest.path)
+            request = self._build_request(httprequest)
 
-            result = handler(httprequest)
+            self.find_handler(httprequest.path, request)
+
+            with set_request(request):
+                result = request.dispatch()
 
             if isinstance(result, basestring):
                 headers=[('Content-Type', 'text/html; charset=utf-8'), ('Content-Length', len(result))]
@@ -700,7 +703,20 @@ class Root(object):
             if hasattr(response, 'set_cookie'):
                 response.set_cookie('sid', session.sid)
 
-        return response(environ, start_response)
+            return response(environ, start_response)
+
+    def _build_request(self, httprequest):
+        if httprequest.args.get('jsonp'):
+            return JsonRequest(httprequest)
+
+        content = httprequest.stream.read()
+        import cStringIO
+        httprequest.stream = cStringIO.StringIO(content)
+        try:
+            simplejson.loads(content)
+            return JsonRequest(httprequest)
+        except:
+            return HttpRequest(httprequest)
 
     def load_addons(self):
         """ Load all addons from addons patch containg static files and
@@ -747,7 +763,7 @@ class Root(object):
         app = werkzeug.wsgi.SharedDataMiddleware(self.dispatch, self.statics)
         self.dispatch = DisableCacheMiddleware(app)
 
-    def find_handler(self, path):
+    def find_handler(self, path, request):
         """
         Tries to discover the controller handling the request for the path
         specified by the provided parameters
@@ -760,18 +776,8 @@ class Root(object):
         func, original = urls.match(path)[0]
         auth = getattr(original, "auth", "auth")
 
-        if original.exposed == "json":
-            def fct(httprequest):
-                _req = JsonRequest(httprequest, func, auth)
-                with set_request(_req):
-                    return request.dispatch()
-            return fct
-        else: # http
-            def fct(httprequest):
-                _req = HttpRequest(httprequest, func, auth)
-                with set_request(_req):
-                    return request.dispatch()
-            return fct
+        request.func = func
+        request.auth_method = auth
 
 def wsgi_postload():
     openerp.wsgi.register_wsgi_handler(Root())

From d6676ec846c3553915d849056be858434ee66afc Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 19 Jun 2013 11:44:37 +0200
Subject: [PATCH 42/94] Changed the way the request init

bzr revid: nicolas.vanhoren@openerp.com-20130619094437-ybbgtrgz12n66sno
---
 addons/web/http.py | 44 ++++++++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 931d359c542..b0ab28b2249 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -265,23 +265,28 @@ class JsonRequest(WebRequest):
            "id": null}
 
     """
-    def dispatch(self):
-        """ Calls the method asked for by the JSON-RPC2 or JSONP request
+    def __init__(self, *args):
+        super(JsonRequest, self).__init__(*args)
+
+        self.jsonp_handler = None
 
-        :returns: an utf8 encoded JSON-RPC2 or JSONP reply
-        """
         args = self.httprequest.args
         jsonp = args.get('jsonp')
+        self.jsonp = jsonp
         request = None
         request_id = args.get('id')
 
         if jsonp and self.httprequest.method == 'POST':
             # jsonp 2 steps step1 POST: save call
             self.init(args)
-            self.session.jsonp_requests[request_id] = self.httprequest.form['r']
-            headers=[('Content-Type', 'text/plain; charset=utf-8')]
-            r = werkzeug.wrappers.Response(request_id, headers=headers)
-            return r
+
+            def handler():
+                self.session.jsonp_requests[request_id] = self.httprequest.form['r']
+                headers=[('Content-Type', 'text/plain; charset=utf-8')]
+                r = werkzeug.wrappers.Response(request_id, headers=headers)
+                return r
+            self.jsonp_handler = handler
+            return
         elif jsonp and args.get('r'):
             # jsonp method GET
             request = args.get('r')
@@ -293,12 +298,20 @@ class JsonRequest(WebRequest):
             # regular jsonrpc2
             request = self.httprequest.stream.read()
 
+        # Read POST content or POST Form Data named "request"
+        self.jsonrequest = simplejson.loads(request, object_hook=reject_nonliteral)
+        self.init(self.jsonrequest.get("params", {}))
+
+    def dispatch(self):
+        """ Calls the method asked for by the JSON-RPC2 or JSONP request
+
+        :returns: an utf8 encoded JSON-RPC2 or JSONP reply
+        """
+        if self.jsonp_handler:
+            return self.jsonp_handler()
         response = {"jsonrpc": "2.0" }
         error = None
         try:
-            # Read POST content or POST Form Data named "request"
-            self.jsonrequest = simplejson.loads(request, object_hook=reject_nonliteral)
-            self.init(self.jsonrequest.get("params", {}))
             #if _logger.isEnabledFor(logging.DEBUG):
             #    _logger.debug("--> %s.%s\n%s", func.im_class.__name__, func.__name__, pprint.pformat(self.jsonrequest))
             response['id'] = self.jsonrequest.get('id')
@@ -325,13 +338,13 @@ class JsonRequest(WebRequest):
         if _logger.isEnabledFor(logging.DEBUG):
             _logger.debug("<--\n%s", pprint.pformat(response))
 
-        if jsonp:
+        if self.jsonp:
             # If we use jsonp, that's mean we are called from another host
             # Some browser (IE and Safari) do no allow third party cookies
             # We need then to manage http sessions manually.
             response['httpsessionid'] = self.httpsession.sid
             mime = 'application/javascript'
-            body = "%s(%s);" % (jsonp, simplejson.dumps(response),)
+            body = "%s(%s);" % (self.jsonp, simplejson.dumps(response),)
         else:
             mime = 'application/json'
             body = simplejson.dumps(response)
@@ -385,11 +398,14 @@ def jsonrequest(f):
 class HttpRequest(WebRequest):
     """ Regular GET/POST request
     """
-    def dispatch(self):
+    def __init__(self, *args):
+        super(HttpRequest, self).__init__(*args)
         params = dict(self.httprequest.args)
         params.update(self.httprequest.form)
         params.update(self.httprequest.files)
         self.init(params)
+
+    def dispatch(self):
         akw = {}
         for key, value in self.httprequest.args.iteritems():
             if isinstance(value, basestring) and len(value) < 1024:

From 2e0461e483438710dd1e967863c662bc1440ccee Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 19 Jun 2013 11:49:03 +0200
Subject: [PATCH 43/94] wip

bzr revid: nicolas.vanhoren@openerp.com-20130619094903-5vblw05lvm4ow19n
---
 addons/web/http.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index b0ab28b2249..b5a94de4b6c 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -705,7 +705,7 @@ class Root(object):
         with session_context(httprequest, self.session_store, self.session_lock, sid) as session:
             request = self._build_request(httprequest)
 
-            self.find_handler(httprequest.path, request)
+            self.find_handler(request)
 
             with set_request(request):
                 result = request.dispatch()
@@ -779,7 +779,7 @@ class Root(object):
         app = werkzeug.wsgi.SharedDataMiddleware(self.dispatch, self.statics)
         self.dispatch = DisableCacheMiddleware(app)
 
-    def find_handler(self, path, request):
+    def find_handler(self, request):
         """
         Tries to discover the controller handling the request for the path
         specified by the provided parameters
@@ -788,6 +788,7 @@ class Root(object):
         :returns: a callable matching the path sections
         :rtype: ``Controller | None``
         """
+        path = request.httprequest.path
         urls = self.routing_map.bind("")
         func, original = urls.match(path)[0]
         auth = getattr(original, "auth", "auth")

From ee104c9ed0ef39dd9fa941bbe7240359dd29b34b Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 19 Jun 2013 12:15:50 +0200
Subject: [PATCH 44/94] now uses one routing map per db

bzr revid: nicolas.vanhoren@openerp.com-20130619101550-e3nb5aq2u474b1wx
---
 addons/web/http.py | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index b5a94de4b6c..b9873fb653e 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -670,7 +670,9 @@ class Root(object):
     def __init__(self):
         self.addons = {}
         self.statics = {}
-        self.routing_map = None
+        
+        self.db_routers = {}
+        self.db_routers_lock = threading.Lock()
 
         self.load_addons()
 
@@ -680,6 +682,7 @@ class Root(object):
         self.session_lock = threading.Lock()
         _logger.debug('HTTP sessions stored in: %s', path)
 
+
     def __call__(self, environ, start_response):
         """ Handle a WSGI request
         """
@@ -755,7 +758,13 @@ class Root(object):
                         addons_manifest[module] = manifest
                         self.statics['/%s/static' % module] = path_static
 
-        self.routing_map = routing.Map()
+        self.db_routers[None] = self._build_router(None)
+
+        app = werkzeug.wsgi.SharedDataMiddleware(self.dispatch, self.statics)
+        self.dispatch = DisableCacheMiddleware(app)
+
+    def _build_router(self, db):
+        routing_map = routing.Map()
         modules = controllers_per_module.keys()
         modules.sort()
         modules.remove("web")
@@ -767,17 +776,27 @@ class Root(object):
                 members = inspect.getmembers(o)
                 for mk, mv in members:
                     if inspect.ismethod(mv) and getattr(mv, 'exposed', False):
+                        auth = getattr(mv, 'auth', None)
+                        if (db is None and auth != 'nodb'):
+                            continue
                         if mk == "index":
                             url = o._cp_path
                         else:
                             url = os.path.join(o._cp_path, mk)
                         function = (o.get_wrapped_method(mk), mv)
-                        self.routing_map.add(routing.Rule(url, endpoint=function))
+                        routing_map.add(routing.Rule(url, endpoint=function))
                         url = os.path.join(url, "<path:path>")
-                        self.routing_map.add(routing.Rule(url, endpoint=function))
+                        routing_map.add(routing.Rule(url, endpoint=function))
+        return routing_map
 
-        app = werkzeug.wsgi.SharedDataMiddleware(self.dispatch, self.statics)
-        self.dispatch = DisableCacheMiddleware(app)
+    def get_db_router(self, db):
+        with self.db_routers_lock:
+            router = self.db_routers.get(db)
+        if not router:
+            router = self._build_router(db)
+            with self.db_routers_lock:
+                router = self.db_routers[db] = router
+        return router
 
     def find_handler(self, request):
         """
@@ -789,8 +808,9 @@ class Root(object):
         :rtype: ``Controller | None``
         """
         path = request.httprequest.path
-        urls = self.routing_map.bind("")
+        urls = self.get_db_router(request.db).bind("")
         func, original = urls.match(path)[0]
+
         auth = getattr(original, "auth", "auth")
 
         request.func = func

From 1d2bab08e118eeca63c6aa06470394327ab3d1f4 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 19 Jun 2013 12:55:31 +0200
Subject: [PATCH 45/94] now calls registrymanager update methods

bzr revid: nicolas.vanhoren@openerp.com-20130619105531-aqo7lc71d48lzmw8
---
 addons/web/http.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index b9873fb653e..fc75c323d3f 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -670,7 +670,7 @@ class Root(object):
     def __init__(self):
         self.addons = {}
         self.statics = {}
-        
+
         self.db_routers = {}
         self.db_routers_lock = threading.Lock()
 
@@ -707,12 +707,16 @@ class Root(object):
 
         with session_context(httprequest, self.session_store, self.session_lock, sid) as session:
             request = self._build_request(httprequest)
+            db = request.db
+
+            updated = openerp.modules.registry.RegistryManager.check_registry_signaling(db)
 
             self.find_handler(request)
-
             with set_request(request):
                 result = request.dispatch()
 
+            openerp.modules.registry.RegistryManager.signal_caches_change(db)
+
             if isinstance(result, basestring):
                 headers=[('Content-Type', 'text/html; charset=utf-8'), ('Content-Length', len(result))]
                 response = werkzeug.wrappers.Response(result, headers=headers)

From da9abb25ed38050af9c3bdef870cd3724170d6ba Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 19 Jun 2013 14:23:22 +0200
Subject: [PATCH 46/94] fixed minor stuff and removed controllers_object, which
 will cause some addons to crash

bzr revid: nicolas.vanhoren@openerp.com-20130619122322-aza8yd8jz4lbndnq
---
 addons/web/http.py | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index fc75c323d3f..d8e12fef1e8 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -105,6 +105,7 @@ class WebRequest(object):
         self.auth_method = None
         self._cr_cm = None
         self._cr = None
+        self.func_request_type = None
 
     def init(self, params):
         self.params = dict(params)
@@ -201,6 +202,9 @@ class WebRequest(object):
                         request._cr = None
 
             with with_obj():
+                if self.func_request_type != self._request_type:
+                    raise Exception("%s: Function declared as capable of handling request of type '%s' but called with a request of type '%s'" \
+                        % (self.httprequest.path, self.func_request_type, self._request_type))
                 return self.func(*args, **kwargs)
         finally:
             # just to be sure no one tries to re-use the request
@@ -265,6 +269,8 @@ class JsonRequest(WebRequest):
            "id": null}
 
     """
+    _request_type = "json"
+
     def __init__(self, *args):
         super(JsonRequest, self).__init__(*args)
 
@@ -398,6 +404,8 @@ def jsonrequest(f):
 class HttpRequest(WebRequest):
     """ Regular GET/POST request
     """
+    _request_type = "http"
+
     def __init__(self, *args):
         super(HttpRequest, self).__init__(*args)
         params = dict(self.httprequest.args)
@@ -499,7 +507,6 @@ request = _request_stack()
 addons_module = {}
 addons_manifest = {}
 controllers_per_module = {}
-controllers_object = {}
 
 class ControllerType(type):
     def __init__(cls, name, bases, attrs):
@@ -709,13 +716,18 @@ class Root(object):
             request = self._build_request(httprequest)
             db = request.db
 
-            updated = openerp.modules.registry.RegistryManager.check_registry_signaling(db)
+            if db:
+                updated = openerp.modules.registry.RegistryManager.check_registry_signaling(db)
+                if updated:
+                    with self.db_routers_lock:
+                        del self.db_routers[db]
 
             self.find_handler(request)
             with set_request(request):
                 result = request.dispatch()
 
-            openerp.modules.registry.RegistryManager.signal_caches_change(db)
+            if db:
+                openerp.modules.registry.RegistryManager.signal_caches_change(db)
 
             if isinstance(result, basestring):
                 headers=[('Content-Type', 'text/html; charset=utf-8'), ('Content-Length', len(result))]
@@ -776,7 +788,6 @@ class Root(object):
         for module in modules:
             for v in controllers_per_module[module]:
                 o = v[1]()
-                controllers_object[v[0]] = o
                 members = inspect.getmembers(o)
                 for mk, mv in members:
                     if inspect.ismethod(mv) and getattr(mv, 'exposed', False):
@@ -815,10 +826,9 @@ class Root(object):
         urls = self.get_db_router(request.db).bind("")
         func, original = urls.match(path)[0]
 
-        auth = getattr(original, "auth", "auth")
-
         request.func = func
-        request.auth_method = auth
+        request.auth_method = getattr(original, "auth", "auth")
+        request.func_request_type = original.exposed
 
 def wsgi_postload():
     openerp.wsgi.register_wsgi_handler(Root())

From 1a977c7d0d357588e5aa142830609621ecdee832 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 19 Jun 2013 14:33:25 +0200
Subject: [PATCH 47/94] wip

bzr revid: nicolas.vanhoren@openerp.com-20130619123325-mal77wf9pvdnubo2
---
 addons/web/http.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index d8e12fef1e8..df9a785752d 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -774,8 +774,6 @@ class Root(object):
                         addons_manifest[module] = manifest
                         self.statics['/%s/static' % module] = path_static
 
-        self.db_routers[None] = self._build_router(None)
-
         app = werkzeug.wsgi.SharedDataMiddleware(self.dispatch, self.statics)
         self.dispatch = DisableCacheMiddleware(app)
 

From b3a99c860f6e30f6a159ca1d9f53a14d97a21158 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 19 Jun 2013 15:47:11 +0200
Subject: [PATCH 48/94] now uses only the installed modules to build the routes

bzr revid: nicolas.vanhoren@openerp.com-20130619134711-evs92rdtikdeqjt1
---
 addons/web/http.py | 49 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index df9a785752d..4f89dbf10bb 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -203,8 +203,8 @@ class WebRequest(object):
 
             with with_obj():
                 if self.func_request_type != self._request_type:
-                    raise Exception("%s: Function declared as capable of handling request of type '%s' but called with a request of type '%s'" \
-                        % (self.httprequest.path, self.func_request_type, self._request_type))
+                    raise Exception("%s, %s: Function declared as capable of handling request of type '%s' but called with a request of type '%s'" \
+                        % (self.func, self.httprequest.path, self.func_request_type, self._request_type))
                 return self.func(*args, **kwargs)
         finally:
             # just to be sure no one tries to re-use the request
@@ -722,8 +722,8 @@ class Root(object):
                     with self.db_routers_lock:
                         del self.db_routers[db]
 
-            self.find_handler(request)
             with set_request(request):
+                self.find_handler()
                 result = request.dispatch()
 
             if db:
@@ -778,20 +778,45 @@ class Root(object):
         self.dispatch = DisableCacheMiddleware(app)
 
     def _build_router(self, db):
+        _logger.info("Generating routing configuration for database %s" % db)
         routing_map = routing.Map()
-        modules = controllers_per_module.keys()
-        modules.sort()
-        modules.remove("web")
-        modules = ["web"] + modules
+        modules_set = set(controllers_per_module.keys())
+        modules_set -= set("web")
+
+        modules = ["web"] + sorted(modules_set)
+        # building all nodb methods
+        for module in modules:
+            for v in controllers_per_module[module]:
+                members = inspect.getmembers(v[1]())
+                for mk, mv in members:
+                    if inspect.ismethod(mv) and getattr(mv, 'exposed', False) and getattr(mv, 'auth', None) == "nodb":
+                        o = v[1]()
+                        if mk == "index":
+                            url = o._cp_path
+                        else:
+                            url = os.path.join(o._cp_path, mk)
+                        function = (o.get_wrapped_method(mk), mv)
+                        routing_map.add(routing.Rule(url, endpoint=function))
+                        url = os.path.join(url, "<path:path>")
+                        routing_map.add(routing.Rule(url, endpoint=function))
+
+        if not db:
+            return routing_map
+
+        registry = openerp.modules.registry.RegistryManager.get(db)
+        with registry.cursor() as cr:
+            m = registry.get('ir.module.module')
+            ids = m.search(cr, openerp.SUPERUSER_ID, [('state','=','installed')])
+            installed = set([x['name'] for x in m.read(cr, 1, ids, ['name'])])
+            modules_set -= set(installed)
+        modules = ["web"] + sorted(modules_set)
+        # building all other methods
         for module in modules:
             for v in controllers_per_module[module]:
                 o = v[1]()
                 members = inspect.getmembers(o)
                 for mk, mv in members:
-                    if inspect.ismethod(mv) and getattr(mv, 'exposed', False):
-                        auth = getattr(mv, 'auth', None)
-                        if (db is None and auth != 'nodb'):
-                            continue
+                    if inspect.ismethod(mv) and getattr(mv, 'exposed', False) and getattr(mv, 'auth', None) != "nodb":
                         if mk == "index":
                             url = o._cp_path
                         else:
@@ -811,7 +836,7 @@ class Root(object):
                 router = self.db_routers[db] = router
         return router
 
-    def find_handler(self, request):
+    def find_handler(self):
         """
         Tries to discover the controller handling the request for the path
         specified by the provided parameters

From 69ae9cc0b5fa0d0db0a72111619f6b27dfd8a68e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 19 Jun 2013 18:16:27 +0200
Subject: [PATCH 49/94] Big refactoring to prepare even more refactoring

bzr revid: nicolas.vanhoren@openerp.com-20130619161627-543e0brldclvvw98
---
 addons/web/controllers/main.py    | 412 +++++++++++++++---------------
 addons/web/controllers/testing.py |   4 +-
 addons/web/http.py                |  94 ++++---
 3 files changed, 267 insertions(+), 243 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 87355d075f3..708600fdb99 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -34,9 +34,9 @@ import openerp.modules.registry
 from openerp.tools.translate import _
 
 from .. import http
-openerpweb = http
+http = http
 
-from openerp.addons.web.http import request as req, noauth, nodb
+from openerp.addons.web.http import request, nodb, noauth
 
 #----------------------------------------------------------
 # OpenERP Web helpers
@@ -87,9 +87,9 @@ def rjsmin(script):
     return result
 
 def db_list():
-    proxy = req.session.proxy("db")
+    proxy = request.session.proxy("db")
     dbs = proxy.list()
-    h = req.httprequest.environ['HTTP_HOST'].split(':')[0]
+    h = request.httprequest.environ['HTTP_HOST'].split(':')[0]
     d = h.split('.')[0]
     r = openerp.tools.config['dbfilter'].replace('%h', h).replace('%d', d)
     dbs = [i for i in dbs if re.match(r, i)]
@@ -100,7 +100,7 @@ def db_monodb_redirect():
     redirect = False
 
     # 1 try the db in the url
-    db_url = req.params.get('db')
+    db_url = request.params.get('db')
     if db_url:
         return (db_url, False)
 
@@ -111,7 +111,7 @@ def db_monodb_redirect():
         dbs = []
 
     # 2 use the database from the cookie if it's listable and still listed
-    cookie_db = req.httprequest.cookies.get('last_used_database')
+    cookie_db = request.httprequest.cookies.get('last_used_database')
     if cookie_db in dbs:
         db = cookie_db
 
@@ -121,9 +121,9 @@ def db_monodb_redirect():
 
     # redirect to the chosen db if multiple are available
     if db and len(dbs) > 1:
-        query = dict(urlparse.parse_qsl(req.httprequest.query_string, keep_blank_values=True))
+        query = dict(urlparse.parse_qsl(request.httprequest.query_string, keep_blank_values=True))
         query.update({ 'db': db })
-        redirect = req.httprequest.path + '?' + urllib.urlencode(query)
+        redirect = request.httprequest.path + '?' + urllib.urlencode(query)
     return (db, redirect)
 
 def db_monodb():
@@ -131,9 +131,9 @@ def db_monodb():
     return db_monodb_redirect()[0]
 
 def redirect_with_hash(url, code=303):
-    if req.httprequest.user_agent.browser == 'msie':
+    if request.httprequest.user_agent.browser == 'msie':
         try:
-            version = float(req.httprequest.user_agent.version)
+            version = float(request.httprequest.user_agent.version)
             if version < 10:
                 return "<html><head><script>window.location = '%s#' + location.hash;</script></head></html>" % url
         except Exception:
@@ -186,18 +186,18 @@ def module_topological_sort(modules):
 
 def module_installed():
     # Candidates module the current heuristic is the /static dir
-    loadable = openerpweb.addons_manifest.keys()
+    loadable = http.addons_manifest.keys()
     modules = {}
 
     # Retrieve database installed modules
     # TODO The following code should move to ir.module.module.list_installed_modules()
-    Modules = req.session.model('ir.module.module')
+    Modules = request.session.model('ir.module.module')
     domain = [('state','=','installed'), ('name','in', loadable)]
     for module in Modules.search_read(domain, ['name', 'dependencies_id']):
         modules[module['name']] = []
         deps = module.get('dependencies_id')
         if deps:
-            deps_read = req.session.model('ir.module.module.dependency').read(deps, ['name'])
+            deps_read = request.session.model('ir.module.module.dependency').read(deps, ['name'])
             dependencies = [i['name'] for i in deps_read]
             modules[module['name']] = dependencies
 
@@ -205,7 +205,7 @@ def module_installed():
     return sorted_modules
 
 def module_installed_bypass_session(dbname):
-    loadable = openerpweb.addons_manifest.keys()
+    loadable = http.addons_manifest.keys()
     modules = {}
     try:
         registry = openerp.modules.registry.RegistryManager.get(dbname)
@@ -231,7 +231,7 @@ def module_boot(db=None):
     serverside = []
     dbside = []
     for i in server_wide_modules:
-        if i in openerpweb.addons_manifest:
+        if i in http.addons_manifest:
             serverside.append(i)
     monodb = db or db_monodb()
     if monodb:
@@ -317,7 +317,7 @@ def manifest_glob(extension, addons=None, db=None, include_remotes=False):
         addons = addons.split(',')
     r = []
     for addon in addons:
-        manifest = openerpweb.addons_manifest.get(addon, None)
+        manifest = http.addons_manifest.get(addon, None)
         if not manifest:
             continue
         # ensure does not ends with /
@@ -338,7 +338,7 @@ def manifest_list(extension, mods=None, db=None):
     db: a database name (return all installed modules in that database)
     """
     files = manifest_glob(extension, addons=mods, db=db, include_remotes=True)
-    if not req.debug:
+    if not request.debug:
         path = '/web/webclient/' + extension
         if mods is not None:
             path += '?' + urllib.urlencode({'mods': mods})
@@ -383,28 +383,28 @@ def make_conditional(response, last_modified=None, etag=None):
         response.last_modified = last_modified
     if etag:
         response.set_etag(etag)
-    return response.make_conditional(req.httprequest)
+    return response.make_conditional(request.httprequest)
 
 def login_and_redirect(db, login, key, redirect_url='/'):
-    wsgienv = req.httprequest.environ
+    wsgienv = request.httprequest.environ
     env = dict(
-        base_location=req.httprequest.url_root.rstrip('/'),
+        base_location=request.httprequest.url_root.rstrip('/'),
         HTTP_HOST=wsgienv['HTTP_HOST'],
         REMOTE_ADDR=wsgienv['REMOTE_ADDR'],
     )
-    req.session.authenticate(db, login, key, env)
+    request.session.authenticate(db, login, key, env)
     return set_cookie_and_redirect(redirect_url)
 
 def set_cookie_and_redirect(redirect_url):
     redirect = werkzeug.utils.redirect(redirect_url, 303)
     redirect.autocorrect_location_header = False
-    cookie_val = urllib2.quote(simplejson.dumps(req.session_id))
+    cookie_val = urllib2.quote(simplejson.dumps(request.session_id))
     redirect.set_cookie('instance0|session_id', cookie_val)
     return redirect
 
 def load_actions_from_ir_values(key, key2, models, meta):
-    Values = req.session.model('ir.values')
-    actions = Values.get(key, key2, models, meta, req.context)
+    Values = request.session.model('ir.values')
+    actions = Values.get(key, key2, models, meta, request.context)
 
     return [(id, name, clean_action(action))
             for id, name, action in actions]
@@ -530,8 +530,8 @@ def xml2json_from_elementtree(el, preserve_whitespaces=False):
 def content_disposition(filename):
     filename = filename.encode('utf8')
     escaped = urllib2.quote(filename)
-    browser = req.httprequest.user_agent.browser
-    version = int((req.httprequest.user_agent.version or '0').split('.')[0])
+    browser = request.httprequest.user_agent.browser
+    version = int((request.httprequest.user_agent.version or '0').split('.')[0])
     if browser == 'msie' and version < 9:
         return "attachment; filename=%s" % escaped
     elif browser == 'safari':
@@ -570,10 +570,10 @@ html_template = """<!DOCTYPE html>
 </html>
 """
 
-class Home(openerpweb.Controller):
+class Home(http.Controller):
     _cp_path = '/'
 
-    @openerpweb.httprequest
+    @http.httprequest
     @nodb
     def index(self, s_action=None, db=None, **kw):
         db, redir = db_monodb_redirect()
@@ -591,40 +591,40 @@ class Home(openerpweb.Controller):
         }
         return r
 
-    @openerpweb.httprequest
+    @http.httprequest
     def login(self, db, login, key):
         return login_and_redirect(db, login, key)
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     @nodb
     def jsonrpc(self, service, method, args):
         """ Method used by client APIs to contact OpenERP. """
         return openerp.netsvc.dispatch_rpc(service, method, args)
 
-class WebClient(openerpweb.Controller):
+class WebClient(http.Controller):
     _cp_path = "/web/webclient"
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     @nodb
     def csslist(self, mods=None):
         return manifest_list('css', mods=mods)
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     @nodb
     def jslist(self, mods=None):
         return manifest_list('js', mods=mods)
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     @nodb
     def qweblist(self, mods=None):
         return manifest_list('qweb', mods=mods)
 
-    @openerpweb.httprequest
+    @http.httprequest
     @nodb
     def css(self, mods=None, db=None):
         files = list(manifest_glob('css', addons=mods, db=db))
         last_modified = get_last_modified(f[0] for f in files)
-        if req.httprequest.if_modified_since and req.httprequest.if_modified_since >= last_modified:
+        if request.httprequest.if_modified_since and request.httprequest.if_modified_since >= last_modified:
             return werkzeug.wrappers.Response(status=304)
 
         file_map = dict(files)
@@ -668,38 +668,38 @@ class WebClient(openerpweb.Controller):
         content = '\n'.join(matches)
 
         return make_conditional(
-            req.make_response(content, [('Content-Type', 'text/css')]),
+            request.make_response(content, [('Content-Type', 'text/css')]),
             last_modified, checksum)
 
-    @openerpweb.httprequest
+    @http.httprequest
     @nodb
     def js(self, mods=None, db=None):
         files = [f[0] for f in manifest_glob('js', addons=mods, db=db)]
         last_modified = get_last_modified(files)
-        if req.httprequest.if_modified_since and req.httprequest.if_modified_since >= last_modified:
+        if request.httprequest.if_modified_since and request.httprequest.if_modified_since >= last_modified:
             return werkzeug.wrappers.Response(status=304)
 
         content, checksum = concat_js(files)
 
         return make_conditional(
-            req.make_response(content, [('Content-Type', 'application/javascript')]),
+            request.make_response(content, [('Content-Type', 'application/javascript')]),
             last_modified, checksum)
 
-    @openerpweb.httprequest
+    @http.httprequest
     @nodb
     def qweb(self, mods=None, db=None):
         files = [f[0] for f in manifest_glob('qweb', addons=mods, db=db)]
         last_modified = get_last_modified(files)
-        if req.httprequest.if_modified_since and req.httprequest.if_modified_since >= last_modified:
+        if request.httprequest.if_modified_since and request.httprequest.if_modified_since >= last_modified:
             return werkzeug.wrappers.Response(status=304)
 
         content, checksum = concat_xml(files)
 
         return make_conditional(
-            req.make_response(content, [('Content-Type', 'text/xml')]),
+            request.make_response(content, [('Content-Type', 'text/xml')]),
             last_modified, checksum)
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     @nodb
     def bootstrap_translations(self, mods):
         """ Load local translations from *.po files, as a temporary solution
@@ -709,12 +709,12 @@ class WebClient(openerpweb.Controller):
         # For performance reasons we only load a single translation, so for
         # sub-languages (that should only be partially translated) we load the
         # main language PO instead - that should be enough for the login screen.
-        lang = req.lang.split('_')[0]
+        lang = request.lang.split('_')[0]
 
         translations_per_module = {}
         for addon_name in mods:
-            if openerpweb.addons_manifest[addon_name].get('bootstrap'):
-                addons_path = openerpweb.addons_manifest[addon_name]['addons_path']
+            if http.addons_manifest[addon_name].get('bootstrap'):
+                addons_path = http.addons_manifest[addon_name]['addons_path']
                 f_name = os.path.join(addons_path, addon_name, "i18n", lang + ".po")
                 if not os.path.exists(f_name):
                     continue
@@ -723,9 +723,9 @@ class WebClient(openerpweb.Controller):
         return {"modules": translations_per_module,
                 "lang_parameters": None}
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def translations(self, mods, lang):
-        res_lang = req.session.model('res.lang')
+        res_lang = request.session.model('res.lang')
         ids = res_lang.search([("code", "=", lang)])
         lang_params = None
         if ids:
@@ -734,7 +734,7 @@ class WebClient(openerpweb.Controller):
 
         # Regional languages (ll_CC) must inherit/override their parent lang (ll), but this is
         # done server-side when the language is loaded, so we only need to load the user's lang.
-        ir_translation = req.session.model('ir.translation')
+        ir_translation = request.session.model('ir.translation')
         translations_per_module = {}
         messages = ir_translation.search_read([('module','in',mods),('lang','=',lang),
                                                ('comments','like','openerp-web'),('value','!=',False),
@@ -748,15 +748,15 @@ class WebClient(openerpweb.Controller):
         return {"modules": translations_per_module,
                 "lang_parameters": lang_params}
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     @nodb
     def version_info(self):
         return openerp.service.common.exp_version()
 
-class Proxy(openerpweb.Controller):
+class Proxy(http.Controller):
     _cp_path = '/web/proxy'
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     @nodb
     def load(self, path):
         """ Proxies an HTTP request through a JSON request.
@@ -770,37 +770,37 @@ class Proxy(openerpweb.Controller):
         from werkzeug.test import Client
         from werkzeug.wrappers import BaseResponse
 
-        return Client(req.httprequest.app, BaseResponse).get(path).data
+        return Client(request.httprequest.app, BaseResponse).get(path).data
 
-class Database(openerpweb.Controller):
+class Database(http.Controller):
     _cp_path = "/web/database"
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     @nodb
     def get_list(self):
         return db_list()
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     @nodb
     def create(self, fields):
         params = dict(map(operator.itemgetter('name', 'value'), fields))
-        return req.session.proxy("db").create_database(
+        return request.session.proxy("db").create_database(
             params['super_admin_pwd'],
             params['db_name'],
             bool(params.get('demo_data')),
             params['db_lang'],
             params['create_admin_pwd'])
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     @nodb
     def duplicate(self, fields):
         params = dict(map(operator.itemgetter('name', 'value'), fields))
-        return req.session.proxy("db").duplicate_database(
+        return request.session.proxy("db").duplicate_database(
             params['super_admin_pwd'],
             params['db_original_name'],
             params['db_name'])
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     @nodb
     def duplicate(self, fields):
         params = dict(map(operator.itemgetter('name', 'value'), fields))
@@ -810,9 +810,9 @@ class Database(openerpweb.Controller):
             params['db_name'],
         )
 
-        return req.session.proxy("db").duplicate_database(*duplicate_attrs)
+        return request.session.proxy("db").duplicate_database(*duplicate_attrs)
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     @nodb
     def drop(self, fields):
         password, db = operator.itemgetter(
@@ -820,24 +820,24 @@ class Database(openerpweb.Controller):
                 dict(map(operator.itemgetter('name', 'value'), fields)))
 
         try:
-            return req.session.proxy("db").drop(password, db)
+            return request.session.proxy("db").drop(password, db)
         except openerp.exceptions.AccessDenied:
             return {'error': 'AccessDenied', 'title': 'Drop Database'}
         except Exception:
             return {'error': _('Could not drop database !'), 'title': _('Drop Database')}
 
-    @openerpweb.httprequest
+    @http.httprequest
     @nodb
     def backup(self, backup_db, backup_pwd, token):
         try:
             db_dump = base64.b64decode(
-                req.session.proxy("db").dump(backup_pwd, backup_db))
+                request.session.proxy("db").dump(backup_pwd, backup_db))
             filename = "%(db)s_%(timestamp)s.dump" % {
                 'db': backup_db,
                 'timestamp': datetime.datetime.utcnow().strftime(
                     "%Y-%m-%d_%H-%M-%SZ")
             }
-            return req.make_response(db_dump,
+            return request.make_response(db_dump,
                [('Content-Type', 'application/octet-stream; charset=binary'),
                ('Content-Disposition', content_disposition(filename))],
                {'fileToken': int(token)}
@@ -845,63 +845,63 @@ class Database(openerpweb.Controller):
         except Exception, e:
             return simplejson.dumps([[],[{'error': openerp.tools.ustr(e), 'title': _('Backup Database')}]])
 
-    @openerpweb.httprequest
+    @http.httprequest
     @nodb
     def restore(self, db_file, restore_pwd, new_db):
         try:
             data = base64.b64encode(db_file.read())
-            req.session.proxy("db").restore(restore_pwd, new_db, data)
+            request.session.proxy("db").restore(restore_pwd, new_db, data)
             return ''
         except openerp.exceptions.AccessDenied, e:
             raise Exception("AccessDenied")
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     @nodb
     def change_password(self, fields):
         old_password, new_password = operator.itemgetter(
             'old_pwd', 'new_pwd')(
                 dict(map(operator.itemgetter('name', 'value'), fields)))
         try:
-            return req.session.proxy("db").change_admin_password(old_password, new_password)
+            return request.session.proxy("db").change_admin_password(old_password, new_password)
         except openerp.exceptions.AccessDenied:
             return {'error': 'AccessDenied', 'title': _('Change Password')}
         except Exception:
             return {'error': _('Error, password not changed !'), 'title': _('Change Password')}
 
-class Session(openerpweb.Controller):
+class Session(http.Controller):
     _cp_path = "/web/session"
 
     def session_info(self):
-        req.session.ensure_valid()
+        request.session.ensure_valid()
         return {
-            "session_id": req.session_id,
-            "uid": req.session._uid,
-            "user_context": req.session.get_context() if req.session._uid else {},
-            "db": req.session._db,
-            "username": req.session._login,
+            "session_id": request.session_id,
+            "uid": request.session._uid,
+            "user_context": request.session.get_context() if request.session._uid else {},
+            "db": request.session._db,
+            "username": request.session._login,
         }
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     @nodb
     def get_session_info(self):
-        req.uid = req.session._uid
-        req.db = req.session._db
+        request.uid = request.session._uid
+        request.db = request.session._db
         return self.session_info()
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     @nodb
     def authenticate(self, db, login, password, base_location=None):
-        wsgienv = req.httprequest.environ
+        wsgienv = request.httprequest.environ
         env = dict(
             base_location=base_location,
             HTTP_HOST=wsgienv['HTTP_HOST'],
             REMOTE_ADDR=wsgienv['REMOTE_ADDR'],
         )
-        req.session.authenticate(db, login, password, env)
+        request.session.authenticate(db, login, password, env)
 
         return self.session_info()
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def change_password (self, fields):
         old_password, new_password,confirm_password = operator.itemgetter('old_pwd', 'new_password','confirm_pwd')(
                 dict(map(operator.itemgetter('name', 'value'), fields)))
@@ -910,32 +910,32 @@ class Session(openerpweb.Controller):
         if new_password != confirm_password:
             return {'error': _('The new password and its confirmation must be identical.'),'title': _('Change Password')}
         try:
-            if req.session.model('res.users').change_password(
+            if request.session.model('res.users').change_password(
                 old_password, new_password):
                 return {'new_password':new_password}
         except Exception:
             return {'error': _('The old password you provided is incorrect, your password was not changed.'), 'title': _('Change Password')}
         return {'error': _('Error, password not changed !'), 'title': _('Change Password')}
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def sc_list(self):
-        return req.session.model('ir.ui.view_sc').get_sc(
-            req.session._uid, "ir.ui.menu", req.context)
+        return request.session.model('ir.ui.view_sc').get_sc(
+            request.session._uid, "ir.ui.menu", request.context)
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     @nodb
     def get_lang_list(self):
         try:
-            return req.session.proxy("db").list_lang() or []
+            return request.session.proxy("db").list_lang() or []
         except Exception, e:
             return {"error": e, "title": _("Languages")}
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def modules(self):
         # return all installed modules. Web client is smart enough to not load a module twice
         return module_installed()
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def save_session_action(self, the_action):
         """
         This method store an action object in the session object and returns an integer
@@ -947,10 +947,10 @@ class Session(openerpweb.Controller):
         :return: A key identifying the saved action.
         :rtype: integer
         """
-        saved_actions = req.httpsession.get('saved_actions')
+        saved_actions = request.httpsession.get('saved_actions')
         if not saved_actions:
             saved_actions = {"next":1, "actions":{}}
-            req.httpsession['saved_actions'] = saved_actions
+            request.httpsession['saved_actions'] = saved_actions
         # we don't allow more than 10 stored actions
         if len(saved_actions["actions"]) >= 10:
             del saved_actions["actions"][min(saved_actions["actions"])]
@@ -959,7 +959,7 @@ class Session(openerpweb.Controller):
         saved_actions["next"] = key + 1
         return key
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def get_session_action(self, key):
         """
         Gets back a previously saved action. This method can return None if the action
@@ -970,57 +970,57 @@ class Session(openerpweb.Controller):
         :return: The saved action or None.
         :rtype: anything
         """
-        saved_actions = req.httpsession.get('saved_actions')
+        saved_actions = request.httpsession.get('saved_actions')
         if not saved_actions:
             return None
         return saved_actions["actions"].get(key)
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def check(self):
-        req.session.assert_valid()
+        request.session.assert_valid()
         return None
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def destroy(self):
-        req.session._suicide = True
+        request.session._suicide = True
 
-class Menu(openerpweb.Controller):
+class Menu(http.Controller):
     _cp_path = "/web/menu"
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def get_user_roots(self):
         """ Return all root menu ids visible for the session user.
 
         :return: the root menu ids
         :rtype: list(int)
         """
-        s = req.session
+        s = request.session
         Menus = s.model('ir.ui.menu')
         # If a menu action is defined use its domain to get the root menu items
         user_menu_id = s.model('res.users').read([s._uid], ['menu_id'],
-                                                 req.context)[0]['menu_id']
+                                                 request.context)[0]['menu_id']
 
         menu_domain = [('parent_id', '=', False)]
         if user_menu_id:
             domain_string = s.model('ir.actions.act_window').read(
-                [user_menu_id[0]], ['domain'],req.context)[0]['domain']
+                [user_menu_id[0]], ['domain'],request.context)[0]['domain']
             if domain_string:
                 menu_domain = ast.literal_eval(domain_string)
 
-        return Menus.search(menu_domain, 0, False, False, req.context)
+        return Menus.search(menu_domain, 0, False, False, request.context)
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def load(self):
         """ Loads all menu items (all applications and their sub-menus).
 
         :return: the menu root
         :rtype: dict('children': menu_nodes)
         """
-        Menus = req.session.model('ir.ui.menu')
+        Menus = request.session.model('ir.ui.menu')
 
         fields = ['name', 'sequence', 'parent_id', 'action']
         menu_root_ids = self.get_user_roots()
-        menu_roots = Menus.read(menu_root_ids, fields, req.context) if menu_root_ids else []
+        menu_roots = Menus.read(menu_root_ids, fields, request.context) if menu_root_ids else []
         menu_root = {
             'id': False,
             'name': 'root',
@@ -1033,8 +1033,8 @@ class Menu(openerpweb.Controller):
 
         # menus are loaded fully unlike a regular tree view, cause there are a
         # limited number of items (752 when all 6.1 addons are installed)
-        menu_ids = Menus.search([('id', 'child_of', menu_root_ids)], 0, False, False, req.context)
-        menu_items = Menus.read(menu_ids, fields, req.context)
+        menu_ids = Menus.search([('id', 'child_of', menu_root_ids)], 0, False, False, request.context)
+        menu_items = Menus.read(menu_ids, fields, request.context)
         # adds roots at the end of the sequence, so that they will overwrite
         # equivalent menu items from full menu read when put into id:item
         # mapping, resulting in children being correctly set on the roots.
@@ -1060,26 +1060,26 @@ class Menu(openerpweb.Controller):
 
         return menu_root
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def load_needaction(self, menu_ids):
         """ Loads needaction counters for specific menu ids.
 
             :return: needaction data
             :rtype: dict(menu_id: {'needaction_enabled': boolean, 'needaction_counter': int})
         """
-        return req.session.model('ir.ui.menu').get_needaction_data(menu_ids, req.context)
+        return request.session.model('ir.ui.menu').get_needaction_data(menu_ids, request.context)
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def action(self, menu_id):
         # still used by web_shortcut
         actions = load_actions_from_ir_values('action', 'tree_but_open',
                                              [('ir.ui.menu', menu_id)], False)
         return {"action": actions}
 
-class DataSet(openerpweb.Controller):
+class DataSet(http.Controller):
     _cp_path = "/web/dataset"
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def search_read(self, model, fields=False, offset=0, limit=False, domain=None, sort=None):
         return self.do_search_read(model, fields, offset, limit, domain, sort)
     def do_search_read(self, model, fields=False, offset=0, limit=False, domain=None
@@ -1099,12 +1099,12 @@ class DataSet(openerpweb.Controller):
                   matching fields selection set)
         :rtype: list
         """
-        Model = req.session.model(model)
+        Model = request.session.model(model)
 
         ids = Model.search(domain, offset or 0, limit or False, sort or False,
-                           req.context)
+                           request.context)
         if limit and len(ids) == limit:
-            length = Model.search_count(domain, req.context)
+            length = Model.search_count(domain, request.context)
         else:
             length = len(ids) + (offset or 0)
         if fields and fields == ['id']:
@@ -1114,18 +1114,18 @@ class DataSet(openerpweb.Controller):
                 'records': [{'id': id} for id in ids]
             }
 
-        records = Model.read(ids, fields or False, req.context)
+        records = Model.read(ids, fields or False, request.context)
         records.sort(key=lambda obj: ids.index(obj['id']))
         return {
             'length': length,
             'records': records
         }
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def load(self, model, id, fields):
-        m = req.session.model(model)
+        m = request.session.model(model)
         value = {}
-        r = m.read([id], False, req.context)
+        r = m.read([id], False, request.context)
         if r:
             value = r[0]
         return {'value': value}
@@ -1137,36 +1137,36 @@ class DataSet(openerpweb.Controller):
         # Temporary implements future display_name special field for model#read()
         if method == 'read' and kwargs.get('context', {}).get('future_display_name'):
             if 'display_name' in args[1]:
-                names = dict(req.session.model(model).name_get(args[0], **kwargs))
+                names = dict(request.session.model(model).name_get(args[0], **kwargs))
                 args[1].remove('display_name')
-                records = req.session.model(model).read(*args, **kwargs)
+                records = request.session.model(model).read(*args, **kwargs)
                 for record in records:
                     record['display_name'] = \
                         names.get(record['id']) or "%s#%d" % (model, (record['id']))
                 return records
 
-        return getattr(req.session.model(model), method)(*args, **kwargs)
+        return getattr(request.session.model(model), method)(*args, **kwargs)
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def call(self, model, method, args, domain_id=None, context_id=None):
         return self._call_kw(model, method, args, {})
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def call_kw(self, model, method, args, kwargs):
         return self._call_kw(model, method, args, kwargs)
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def call_button(self, model, method, args, domain_id=None, context_id=None):
         action = self._call_kw(model, method, args, {})
         if isinstance(action, dict) and action.get('type') != '':
             return clean_action(action)
         return False
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def exec_workflow(self, model, id, signal):
-        return req.session.exec_workflow(model, id, signal)
+        return request.session.exec_workflow(model, id, signal)
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def resequence(self, model, ids, field='sequence', offset=0):
         """ Re-sequences a number of records in the model, by their ids
 
@@ -1181,7 +1181,7 @@ class DataSet(openerpweb.Controller):
                            starting the resequencing from an arbitrary number,
                            defaults to ``0``
         """
-        m = req.session.model(model)
+        m = request.session.model(model)
         if not m.fields_get([field]):
             return False
         # python 2.6 has no start parameter
@@ -1189,51 +1189,51 @@ class DataSet(openerpweb.Controller):
             m.write(id, { field: i + offset })
         return True
 
-class View(openerpweb.Controller):
+class View(http.Controller):
     _cp_path = "/web/view"
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def add_custom(self, view_id, arch):
-        CustomView = req.session.model('ir.ui.view.custom')
+        CustomView = request.session.model('ir.ui.view.custom')
         CustomView.create({
-            'user_id': req.session._uid,
+            'user_id': request.session._uid,
             'ref_id': view_id,
             'arch': arch
-        }, req.context)
+        }, request.context)
         return {'result': True}
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def undo_custom(self, view_id, reset=False):
-        CustomView = req.session.model('ir.ui.view.custom')
-        vcustom = CustomView.search([('user_id', '=', req.session._uid), ('ref_id' ,'=', view_id)],
-                                    0, False, False, req.context)
+        CustomView = request.session.model('ir.ui.view.custom')
+        vcustom = CustomView.search([('user_id', '=', request.session._uid), ('ref_id' ,'=', view_id)],
+                                    0, False, False, request.context)
         if vcustom:
             if reset:
-                CustomView.unlink(vcustom, req.context)
+                CustomView.unlink(vcustom, request.context)
             else:
-                CustomView.unlink([vcustom[0]], req.context)
+                CustomView.unlink([vcustom[0]], request.context)
             return {'result': True}
         return {'result': False}
 
 class TreeView(View):
     _cp_path = "/web/treeview"
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def action(self, model, id):
         return load_actions_from_ir_values(
             'action', 'tree_but_open',[(model, id)],
             False)
 
-class Binary(openerpweb.Controller):
+class Binary(http.Controller):
     _cp_path = "/web/binary"
 
-    @openerpweb.httprequest
+    @http.httprequest
     def image(self, model, id, field, **kw):
         last_update = '__last_update'
-        Model = req.session.model(model)
+        Model = request.session.model(model)
         headers = [('Content-Type', 'image/png')]
-        etag = req.httprequest.headers.get('If-None-Match')
-        hashed_session = hashlib.md5(req.session_id).hexdigest()
+        etag = request.httprequest.headers.get('If-None-Match')
+        hashed_session = hashlib.md5(request.session_id).hexdigest()
         retag = hashed_session
         id = None if not id else simplejson.loads(id)
         if type(id) is list:
@@ -1243,15 +1243,15 @@ class Binary(openerpweb.Controller):
                 if not id and hashed_session == etag:
                     return werkzeug.wrappers.Response(status=304)
                 else:
-                    date = Model.read([id], [last_update], req.context)[0].get(last_update)
+                    date = Model.read([id], [last_update], request.context)[0].get(last_update)
                     if hashlib.md5(date).hexdigest() == etag:
                         return werkzeug.wrappers.Response(status=304)
 
             if not id:
-                res = Model.default_get([field], req.context).get(field)
+                res = Model.default_get([field], request.context).get(field)
                 image_base64 = res
             else:
-                res = Model.read([id], [last_update, field], req.context)[0]
+                res = Model.read([id], [last_update, field], request.context)[0]
                 retag = hashlib.md5(res.get(last_update)).hexdigest()
                 image_base64 = res.get(field)
 
@@ -1276,13 +1276,13 @@ class Binary(openerpweb.Controller):
             headers.append(('Cache-Control', 'no-cache' if ncache == 0 else 'max-age=%s' % (ncache)))
         except:
             pass
-        return req.make_response(image_data, headers)
+        return request.make_response(image_data, headers)
 
     def placeholder(self, image='placeholder.png'):
-        addons_path = openerpweb.addons_manifest['web']['addons_path']
+        addons_path = http.addons_manifest['web']['addons_path']
         return open(os.path.join(addons_path, 'web', 'static', 'src', 'img', image), 'rb').read()
 
-    @openerpweb.httprequest
+    @http.httprequest
     def saveas(self, model, field, id=None, filename_field=None, **kw):
         """ Download link for files stored as binary fields.
 
@@ -1296,26 +1296,26 @@ class Binary(openerpweb.Controller):
         :param str filename_field: field holding the file's name, if any
         :returns: :class:`werkzeug.wrappers.Response`
         """
-        Model = req.session.model(model)
+        Model = request.session.model(model)
         fields = [field]
         if filename_field:
             fields.append(filename_field)
         if id:
-            res = Model.read([int(id)], fields, req.context)[0]
+            res = Model.read([int(id)], fields, request.context)[0]
         else:
-            res = Model.default_get(fields, req.context)
+            res = Model.default_get(fields, request.context)
         filecontent = base64.b64decode(res.get(field, ''))
         if not filecontent:
-            return req.not_found()
+            return request.not_found()
         else:
             filename = '%s_%s' % (model.replace('.', '_'), id)
             if filename_field:
                 filename = res.get(filename_field, '') or filename
-            return req.make_response(filecontent,
+            return request.make_response(filecontent,
                 [('Content-Type', 'application/octet-stream'),
                  ('Content-Disposition', content_disposition(filename))])
 
-    @openerpweb.httprequest
+    @http.httprequest
     def saveas_ajax(self, data, token):
         jdata = simplejson.loads(data)
         model = jdata['model']
@@ -1325,7 +1325,7 @@ class Binary(openerpweb.Controller):
         filename_field = jdata.get('filename_field', None)
         context = jdata.get('context', {})
 
-        Model = req.session.model(model)
+        Model = request.session.model(model)
         fields = [field]
         if filename_field:
             fields.append(filename_field)
@@ -1343,12 +1343,12 @@ class Binary(openerpweb.Controller):
             filename = '%s_%s' % (model.replace('.', '_'), id)
             if filename_field:
                 filename = res.get(filename_field, '') or filename
-            return req.make_response(filecontent,
+            return request.make_response(filecontent,
                 headers=[('Content-Type', 'application/octet-stream'),
                         ('Content-Disposition', content_disposition(filename))],
                 cookies={'fileToken': int(token)})
 
-    @openerpweb.httprequest
+    @http.httprequest
     def upload(self, callback, ufile):
         # TODO: might be useful to have a configuration flag for max-length file uploads
         out = """<script language="javascript" type="text/javascript">
@@ -1363,9 +1363,9 @@ class Binary(openerpweb.Controller):
             args = [False, e.message]
         return out % (simplejson.dumps(callback), simplejson.dumps(args))
 
-    @openerpweb.httprequest
+    @http.httprequest
     def upload_attachment(self, callback, model, id, ufile):
-        Model = req.session.model('ir.attachment')
+        Model = request.session.model('ir.attachment')
         out = """<script language="javascript" type="text/javascript">
                     var win = window.top.window;
                     win.jQuery(win).trigger(%s, %s);
@@ -1377,7 +1377,7 @@ class Binary(openerpweb.Controller):
                 'datas_fname': ufile.filename,
                 'res_model': model,
                 'res_id': int(id)
-            }, req.context)
+            }, request.context)
             args = {
                 'filename': ufile.filename,
                 'id':  attachment_id
@@ -1386,14 +1386,14 @@ class Binary(openerpweb.Controller):
             args = {'error': "Something horrible happened"}
         return out % (simplejson.dumps(callback), simplejson.dumps(args))
 
-    @openerpweb.httprequest
+    @http.httprequest
     @nodb
     def company_logo(self, dbname=None):
         # TODO add etag, refactor to use /image code for etag
         uid = None
-        if req.session._db:
-            dbname = req.session._db
-            uid = req.session._uid
+        if request.session._db:
+            dbname = request.session._db
+            uid = request.session._uid
         elif dbname is None:
             dbname = db_monodb()
 
@@ -1425,50 +1425,50 @@ class Binary(openerpweb.Controller):
             ('Content-Type', 'image/png'),
             ('Content-Length', len(image_data)),
         ]
-        return req.make_response(image_data, headers)
+        return request.make_response(image_data, headers)
 
-class Action(openerpweb.Controller):
+class Action(http.Controller):
     _cp_path = "/web/action"
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def load(self, action_id, do_not_eval=False):
-        Actions = req.session.model('ir.actions.actions')
+        Actions = request.session.model('ir.actions.actions')
         value = False
         try:
             action_id = int(action_id)
         except ValueError:
             try:
                 module, xmlid = action_id.split('.', 1)
-                model, action_id = req.session.model('ir.model.data').get_object_reference(module, xmlid)
+                model, action_id = request.session.model('ir.model.data').get_object_reference(module, xmlid)
                 assert model.startswith('ir.actions.')
             except Exception:
                 action_id = 0   # force failed read
 
-        base_action = Actions.read([action_id], ['type'], req.context)
+        base_action = Actions.read([action_id], ['type'], request.context)
         if base_action:
             ctx = {}
             action_type = base_action[0]['type']
             if action_type == 'ir.actions.report.xml':
                 ctx.update({'bin_size': True})
-            ctx.update(req.context)
-            action = req.session.model(action_type).read([action_id], False, ctx)
+            ctx.update(request.context)
+            action = request.session.model(action_type).read([action_id], False, ctx)
             if action:
                 value = clean_action(action[0])
         return value
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def run(self, action_id):
-        return_action = req.session.model('ir.actions.server').run(
-            [action_id], req.context)
+        return_action = request.session.model('ir.actions.server').run(
+            [action_id], request.context)
         if return_action:
             return clean_action(return_action)
         else:
             return False
 
-class Export(openerpweb.Controller):
+class Export(http.Controller):
     _cp_path = "/web/export"
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def formats(self):
         """ Returns all valid export formats
 
@@ -1477,17 +1477,17 @@ class Export(openerpweb.Controller):
         """
         return sorted([
             controller.fmt
-            for controller in openerpweb.controllers_object.itervalues()
+            for controller in http.controllers_object.itervalues()
             if (controller._cp_path or "").startswith(self._cp_path)
             if hasattr(controller, 'fmt')
         ], key=operator.itemgetter("label"))
 
     def fields_get(self, model):
-        Model = req.session.model(model)
-        fields = Model.fields_get(False, req.context)
+        Model = request.session.model(model)
+        fields = Model.fields_get(False, request.context)
         return fields
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def get_fields(self, model, prefix='', parent_name= '',
                    import_compat=True, parent_field_type=None,
                    exclude=None):
@@ -1536,11 +1536,11 @@ class Export(openerpweb.Controller):
 
         return records
 
-    @openerpweb.jsonrequest
+    @http.jsonrequest
     def namelist(self, model, export_id):
         # TODO: namelist really has no reason to be in Python (although itertools.groupby helps)
-        export = req.session.model("ir.exports").read([export_id])[0]
-        export_fields_list = req.session.model("ir.exports.line").read(
+        export = request.session.model("ir.exports").read([export_id])[0]
+        export_fields_list = request.session.model("ir.exports.line").read(
             export['export_fields'])
 
         fields_data = self.fields_info(
@@ -1629,18 +1629,18 @@ class ExportFormat(object):
         """
         raise NotImplementedError()
 
-    @openerpweb.httprequest
+    @http.httprequest
     def index(self, data, token):
         model, fields, ids, domain, import_compat = \
             operator.itemgetter('model', 'fields', 'ids', 'domain',
                                 'import_compat')(
                 simplejson.loads(data))
 
-        Model = req.session.model(model)
-        ids = ids or Model.search(domain, 0, False, False, req.context)
+        Model = request.session.model(model)
+        ids = ids or Model.search(domain, 0, False, False, request.context)
 
         field_names = map(operator.itemgetter('name'), fields)
-        import_data = Model.export_data(ids, field_names, req.context).get('datas',[])
+        import_data = Model.export_data(ids, field_names, request.context).get('datas',[])
 
         if import_compat:
             columns_headers = field_names
@@ -1648,7 +1648,7 @@ class ExportFormat(object):
             columns_headers = [val['label'].strip() for val in fields]
 
 
-        return req.make_response(self.from_data(columns_headers, import_data),
+        return request.make_response(self.from_data(columns_headers, import_data),
             headers=[('Content-Disposition',
                             content_disposition(self.filename(model))),
                      ('Content-Type', self.content_type)],
@@ -1728,7 +1728,7 @@ class ExcelExport(ExportFormat, http.Controller):
         fp.close()
         return data
 
-class Reports(openerpweb.Controller):
+class Reports(http.Controller):
     _cp_path = "/web/report"
     POLLING_DELAY = 0.25
     TYPES_MAPPING = {
@@ -1740,12 +1740,12 @@ class Reports(openerpweb.Controller):
         'xls': 'application/vnd.ms-excel',
     }
 
-    @openerpweb.httprequest
+    @http.httprequest
     def index(self, action, token):
         action = simplejson.loads(action)
 
-        report_srv = req.session.proxy("report")
-        context = dict(req.context)
+        report_srv = request.session.proxy("report")
+        context = dict(request.context)
         context.update(action["context"])
 
         report_data = {}
@@ -1758,14 +1758,14 @@ class Reports(openerpweb.Controller):
             report_data.update(action['datas'])
 
         report_id = report_srv.report(
-            req.session._db, req.session._uid, req.session._password,
+            request.session._db, request.session._uid, request.session._password,
             action["report_name"], report_ids,
             report_data, context)
 
         report_struct = None
         while True:
             report_struct = report_srv.report_get(
-                req.session._db, req.session._uid, req.session._password, report_id)
+                request.session._db, request.session._uid, request.session._password, report_id)
             if report_struct["state"]:
                 break
 
@@ -1778,7 +1778,7 @@ class Reports(openerpweb.Controller):
             report_struct['format'], 'octet-stream')
         file_name = action.get('name', 'report')
         if 'name' not in action:
-            reports = req.session.model('ir.actions.report.xml')
+            reports = request.session.model('ir.actions.report.xml')
             res_id = reports.search([('report_name', '=', action['report_name']),],
                                     0, False, False, context)
             if len(res_id) > 0:
@@ -1787,7 +1787,7 @@ class Reports(openerpweb.Controller):
                 file_name = action['report_name']
         file_name = '%s.%s' % (file_name, report_struct['format'])
 
-        return req.make_response(report,
+        return request.make_response(report,
              headers=[
                  ('Content-Disposition', content_disposition(file_name)),
                  ('Content-Type', report_mimetype),
diff --git a/addons/web/controllers/testing.py b/addons/web/controllers/testing.py
index 8b89ab8ac9d..5e156dc410e 100644
--- a/addons/web/controllers/testing.py
+++ b/addons/web/controllers/testing.py
@@ -86,10 +86,8 @@ TESTING = Template(u"""<!DOCTYPE html>
 """, default_filters=['h'])
 
 class TestRunnerController(http.Controller):
-    _cp_path = '/web/tests'
 
-    @http.httprequest
-    @http.nodb
+    @http.route('/web/tests', type='http', authentication="nodb")
     def index(self, req, mod=None, **kwargs):
         ms = module.get_modules()
         manifests = dict(
diff --git a/addons/web/http.py b/addons/web/http.py
index 4f89dbf10bb..61a6a4e1250 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -88,12 +88,12 @@ class WebRequest(object):
     .. attribute:: db
 
         ``str``, the name of the database linked to the current request. Can be ``None``
-        if the current request uses the @nodb decorator.
+        if the current request uses the ``nodb`` authentication.
 
     .. attribute:: uid
 
         ``int``, the id of the user related to the current request. Can be ``None``
-        if the current request uses the @nodb or the @noauth decorator.
+        if the current request uses the ``nodb`` or the ``noauth`` authenticatoin.
     """
     def __init__(self, httprequest):
         self.httprequest = httprequest
@@ -171,14 +171,14 @@ class WebRequest(object):
     def registry(self):
         """
         The registry to the database linked to this request. Can be ``None`` if the current request uses the
-        @nodb decorator.
+        ``nodb'' authentication.
         """
         return openerp.modules.registry.RegistryManager.get(self.db) if self.db else None
 
     @property
     def cr(self):
         """
-        The cursor initialized for the current method call. If the current request uses the @nodb decorator
+        The cursor initialized for the current method call. If the current request uses the ``nodb`` authentication
         trying to access this property will raise an exception.
         """
         # some magic to lazy create the cr
@@ -211,22 +211,43 @@ class WebRequest(object):
             self.db = None
             self.uid = None
 
-
-def noauth(f):
+def route(route, type="http", authentication="auth"):
     """
+    Decorator marking the decorated method as being a handler for requests. The method must be part of a subclass
+    of ``Controller``.
+
     Decorator to put on a controller method to inform it does not require a user to be logged. When this decorator
     is used, ``request.uid`` will be ``None``. The request will still try to detect the database and an exception
     will be launched if there is no way to guess it.
+
+    :param route: string or array. The route part that will determine which http requests will match the decorated
+    method. Can be a single string or an array of strings. See werkzeug's routing documentation for the format of
+    route expression ( http://werkzeug.pocoo.org/docs/routing/ ).
+    :param type: The type of request, can be ``'http'`` or ``'json'``.
+    :param authentication: The type of authentication method, can on of the following:
+
+        * ``auth``: The user must be authenticated.
+        * ``noauth``: There is no need for the user to be authenticated but there must be a way to find the current
+        database.
+        * ``nodb``: The method is always active, even if there is no database. Mainly used by the framework and
+        authentication modules.
     """
+    def decorator(f):
+        if isinstance(route, list):
+            f.routes = route
+        else:
+            f.routes = [route]
+        f.exposed = type
+        if getattr(f, "auth", None) is None:
+            f.auth = authentication
+        return f
+    return decorator
+
+def noauth(f):
     f.auth = "noauth"
     return f
 
 def nodb(f):
-    """
-    Decorator to put on a controller method to inform it does not require authentication nor any link to a database.
-    When this decorator is used, ``request.uid`` and ``request.db`` will be ``None``. Trying to use ``request.cr``
-    will launch an exception.
-    """
     f.auth = "nodb"
     return f
 
@@ -398,8 +419,11 @@ def jsonrequest(f):
     the ``session_id``, ``context`` and ``debug`` keys (which are stripped out
     beforehand)
     """
-    f.exposed = 'json'
-    return f
+    f.combine = True
+    base = f.__name__
+    if f.__name__ == "index":
+        base = ""
+    return route([base, os.path.join(base, "<path:path>")], type="json", authentication="auth")(f)
 
 class HttpRequest(WebRequest):
     """ Regular GET/POST request
@@ -478,8 +502,11 @@ def httprequest(f):
     merged in the same dictionary), apart from the ``session_id``, ``context``
     and ``debug`` keys (which are stripped out beforehand)
     """
-    f.exposed = 'http'
-    return f
+    f.combine = True
+    base = f.__name__
+    if f.__name__ == "index":
+        base = ""
+    return route([base, os.path.join(base, "<path:path>")], type="http", authentication="auth")(f)
 
 #----------------------------------------------------------
 # Local storage of requests
@@ -526,8 +553,7 @@ class ControllerType(type):
         # store the controller in the controllers list
         name_class = ("%s.%s" % (cls.__module__, cls.__name__), cls)
         class_path = name_class[0].split(".")
-        path = attrs.get('_cp_path')
-        if not path or not class_path[:2] == ["openerp", "addons"]:
+        if not class_path[:2] == ["openerp", "addons"]:
             return
         module = class_path[2]
         controllers_per_module.setdefault(module, []).append(name_class)
@@ -535,13 +561,13 @@ class ControllerType(type):
 class Controller(object):
     __metaclass__ = ControllerType
 
-    def __new__(cls, *args, **kwargs):
-        subclasses = [c for c in cls.__subclasses__() if c._cp_path == cls._cp_path]
+    """def __new__(cls, *args, **kwargs):
+        subclasses = [c for c in cls.__subclasses__() if getattr(c, "_cp_path", None) == getattr(cls, "_cp_path", None)]
         if subclasses:
             name = "%s (extended by %s)" % (cls.__name__, ', '.join(sub.__name__ for sub in subclasses))
             cls = type(name, tuple(reversed(subclasses)), {})
 
-        return object.__new__(cls)
+        return object.__new__(cls)"""
 
     def get_wrapped_method(self, name):
         if name in self.__class__._methods_wrapper:
@@ -791,14 +817,14 @@ class Root(object):
                 for mk, mv in members:
                     if inspect.ismethod(mv) and getattr(mv, 'exposed', False) and getattr(mv, 'auth', None) == "nodb":
                         o = v[1]()
-                        if mk == "index":
-                            url = o._cp_path
-                        else:
-                            url = os.path.join(o._cp_path, mk)
                         function = (o.get_wrapped_method(mk), mv)
-                        routing_map.add(routing.Rule(url, endpoint=function))
-                        url = os.path.join(url, "<path:path>")
-                        routing_map.add(routing.Rule(url, endpoint=function))
+                        for url in mv.routes:
+                            if getattr(mv, "combine", False):
+                                url = os.path.join(o._cp_path, url)
+                                if url.endswith("/") and len(url) > 1:
+                                    url = url[: -1]
+                            print "<<<<<<<<<<<<<<<< nodb", url
+                            routing_map.add(routing.Rule(url, endpoint=function))
 
         if not db:
             return routing_map
@@ -817,14 +843,14 @@ class Root(object):
                 members = inspect.getmembers(o)
                 for mk, mv in members:
                     if inspect.ismethod(mv) and getattr(mv, 'exposed', False) and getattr(mv, 'auth', None) != "nodb":
-                        if mk == "index":
-                            url = o._cp_path
-                        else:
-                            url = os.path.join(o._cp_path, mk)
                         function = (o.get_wrapped_method(mk), mv)
-                        routing_map.add(routing.Rule(url, endpoint=function))
-                        url = os.path.join(url, "<path:path>")
-                        routing_map.add(routing.Rule(url, endpoint=function))
+                        for url in mv.routes:
+                            if getattr(mv, "combine", False):
+                                url = os.path.join(o._cp_path, url)
+                                if url.endswith("/") and len(url) > 1:
+                                    url = url[: -1]
+                            print "<<<<<<<<<<<<<<<< db", url
+                            routing_map.add(routing.Rule(url, endpoint=function))
         return routing_map
 
     def get_db_router(self, db):

From 5a2c7af2971cff5857af90ba961a894f3a98aad6 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 19 Jun 2013 18:59:57 +0200
Subject: [PATCH 50/94] Refactored main.py

bzr revid: nicolas.vanhoren@openerp.com-20130619165957-nw7eb80c7gqqcj7v
---
 addons/web/controllers/main.py | 180 +++++++++++++--------------------
 addons/web/http.py             |  16 ++-
 2 files changed, 75 insertions(+), 121 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 708600fdb99..b67ddaf2bd0 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -36,7 +36,7 @@ from openerp.tools.translate import _
 from .. import http
 http = http
 
-from openerp.addons.web.http import request, nodb, noauth
+from openerp.addons.web.http import request
 
 #----------------------------------------------------------
 # OpenERP Web helpers
@@ -571,10 +571,8 @@ html_template = """<!DOCTYPE html>
 """
 
 class Home(http.Controller):
-    _cp_path = '/'
 
-    @http.httprequest
-    @nodb
+    @http.route('/', type='http', authentication="nodb")
     def index(self, s_action=None, db=None, **kw):
         db, redir = db_monodb_redirect()
         if redir:
@@ -591,36 +589,30 @@ class Home(http.Controller):
         }
         return r
 
-    @http.httprequest
+    @http.route('/login', type='http', authentication="auth")
     def login(self, db, login, key):
         return login_and_redirect(db, login, key)
 
-    @http.jsonrequest
-    @nodb
+    @http.route('/jsonrpc', type='json', authentication="nodb")
     def jsonrpc(self, service, method, args):
         """ Method used by client APIs to contact OpenERP. """
         return openerp.netsvc.dispatch_rpc(service, method, args)
 
 class WebClient(http.Controller):
-    _cp_path = "/web/webclient"
 
-    @http.jsonrequest
-    @nodb
+    @http.route('/web/webclient/csslist', type='json', authentication="nodb")
     def csslist(self, mods=None):
         return manifest_list('css', mods=mods)
 
-    @http.jsonrequest
-    @nodb
+    @http.route('/web/webclient/jslist', type='json', authentication="nodb")
     def jslist(self, mods=None):
         return manifest_list('js', mods=mods)
 
-    @http.jsonrequest
-    @nodb
+    @http.route('/web/webclient/qweblist', type='json', authentication="nodb")
     def qweblist(self, mods=None):
         return manifest_list('qweb', mods=mods)
 
-    @http.httprequest
-    @nodb
+    @http.route('/web/webclient/css', type='http', authentication="nodb")
     def css(self, mods=None, db=None):
         files = list(manifest_glob('css', addons=mods, db=db))
         last_modified = get_last_modified(f[0] for f in files)
@@ -671,8 +663,7 @@ class WebClient(http.Controller):
             request.make_response(content, [('Content-Type', 'text/css')]),
             last_modified, checksum)
 
-    @http.httprequest
-    @nodb
+    @http.route('/web/webclient/js', type='http', authentication="nodb")
     def js(self, mods=None, db=None):
         files = [f[0] for f in manifest_glob('js', addons=mods, db=db)]
         last_modified = get_last_modified(files)
@@ -685,8 +676,7 @@ class WebClient(http.Controller):
             request.make_response(content, [('Content-Type', 'application/javascript')]),
             last_modified, checksum)
 
-    @http.httprequest
-    @nodb
+    @http.route('/web/webclient/qweb', type='http', authentication="nodb")
     def qweb(self, mods=None, db=None):
         files = [f[0] for f in manifest_glob('qweb', addons=mods, db=db)]
         last_modified = get_last_modified(files)
@@ -699,8 +689,7 @@ class WebClient(http.Controller):
             request.make_response(content, [('Content-Type', 'text/xml')]),
             last_modified, checksum)
 
-    @http.jsonrequest
-    @nodb
+    @http.route('/web/webclient/bootstrap_translations', type='json', authentication="nodb")
     def bootstrap_translations(self, mods):
         """ Load local translations from *.po files, as a temporary solution
             until we have established a valid session. This is meant only
@@ -723,7 +712,7 @@ class WebClient(http.Controller):
         return {"modules": translations_per_module,
                 "lang_parameters": None}
 
-    @http.jsonrequest
+    @http.route('/web/webclient/translations', type='json', authentication="auth")
     def translations(self, mods, lang):
         res_lang = request.session.model('res.lang')
         ids = res_lang.search([("code", "=", lang)])
@@ -748,16 +737,13 @@ class WebClient(http.Controller):
         return {"modules": translations_per_module,
                 "lang_parameters": lang_params}
 
-    @http.jsonrequest
-    @nodb
+    @http.route('/web/webclient/version_info', type='json', authentication="nodb")
     def version_info(self):
         return openerp.service.common.exp_version()
 
 class Proxy(http.Controller):
-    _cp_path = '/web/proxy'
 
-    @http.jsonrequest
-    @nodb
+    @http.route('/web/proxy/load', type='json', authentication="nodb")
     def load(self, path):
         """ Proxies an HTTP request through a JSON request.
 
@@ -773,15 +759,12 @@ class Proxy(http.Controller):
         return Client(request.httprequest.app, BaseResponse).get(path).data
 
 class Database(http.Controller):
-    _cp_path = "/web/database"
 
-    @http.jsonrequest
-    @nodb
+    @http.route('/web/database/get_list', type='json', authentication="nodb")
     def get_list(self):
         return db_list()
 
-    @http.jsonrequest
-    @nodb
+    @http.route('/web/database/create', type='json', authentication="nodb")
     def create(self, fields):
         params = dict(map(operator.itemgetter('name', 'value'), fields))
         return request.session.proxy("db").create_database(
@@ -791,17 +774,7 @@ class Database(http.Controller):
             params['db_lang'],
             params['create_admin_pwd'])
 
-    @http.jsonrequest
-    @nodb
-    def duplicate(self, fields):
-        params = dict(map(operator.itemgetter('name', 'value'), fields))
-        return request.session.proxy("db").duplicate_database(
-            params['super_admin_pwd'],
-            params['db_original_name'],
-            params['db_name'])
-
-    @http.jsonrequest
-    @nodb
+    @http.route('/web/database/duplicate', type='json', authentication="nodb")
     def duplicate(self, fields):
         params = dict(map(operator.itemgetter('name', 'value'), fields))
         duplicate_attrs = (
@@ -812,8 +785,7 @@ class Database(http.Controller):
 
         return request.session.proxy("db").duplicate_database(*duplicate_attrs)
 
-    @http.jsonrequest
-    @nodb
+    @http.route('/web/database/drop', type='json', authentication="nodb")
     def drop(self, fields):
         password, db = operator.itemgetter(
             'drop_pwd', 'drop_db')(
@@ -826,8 +798,7 @@ class Database(http.Controller):
         except Exception:
             return {'error': _('Could not drop database !'), 'title': _('Drop Database')}
 
-    @http.httprequest
-    @nodb
+    @http.route('/web/database/backup', type='http', authentication="nodb")
     def backup(self, backup_db, backup_pwd, token):
         try:
             db_dump = base64.b64decode(
@@ -845,8 +816,7 @@ class Database(http.Controller):
         except Exception, e:
             return simplejson.dumps([[],[{'error': openerp.tools.ustr(e), 'title': _('Backup Database')}]])
 
-    @http.httprequest
-    @nodb
+    @http.route('/web/database/restore', type='http', authentication="nodb")
     def restore(self, db_file, restore_pwd, new_db):
         try:
             data = base64.b64encode(db_file.read())
@@ -855,8 +825,7 @@ class Database(http.Controller):
         except openerp.exceptions.AccessDenied, e:
             raise Exception("AccessDenied")
 
-    @http.jsonrequest
-    @nodb
+    @http.route('/web/database/change_password', type='json', authentication="nodb")
     def change_password(self, fields):
         old_password, new_password = operator.itemgetter(
             'old_pwd', 'new_pwd')(
@@ -869,7 +838,6 @@ class Database(http.Controller):
             return {'error': _('Error, password not changed !'), 'title': _('Change Password')}
 
 class Session(http.Controller):
-    _cp_path = "/web/session"
 
     def session_info(self):
         request.session.ensure_valid()
@@ -881,15 +849,13 @@ class Session(http.Controller):
             "username": request.session._login,
         }
 
-    @http.jsonrequest
-    @nodb
+    @http.route('/web/session/get_session_info', type='json', authentication="nodb")
     def get_session_info(self):
         request.uid = request.session._uid
         request.db = request.session._db
         return self.session_info()
 
-    @http.jsonrequest
-    @nodb
+    @http.route('/web/session/authenticate', type='json', authentication="nodb")
     def authenticate(self, db, login, password, base_location=None):
         wsgienv = request.httprequest.environ
         env = dict(
@@ -901,8 +867,8 @@ class Session(http.Controller):
 
         return self.session_info()
 
-    @http.jsonrequest
-    def change_password (self, fields):
+    @http.route('/web/session/change_password', type='json', authentication="auth")
+    def change_password(self, fields):
         old_password, new_password,confirm_password = operator.itemgetter('old_pwd', 'new_password','confirm_pwd')(
                 dict(map(operator.itemgetter('name', 'value'), fields)))
         if not (old_password.strip() and new_password.strip() and confirm_password.strip()):
@@ -917,25 +883,24 @@ class Session(http.Controller):
             return {'error': _('The old password you provided is incorrect, your password was not changed.'), 'title': _('Change Password')}
         return {'error': _('Error, password not changed !'), 'title': _('Change Password')}
 
-    @http.jsonrequest
+    @http.route('/web/session/sc_list', type='json', authentication="auth")
     def sc_list(self):
         return request.session.model('ir.ui.view_sc').get_sc(
             request.session._uid, "ir.ui.menu", request.context)
 
-    @http.jsonrequest
-    @nodb
+    @http.route('/web/session/get_lang_list', type='json', authentication="nodb")
     def get_lang_list(self):
         try:
             return request.session.proxy("db").list_lang() or []
         except Exception, e:
             return {"error": e, "title": _("Languages")}
 
-    @http.jsonrequest
+    @http.route('/web/session/modules', type='json', authentication="auth")
     def modules(self):
         # return all installed modules. Web client is smart enough to not load a module twice
         return module_installed()
 
-    @http.jsonrequest
+    @http.route('/web/session/save_session_action', type='json', authentication="auth")
     def save_session_action(self, the_action):
         """
         This method store an action object in the session object and returns an integer
@@ -959,7 +924,7 @@ class Session(http.Controller):
         saved_actions["next"] = key + 1
         return key
 
-    @http.jsonrequest
+    @http.route('/web/session/get_session_action', type='json', authentication="auth")
     def get_session_action(self, key):
         """
         Gets back a previously saved action. This method can return None if the action
@@ -975,19 +940,18 @@ class Session(http.Controller):
             return None
         return saved_actions["actions"].get(key)
 
-    @http.jsonrequest
+    @http.route('/web/session/check', type='json', authentication="auth")
     def check(self):
         request.session.assert_valid()
         return None
 
-    @http.jsonrequest
+    @http.route('/web/session/destroy', type='json', authentication="auth")
     def destroy(self):
         request.session._suicide = True
 
 class Menu(http.Controller):
-    _cp_path = "/web/menu"
 
-    @http.jsonrequest
+    @http.route('/web/menu/get_user_roots', type='json', authentication="auth")
     def get_user_roots(self):
         """ Return all root menu ids visible for the session user.
 
@@ -1009,7 +973,7 @@ class Menu(http.Controller):
 
         return Menus.search(menu_domain, 0, False, False, request.context)
 
-    @http.jsonrequest
+    @http.route('/web/menu/load', type='json', authentication="auth")
     def load(self):
         """ Loads all menu items (all applications and their sub-menus).
 
@@ -1060,7 +1024,7 @@ class Menu(http.Controller):
 
         return menu_root
 
-    @http.jsonrequest
+    @http.route('/web/menu/load_needaction', type='json', authentication="auth")
     def load_needaction(self, menu_ids):
         """ Loads needaction counters for specific menu ids.
 
@@ -1069,7 +1033,7 @@ class Menu(http.Controller):
         """
         return request.session.model('ir.ui.menu').get_needaction_data(menu_ids, request.context)
 
-    @http.jsonrequest
+    @http.route('/web/menu/action', type='json', authentication="auth")
     def action(self, menu_id):
         # still used by web_shortcut
         actions = load_actions_from_ir_values('action', 'tree_but_open',
@@ -1077,9 +1041,8 @@ class Menu(http.Controller):
         return {"action": actions}
 
 class DataSet(http.Controller):
-    _cp_path = "/web/dataset"
 
-    @http.jsonrequest
+    @http.route('/web/dataset/search_read', type='json', authentication="auth")
     def search_read(self, model, fields=False, offset=0, limit=False, domain=None, sort=None):
         return self.do_search_read(model, fields, offset, limit, domain, sort)
     def do_search_read(self, model, fields=False, offset=0, limit=False, domain=None
@@ -1121,7 +1084,7 @@ class DataSet(http.Controller):
             'records': records
         }
 
-    @http.jsonrequest
+    @http.route('/web/dataset/load', type='json', authentication="auth")
     def load(self, model, id, fields):
         m = request.session.model(model)
         value = {}
@@ -1147,26 +1110,26 @@ class DataSet(http.Controller):
 
         return getattr(request.session.model(model), method)(*args, **kwargs)
 
-    @http.jsonrequest
+    @http.route('/web/dataset/call', type='json', authentication="auth")
     def call(self, model, method, args, domain_id=None, context_id=None):
         return self._call_kw(model, method, args, {})
 
-    @http.jsonrequest
+    @http.route(['/web/dataset/call_kw', '/web/dataset/call_kw/<path:path>'], type='json', authentication="auth")
     def call_kw(self, model, method, args, kwargs):
         return self._call_kw(model, method, args, kwargs)
 
-    @http.jsonrequest
+    @http.route('/web/dataset/call_button', type='json', authentication="auth")
     def call_button(self, model, method, args, domain_id=None, context_id=None):
         action = self._call_kw(model, method, args, {})
         if isinstance(action, dict) and action.get('type') != '':
             return clean_action(action)
         return False
 
-    @http.jsonrequest
+    @http.route('/web/dataset/exec_workflow', type='json', authentication="auth")
     def exec_workflow(self, model, id, signal):
         return request.session.exec_workflow(model, id, signal)
 
-    @http.jsonrequest
+    @http.route('/web/dataset/resequence', type='json', authentication="auth")
     def resequence(self, model, ids, field='sequence', offset=0):
         """ Re-sequences a number of records in the model, by their ids
 
@@ -1190,9 +1153,8 @@ class DataSet(http.Controller):
         return True
 
 class View(http.Controller):
-    _cp_path = "/web/view"
 
-    @http.jsonrequest
+    @http.route('/web/view/add_custom', type='json', authentication="auth")
     def add_custom(self, view_id, arch):
         CustomView = request.session.model('ir.ui.view.custom')
         CustomView.create({
@@ -1202,7 +1164,7 @@ class View(http.Controller):
         }, request.context)
         return {'result': True}
 
-    @http.jsonrequest
+    @http.route('/web/view/undo_custom', type='json', authentication="auth")
     def undo_custom(self, view_id, reset=False):
         CustomView = request.session.model('ir.ui.view.custom')
         vcustom = CustomView.search([('user_id', '=', request.session._uid), ('ref_id' ,'=', view_id)],
@@ -1216,18 +1178,16 @@ class View(http.Controller):
         return {'result': False}
 
 class TreeView(View):
-    _cp_path = "/web/treeview"
 
-    @http.jsonrequest
+    @http.route('/web/treeview/action', type='json', authentication="auth")
     def action(self, model, id):
         return load_actions_from_ir_values(
             'action', 'tree_but_open',[(model, id)],
             False)
 
 class Binary(http.Controller):
-    _cp_path = "/web/binary"
 
-    @http.httprequest
+    @http.route('/web/binary/image', type='http', authentication="auth")
     def image(self, model, id, field, **kw):
         last_update = '__last_update'
         Model = request.session.model(model)
@@ -1282,7 +1242,7 @@ class Binary(http.Controller):
         addons_path = http.addons_manifest['web']['addons_path']
         return open(os.path.join(addons_path, 'web', 'static', 'src', 'img', image), 'rb').read()
 
-    @http.httprequest
+    @http.route('/web/binary/saveas', type='http', authentication="auth")
     def saveas(self, model, field, id=None, filename_field=None, **kw):
         """ Download link for files stored as binary fields.
 
@@ -1315,7 +1275,7 @@ class Binary(http.Controller):
                 [('Content-Type', 'application/octet-stream'),
                  ('Content-Disposition', content_disposition(filename))])
 
-    @http.httprequest
+    @http.route('/web/binary/saveas_ajax', type='http', authentication="auth")
     def saveas_ajax(self, data, token):
         jdata = simplejson.loads(data)
         model = jdata['model']
@@ -1348,7 +1308,7 @@ class Binary(http.Controller):
                         ('Content-Disposition', content_disposition(filename))],
                 cookies={'fileToken': int(token)})
 
-    @http.httprequest
+    @http.route('/web/binary/upload', type='http', authentication="auth")
     def upload(self, callback, ufile):
         # TODO: might be useful to have a configuration flag for max-length file uploads
         out = """<script language="javascript" type="text/javascript">
@@ -1363,7 +1323,7 @@ class Binary(http.Controller):
             args = [False, e.message]
         return out % (simplejson.dumps(callback), simplejson.dumps(args))
 
-    @http.httprequest
+    @http.route('/web/binary/upload_attachment', type='http', authentication="auth")
     def upload_attachment(self, callback, model, id, ufile):
         Model = request.session.model('ir.attachment')
         out = """<script language="javascript" type="text/javascript">
@@ -1386,8 +1346,7 @@ class Binary(http.Controller):
             args = {'error': "Something horrible happened"}
         return out % (simplejson.dumps(callback), simplejson.dumps(args))
 
-    @http.httprequest
-    @nodb
+    @http.route('/web/binary/company_logo', type='http', authentication="nodb")
     def company_logo(self, dbname=None):
         # TODO add etag, refactor to use /image code for etag
         uid = None
@@ -1428,9 +1387,8 @@ class Binary(http.Controller):
         return request.make_response(image_data, headers)
 
 class Action(http.Controller):
-    _cp_path = "/web/action"
 
-    @http.jsonrequest
+    @http.route('/web/action/load', type='json', authentication="auth")
     def load(self, action_id, do_not_eval=False):
         Actions = request.session.model('ir.actions.actions')
         value = False
@@ -1456,7 +1414,7 @@ class Action(http.Controller):
                 value = clean_action(action[0])
         return value
 
-    @http.jsonrequest
+    @http.route('/web/action/run', type='json', authentication="auth")
     def run(self, action_id):
         return_action = request.session.model('ir.actions.server').run(
             [action_id], request.context)
@@ -1466,28 +1424,22 @@ class Action(http.Controller):
             return False
 
 class Export(http.Controller):
-    _cp_path = "/web/export"
 
-    @http.jsonrequest
+    @http.route('/web/export/formats', type='json', authentication="auth")
     def formats(self):
         """ Returns all valid export formats
 
         :returns: for each export format, a pair of identifier and printable name
         :rtype: [(str, str)]
         """
-        return sorted([
-            controller.fmt
-            for controller in http.controllers_object.itervalues()
-            if (controller._cp_path or "").startswith(self._cp_path)
-            if hasattr(controller, 'fmt')
-        ], key=operator.itemgetter("label"))
+        return ["CSV", "Excel"]
 
     def fields_get(self, model):
         Model = request.session.model(model)
         fields = Model.fields_get(False, request.context)
         return fields
 
-    @http.jsonrequest
+    @http.route('/web/export/get_fields', type='json', authentication="auth")
     def get_fields(self, model, prefix='', parent_name= '',
                    import_compat=True, parent_field_type=None,
                    exclude=None):
@@ -1536,7 +1488,7 @@ class Export(http.Controller):
 
         return records
 
-    @http.jsonrequest
+    @http.route('/web/export/namelist', type='json', authentication="auth")
     def namelist(self, model, export_id):
         # TODO: namelist really has no reason to be in Python (although itertools.groupby helps)
         export = request.session.model("ir.exports").read([export_id])[0]
@@ -1629,8 +1581,7 @@ class ExportFormat(object):
         """
         raise NotImplementedError()
 
-    @http.httprequest
-    def index(self, data, token):
+    def base(self, data, token):
         model, fields, ids, domain, import_compat = \
             operator.itemgetter('model', 'fields', 'ids', 'domain',
                                 'import_compat')(
@@ -1655,9 +1606,12 @@ class ExportFormat(object):
             cookies={'fileToken': int(token)})
 
 class CSVExport(ExportFormat, http.Controller):
-    _cp_path = '/web/export/csv'
     fmt = {'tag': 'csv', 'label': 'CSV'}
 
+    @http.route('/web/export/csv', type='http', authentication="auth")
+    def index(self, data, token):
+        return self.base(data, token)
+
     @property
     def content_type(self):
         return 'text/csv;charset=utf8'
@@ -1690,13 +1644,16 @@ class CSVExport(ExportFormat, http.Controller):
         return data
 
 class ExcelExport(ExportFormat, http.Controller):
-    _cp_path = '/web/export/xls'
     fmt = {
         'tag': 'xls',
         'label': 'Excel',
         'error': None if xlwt else "XLWT required"
     }
 
+    @http.route('/web/export/xls', type='http', authentication="auth")
+    def index(self, data, token):
+        return self.base(data, token)
+
     @property
     def content_type(self):
         return 'application/vnd.ms-excel'
@@ -1729,7 +1686,6 @@ class ExcelExport(ExportFormat, http.Controller):
         return data
 
 class Reports(http.Controller):
-    _cp_path = "/web/report"
     POLLING_DELAY = 0.25
     TYPES_MAPPING = {
         'doc': 'application/vnd.ms-word',
@@ -1740,7 +1696,7 @@ class Reports(http.Controller):
         'xls': 'application/vnd.ms-excel',
     }
 
-    @http.httprequest
+    @http.route('/web/report', type='http', authentication="auth")
     def index(self, action, token):
         action = simplejson.loads(action)
 
diff --git a/addons/web/http.py b/addons/web/http.py
index 61a6a4e1250..8809921bbda 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -232,6 +232,8 @@ def route(route, type="http", authentication="auth"):
         * ``nodb``: The method is always active, even if there is no database. Mainly used by the framework and
         authentication modules.
     """
+    assert type in ["http", "json"]
+    assert authentication in ["auth", "noauth", "nodb"]
     def decorator(f):
         if isinstance(route, list):
             f.routes = route
@@ -243,14 +245,6 @@ def route(route, type="http", authentication="auth"):
         return f
     return decorator
 
-def noauth(f):
-    f.auth = "noauth"
-    return f
-
-def nodb(f):
-    f.auth = "nodb"
-    return f
-
 def reject_nonliteral(dct):
     if '__ref' in dct:
         raise ValueError(
@@ -873,7 +867,11 @@ class Root(object):
         """
         path = request.httprequest.path
         urls = self.get_db_router(request.db).bind("")
-        func, original = urls.match(path)[0]
+        try:
+            func, original = urls.match(path)[0]
+        except:
+            _logger.exception("Routing error for url %s" % path)
+            raise
 
         request.func = func
         request.auth_method = getattr(original, "auth", "auth")

From 7e4e72f01cf3354340bfacedba80a46f19edd7cc Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 20 Jun 2013 12:00:50 +0200
Subject: [PATCH 51/94] removed prints

bzr revid: nicolas.vanhoren@openerp.com-20130620100050-nr3nh1b05ttt72ae
---
 addons/web/http.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 8809921bbda..83e1560501b 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -817,7 +817,6 @@ class Root(object):
                                 url = os.path.join(o._cp_path, url)
                                 if url.endswith("/") and len(url) > 1:
                                     url = url[: -1]
-                            print "<<<<<<<<<<<<<<<< nodb", url
                             routing_map.add(routing.Rule(url, endpoint=function))
 
         if not db:
@@ -843,7 +842,6 @@ class Root(object):
                                 url = os.path.join(o._cp_path, url)
                                 if url.endswith("/") and len(url) > 1:
                                     url = url[: -1]
-                            print "<<<<<<<<<<<<<<<< db", url
                             routing_map.add(routing.Rule(url, endpoint=function))
         return routing_map
 
@@ -867,11 +865,7 @@ class Root(object):
         """
         path = request.httprequest.path
         urls = self.get_db_router(request.db).bind("")
-        try:
-            func, original = urls.match(path)[0]
-        except:
-            _logger.exception("Routing error for url %s" % path)
-            raise
+        func, original = urls.match(path)[0]
 
         request.func = func
         request.auth_method = getattr(original, "auth", "auth")

From 56f2e7631fbfed05a8153ef2be54d966e7cc389c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 20 Jun 2013 12:01:22 +0200
Subject: [PATCH 52/94] Some more refactoring to use @route()

bzr revid: nicolas.vanhoren@openerp.com-20130620100122-3mtvqr1w5yrikitk
---
 addons/auth_signup/controllers/main.py | 27 +++++++++++++-------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 047e5e38e12..e1e1fa5851a 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -23,16 +23,15 @@ import logging
 import openerp
 from openerp.modules.registry import RegistryManager
 from ..res_users import SignupError
-from openerp.addons.web.http import nodb, noauth
+import openerp.addons.web.http as http
+from openerp.addons.web.http import request
 
 _logger = logging.getLogger(__name__)
 
-class Controller(openerp.addons.web.http.Controller):
-    _cp_path = '/auth_signup'
+class Controller(http.Controller):
 
-    @openerp.addons.web.http.jsonrequest
-    @nodb
-    def get_config(self, req, dbname):
+    @http.route('/auth_signup/get_config', type='json', authentication="nodb")
+    def get_config(self, dbname):
         """ retrieve the module config (which features are enabled) for the login page """
         registry = RegistryManager.get(dbname)
         with registry.cursor() as cr:
@@ -43,8 +42,8 @@ class Controller(openerp.addons.web.http.Controller):
             }
         return config
 
-    @openerp.addons.web.http.jsonrequest
-    def retrieve(self, req, dbname, token):
+    @http.route('/auth_signup/retrieve', type='json', authentication="auth")
+    def retrieve(self, dbname, token):
         """ retrieve the user info (name, login or email) corresponding to a signup token """
         registry = RegistryManager.get(dbname)
         with registry.cursor() as cr:
@@ -52,23 +51,23 @@ class Controller(openerp.addons.web.http.Controller):
             user_info = res_partner.signup_retrieve_info(cr, openerp.SUPERUSER_ID, token)
         return user_info
 
-    @openerp.addons.web.http.jsonrequest
-    def signup(self, req, dbname, token, **values):
+    @http.route('/auth_signup/signup', type='json', authentication="auth")
+    def signup(self, dbname, token, **values):
         """ sign up a user (new or existing)"""
         try:
-            self._signup_with_values(req, dbname, token, values)
+            self._signup_with_values(dbname, token, values)
         except SignupError, e:
             return {'error': openerp.tools.exception_to_unicode(e)}
         return {}
 
-    def _signup_with_values(self, req, dbname, token, values):
+    def _signup_with_values(self, dbname, token, values):
         registry = RegistryManager.get(dbname)
         with registry.cursor() as cr:
             res_users = registry.get('res.users')
             res_users.signup(cr, openerp.SUPERUSER_ID, values, token)
 
-    @openerp.addons.web.http.jsonrequest
-    def reset_password(self, req, dbname, login):
+    @http.route('/auth_signup/reset_password', type='json', authentication="auth")
+    def reset_password(self, dbname, login):
         """ retrieve user, and perform reset password """
         registry = RegistryManager.get(dbname)
         with registry.cursor() as cr:

From 027f77a3cecc0a6e6b37caf1e881a03122173bea Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 20 Jun 2013 13:28:57 +0200
Subject: [PATCH 53/94] doc

bzr revid: nicolas.vanhoren@openerp.com-20130620112857-knwne19buizfheen
---
 addons/web/doc/web_controllers.rst | 46 +++++++++++-------------------
 1 file changed, 16 insertions(+), 30 deletions(-)

diff --git a/addons/web/doc/web_controllers.rst b/addons/web/doc/web_controllers.rst
index 8938f0adbb8..3f30f55b8c0 100644
--- a/addons/web/doc/web_controllers.rst
+++ b/addons/web/doc/web_controllers.rst
@@ -47,55 +47,42 @@ In your controllers file, you can now declare a controller this way:
 ::
 
     class MyController(http.Controller):
-        _cp_path = '/my_url'
 
-        @http.httprequest
+        @http.route('/my_url/some_html', type="html")
         def some_html(self):
             return "<h1>This is a test</h1>"
 
-        @http.jsonrequest
+        @http.route('/my_url/some_json', type="json")
         def some_json(self):
             return {"sample_dictionary": "This is a sample JSON dictionary"}
 
-A controller must inherit from ``http.Controller``. When defining a controller, you must define the url it will match.
-This is the ``_cp_path`` class attribute.
-
-Each time you define a method with ``@http.httprequest`` or ``@http.jsonrequest`` it defines a new part of url to
-match. As example, the ``some_html()`` method will be called a client query the ``/my_url/some_html`` url.
-
-If you want to match precisely the ``/my_url`` url, you must a define a method called ``index``. This is an exception
-compared to other methods:
-
-::
-
-    @http.httprequest
-    def index(self):
-        return "<div>This is the /my_url</div>"
+A controller must inherit from ``http.Controller``. Each time you define a method with ``@http.route()`` it defines a
+url to match. As example, the ``some_html()`` method will be called a client query the ``/my_url/some_html`` url.
 
 Pure HTTP Requests
 ------------------
 
-You can define methods to get any requests using the ``@http.httprequest`` decorator. When doing so, you get the
-HTTP parameters as named parameters of the method:
+You can define methods to get any normal http requests by passing ``'html'`` to the ``type`` argument of
+``http.route()``. When doing so, you get the HTTP parameters as named parameters of the method:
 
 ::
 
-    @http.httprequest
+    @http.route('/say_hello', type="html")
     def say_hello(self, name):
         return "<h1>Hello %s</h1>" % name
 
-This url could be contacted by typing this url in a browser: ``http://localhost:8069/my_url/say_hello?name=Nicolas``.
+This url could be contacted by typing this url in a browser: ``http://localhost:8069/say_hello?name=Nicolas``.
 
 JSON Requests
 -------------
 
-The ``@http.jsonrequest`` decorator is used to define JSON requests. The OpenERP Javascript client can contact these
-methods using the JSON-RPC protocol. JSON methods must return JSON. Like the HTTP methods they receive arguments
-as named parameters (except these arguments are JSON-RPC parameters).
+Methods that received JSON can be defined by passing ``'json'`` to the ``type`` argument of ``http.route()``. The
+OpenERP Javascript client can contact these methods using the JSON-RPC protocol. JSON methods must return JSON. Like the
+HTTP methods they receive arguments as named parameters (except these arguments are JSON-RPC parameters).
 
 ::
 
-    @http.jsonrequest
+    @http.route('/division', type="json")
     def division(self, i, j):
         return i / j # returns a number
 
@@ -106,7 +93,7 @@ To use the database you must access the OpenERP models. The global ``request`` o
 
 ::
 
-    @http.httprequest
+    @http.route('/my_name', type="html")
     def my_name(self):
         my_user_record = request.registry.get("res.users").browse(request.cr, request.uid, request.uid)
         return "<h1>Your name is %s</h1>" % my_user_record.name
@@ -124,13 +111,12 @@ Authorization Levels
 --------------------
 
 By default, all methods can only be used by users logged into OpenERP (OpenERP uses cookies to track logged users).
-There are some cases when you need to enable not-logged in users to access some methods. To do so, add the
-``http.noauth`` decorator to your method:
+There are some cases when you need to enable not-logged in users to access some methods. To do so, add the ``'noauth'``
+value to the ``authentication`` parameter of ``http.route()``:
 
 ::
 
-    @http.httprequest
-    @http.noauth
+    @http.route('/hello', type="html", authentication="noauth")
     def hello(self):
         return "<div>Hello unknown user!</div>"
 

From 4119d7ce9963244a7a3e02e223461599d0f2fe03 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 20 Jun 2013 14:10:26 +0200
Subject: [PATCH 54/94] Added werkzeug's arguments

bzr revid: nicolas.vanhoren@openerp.com-20130620121026-btc06m36x9jg1ok0
---
 addons/web/controllers/main.py |  2 +-
 addons/web/http.py             | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index b67ddaf2bd0..16efea06f13 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1115,7 +1115,7 @@ class DataSet(http.Controller):
         return self._call_kw(model, method, args, {})
 
     @http.route(['/web/dataset/call_kw', '/web/dataset/call_kw/<path:path>'], type='json', authentication="auth")
-    def call_kw(self, model, method, args, kwargs):
+    def call_kw(self, model, method, args, kwargs, path=None):
         return self._call_kw(model, method, args, kwargs)
 
     @http.route('/web/dataset/call_button', type='json', authentication="auth")
diff --git a/addons/web/http.py b/addons/web/http.py
index 83e1560501b..beac395c8a1 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -417,7 +417,7 @@ def jsonrequest(f):
     base = f.__name__
     if f.__name__ == "index":
         base = ""
-    return route([base, os.path.join(base, "<path:path>")], type="json", authentication="auth")(f)
+    return route([base, os.path.join(base, "<path:_ignored_path>")], type="json", authentication="auth")(f)
 
 class HttpRequest(WebRequest):
     """ Regular GET/POST request
@@ -500,7 +500,7 @@ def httprequest(f):
     base = f.__name__
     if f.__name__ == "index":
         base = ""
-    return route([base, os.path.join(base, "<path:path>")], type="http", authentication="auth")(f)
+    return route([base, os.path.join(base, "<path:_ignored_path>")], type="http", authentication="auth")(f)
 
 #----------------------------------------------------------
 # Local storage of requests
@@ -865,9 +865,15 @@ class Root(object):
         """
         path = request.httprequest.path
         urls = self.get_db_router(request.db).bind("")
-        func, original = urls.match(path)[0]
+        matched, arguments = urls.match(path)
+        arguments = dict([(k, v) for k, v in arguments.items() if not k.startswith("_ignored_")])
+        func, original = matched
 
-        request.func = func
+        def nfunc(*args, **kwargs):
+            kwargs.update(arguments)
+            return func(*args, **kwargs)
+
+        request.func = nfunc
         request.auth_method = getattr(original, "auth", "auth")
         request.func_request_type = original.exposed
 

From 0867b705347595b0fb58b1ff1cdf8c36c99c5ae2 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 20 Jun 2013 14:18:58 +0200
Subject: [PATCH 55/94] Added doc

bzr revid: nicolas.vanhoren@openerp.com-20130620121858-mwu5t9t4oxv1w7tw
---
 addons/web/doc/web_controllers.rst | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/addons/web/doc/web_controllers.rst b/addons/web/doc/web_controllers.rst
index 3f30f55b8c0..34655b99674 100644
--- a/addons/web/doc/web_controllers.rst
+++ b/addons/web/doc/web_controllers.rst
@@ -86,6 +86,30 @@ HTTP methods they receive arguments as named parameters (except these arguments
     def division(self, i, j):
         return i / j # returns a number
 
+URL Patterns
+------------
+
+Any URL passed to ``http.route()`` can contain patterns. Example:
+
+::
+
+    @http.route('/files/<path:file_path>', type="html")
+    def files(self, file_path):
+        ... # return a file identified by the path store in the 'my_path' variable
+
+When such patterns are used, the method will received additional parameters that correspond to the parameters defined in
+the url. For exact documentation about url patterns, see Werkzeug's documentation:
+http://werkzeug.pocoo.org/docs/routing/ .
+
+Also note you can pass multiple urls to ``http.route()``:
+
+
+::
+
+    @http.route(['/files/<path:file_path>', '/other_url/<path:file_path>'], type="html")
+    def files(self, file_path):
+        ...
+
 Contacting Models
 -----------------
 

From 09f5b819274efdd772606daa1fae7a2a215045a6 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 20 Jun 2013 14:48:05 +0200
Subject: [PATCH 56/94] Fixed some bug

bzr revid: nicolas.vanhoren@openerp.com-20130620124805-pvvylxc4z8yl0sp2
---
 addons/web/http.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index beac395c8a1..de3fb1386e6 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -827,7 +827,7 @@ class Root(object):
             m = registry.get('ir.module.module')
             ids = m.search(cr, openerp.SUPERUSER_ID, [('state','=','installed')])
             installed = set([x['name'] for x in m.read(cr, 1, ids, ['name'])])
-            modules_set -= set(installed)
+            modules_set = modules_set.intersection(set(installed))
         modules = ["web"] + sorted(modules_set)
         # building all other methods
         for module in modules:

From c536045818ec9e807060bf3b070381ff01bf0d20 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Jun 2013 17:07:25 +0200
Subject: [PATCH 57/94] [RENAME]crm_partner_assign => crm_channel

bzr revid: dle@openerp.com-20130620150725-ksoctsc2pnyavx3t
---
 .../__init__.py                               |   2 +-
 .../__openerp__.py                            |   2 +-
 .../crm_channel.py}                           |   0
 .../crm_channel_data.xml}                     |   2 +-
 .../crm_lead_view.xml                         |   0
 .../data/lead_mail_template_data.xml          |   0
 .../i18n/ar.po                                | 382 ++++++++---------
 .../i18n/bg.po                                | 382 ++++++++---------
 .../i18n/ca.po                                | 382 ++++++++---------
 .../i18n/crm_partner_assign.pot               | 384 +++++++++---------
 .../i18n/cs.po                                | 382 ++++++++---------
 .../i18n/da.po                                | 382 ++++++++---------
 .../i18n/de.po                                | 382 ++++++++---------
 .../i18n/el.po                                | 382 ++++++++---------
 .../i18n/es.po                                | 382 ++++++++---------
 .../i18n/es_CR.po                             | 382 ++++++++---------
 .../i18n/es_MX.po                             | 288 ++++++-------
 .../i18n/es_PY.po                             | 382 ++++++++---------
 .../i18n/es_VE.po                             | 288 ++++++-------
 .../i18n/fi.po                                | 382 ++++++++---------
 .../i18n/fr.po                                | 382 ++++++++---------
 .../i18n/gl.po                                | 382 ++++++++---------
 .../i18n/hr.po                                | 382 ++++++++---------
 .../i18n/hu.po                                | 384 +++++++++---------
 .../i18n/it.po                                | 382 ++++++++---------
 .../i18n/ja.po                                | 382 ++++++++---------
 .../i18n/ko.po                                | 382 ++++++++---------
 .../i18n/lt.po                                | 382 ++++++++---------
 .../i18n/lv.po                                | 382 ++++++++---------
 .../i18n/mk.po                                | 382 ++++++++---------
 .../i18n/mn.po                                | 382 ++++++++---------
 .../i18n/nb.po                                | 382 ++++++++---------
 .../i18n/nl.po                                | 382 ++++++++---------
 .../i18n/pl.po                                | 382 ++++++++---------
 .../i18n/pt.po                                | 382 ++++++++---------
 .../i18n/pt_BR.po                             | 382 ++++++++---------
 .../i18n/ro.po                                | 382 ++++++++---------
 .../i18n/ru.po                                | 382 ++++++++---------
 .../i18n/sl.po                                | 382 ++++++++---------
 .../i18n/sq.po                                | 382 ++++++++---------
 .../i18n/sr@latin.po                          | 382 ++++++++---------
 .../i18n/sv.po                                | 382 ++++++++---------
 .../i18n/tr.po                                | 382 ++++++++---------
 .../i18n/zh_CN.po                             | 382 ++++++++---------
 .../i18n/zh_TW.po                             | 382 ++++++++---------
 .../report/__init__.py                        |   0
 .../report/crm_lead_report.py                 |   0
 .../report/crm_lead_report_view.xml           |   0
 .../report/crm_partner_report.py              |   0
 .../report/crm_partner_report_view.xml        |  10 +-
 .../res_partner_demo.xml                      |   0
 .../res_partner_view.xml                      |   0
 .../security/ir.model.access.csv              |   0
 .../test/partner_assign.yml                   |   0
 .../wizard/__init__.py                        |   0
 .../wizard/crm_forward_to_partner.py          |   4 +-
 .../wizard/crm_forward_to_partner_view.xml    |   0
 57 files changed, 7367 insertions(+), 7367 deletions(-)
 rename addons/{crm_partner_assign => crm_channel}/__init__.py (97%)
 rename addons/{crm_partner_assign => crm_channel}/__openerp__.py (98%)
 rename addons/{crm_partner_assign/crm_partner_assign.py => crm_channel/crm_channel.py} (100%)
 rename addons/{crm_partner_assign/crm_partner_assign_data.xml => crm_channel/crm_channel_data.xml} (94%)
 rename addons/{crm_partner_assign => crm_channel}/crm_lead_view.xml (100%)
 rename addons/{crm_partner_assign => crm_channel}/data/lead_mail_template_data.xml (100%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/ar.po (77%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/bg.po (71%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/ca.po (73%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/crm_partner_assign.pot (68%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/cs.po (69%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/da.po (69%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/de.po (77%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/el.po (72%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/es.po (78%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/es_CR.po (76%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/es_MX.po (73%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/es_PY.po (73%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/es_VE.po (73%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/fi.po (72%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/fr.po (77%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/gl.po (73%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/hr.po (69%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/hu.po (75%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/it.po (74%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/ja.po (75%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/ko.po (73%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/lt.po (69%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/lv.po (73%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/mk.po (74%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/mn.po (72%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/nb.po (72%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/nl.po (77%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/pl.po (73%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/pt.po (76%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/pt_BR.po (78%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/ro.po (78%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/ru.po (80%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/sl.po (70%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/sq.po (69%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/sr@latin.po (69%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/sv.po (75%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/tr.po (77%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/zh_CN.po (75%)
 rename addons/{crm_partner_assign => crm_channel}/i18n/zh_TW.po (74%)
 rename addons/{crm_partner_assign => crm_channel}/report/__init__.py (100%)
 rename addons/{crm_partner_assign => crm_channel}/report/crm_lead_report.py (100%)
 rename addons/{crm_partner_assign => crm_channel}/report/crm_lead_report_view.xml (100%)
 rename addons/{crm_partner_assign => crm_channel}/report/crm_partner_report.py (100%)
 rename addons/{crm_partner_assign => crm_channel}/report/crm_partner_report_view.xml (90%)
 rename addons/{crm_partner_assign => crm_channel}/res_partner_demo.xml (100%)
 rename addons/{crm_partner_assign => crm_channel}/res_partner_view.xml (100%)
 rename addons/{crm_partner_assign => crm_channel}/security/ir.model.access.csv (100%)
 rename addons/{crm_partner_assign => crm_channel}/test/partner_assign.yml (100%)
 rename addons/{crm_partner_assign => crm_channel}/wizard/__init__.py (100%)
 rename addons/{crm_partner_assign => crm_channel}/wizard/crm_forward_to_partner.py (98%)
 rename addons/{crm_partner_assign => crm_channel}/wizard/crm_forward_to_partner_view.xml (100%)

diff --git a/addons/crm_partner_assign/__init__.py b/addons/crm_channel/__init__.py
similarity index 97%
rename from addons/crm_partner_assign/__init__.py
rename to addons/crm_channel/__init__.py
index bb4a3bb53be..2156cd0273d 100644
--- a/addons/crm_partner_assign/__init__.py
+++ b/addons/crm_channel/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import crm_partner_assign
+import crm_channel
 import wizard
 import report
 
diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_channel/__openerp__.py
similarity index 98%
rename from addons/crm_partner_assign/__openerp__.py
rename to addons/crm_channel/__openerp__.py
index 69a7f226cde..874474e97d2 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_channel/__openerp__.py
@@ -44,7 +44,7 @@ You can also use the geolocalization without using the GPS coordinates.
         'res_partner_view.xml',
         'wizard/crm_forward_to_partner_view.xml',
         'crm_lead_view.xml',
-        'crm_partner_assign_data.xml',
+        'crm_channel_data.xml',
         'report/crm_lead_report_view.xml',
         'report/crm_partner_report_view.xml',
         'data/lead_mail_template_data.xml'
diff --git a/addons/crm_partner_assign/crm_partner_assign.py b/addons/crm_channel/crm_channel.py
similarity index 100%
rename from addons/crm_partner_assign/crm_partner_assign.py
rename to addons/crm_channel/crm_channel.py
diff --git a/addons/crm_partner_assign/crm_partner_assign_data.xml b/addons/crm_channel/crm_channel_data.xml
similarity index 94%
rename from addons/crm_partner_assign/crm_partner_assign_data.xml
rename to addons/crm_channel/crm_channel_data.xml
index dab50192641..22d87293155 100644
--- a/addons/crm_partner_assign/crm_partner_assign_data.xml
+++ b/addons/crm_channel/crm_channel_data.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding='UTF-8'?>
 <openerp>
     <data>
-        <record id="crm_partner_assign_email_template" model="email.template">
+        <record id="crm_channel_email_template" model="email.template">
             <field name="name">Lead forward</field>
             <field name="email_from"></field>
             <field name="subject">Fwd: Lead: ${object.name}</field>
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_channel/crm_lead_view.xml
similarity index 100%
rename from addons/crm_partner_assign/crm_lead_view.xml
rename to addons/crm_channel/crm_lead_view.xml
diff --git a/addons/crm_partner_assign/data/lead_mail_template_data.xml b/addons/crm_channel/data/lead_mail_template_data.xml
similarity index 100%
rename from addons/crm_partner_assign/data/lead_mail_template_data.xml
rename to addons/crm_channel/data/lead_mail_template_data.xml
diff --git a/addons/crm_partner_assign/i18n/ar.po b/addons/crm_channel/i18n/ar.po
similarity index 77%
rename from addons/crm_partner_assign/i18n/ar.po
rename to addons/crm_channel/i18n/ar.po
index c038a2b0fac..8572efb06de 100644
--- a/addons/crm_partner_assign/i18n/ar.po
+++ b/addons/crm_channel/i18n/ar.po
@@ -17,172 +17,172 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "تأخير الإغلاق"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "الكاتب"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "الأرباح المتوقعة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "الحالات"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "تجميع حسب..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "التالي"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "التمركز الجغرافي"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "النص"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "المصدر"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "تأخير الإغلاق"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "الموضوع كاملًا"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "شركة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "إشعارات"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "موعد الشريك"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "موظف مبيعات"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "أعلى"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "يوم"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "اخر بريد الكتروني"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "المدى الجغرافي"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "ملغي"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "التخصيص الجغرافي"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "معالج تكوين رسالة بريد الالكتروني"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "تاريخ الإغلاق"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -190,251 +190,251 @@ msgid ""
 msgstr ""
 "ويعطي احتمالية لتخصيص مصدر اساسي لذلك الشريك. (0 تعني لا يوجد تخصيص.)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "الاحتمالية المتوسطة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "السابق"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "خطأ شبكة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "من"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "مستوى الشريك"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "قسم"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "أرسل"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "التالي"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "أولوية"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "تخطي الموعد النهائي"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "نوع"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "بريد إلكتروني"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "تقديم شريك هذه الحالة/خصص لـ."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "أدنى"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "قالب"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "تحليل المصادر"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "تاريخ الإنشاء"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "المعرف المتعلق بالمستند"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "معلّق"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "تخصيص الشريك"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "أُستخدمت العلامة لفصل المصادر والفرص"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "يوليو"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "مرحلة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "الحالة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "للقراءة"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "تقديم"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "التمركز الجغرافي"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "تحليل الفرص المخصصة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "إلغاء"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "ارسل سجل"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "إغلاق"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "مارس"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "تحليل الفرص المخصصة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "عدد الأيام لغلق الحالة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "تعليق"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "وزن"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "أبريل"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -442,332 +442,332 @@ msgstr "أبريل"
 msgid "Grade"
 msgstr "مستوى"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "ديسمبر"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "المستخدمين الذين صوتوا لهذه الرسالة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "شهر"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "تاريخ الفتح"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "رسالة فرعية"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "آخر مراجعة للشريك"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "موضوع"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "أو"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "المحتويات"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "تصويتات"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "عدد الفرص"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "فريق"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "مسودة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "منخفض"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "مغلق"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "الفرص المخصصة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "تاريخ التخصيص"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "الاحتمالية القصوى"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "أغسطس"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "عادي"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "تصعيد"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "يونيو"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "عدد الإيام لفتح الحالة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "تأخر الفتح"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "مستخدِم"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "نشط"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "نوفمبر"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "مرشحات مفصلة..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "الحدود الجغرافية"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "عدد الفرص"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "تعيين المصدر"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "أكتوبر"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "تخصيص"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "يناير"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "إرسال بريد"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "التاريخ"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "الأرباح المخططة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "فترة الفاتورة"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "معرف - الرسالة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "مرفقات"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "مسلسل"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "سبتمبر"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "اسم المستوى"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "تم تقديم اخر موعد لهذه الحالة/تم تخصيصها للشريك"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "فتح"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "النوع الفرعي"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "تاريخ التمركز الجغرافي"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "الحالي"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "عرض/فرصة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "تقديم الى الشريك"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "فريق المبيعات"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "مايو"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "الربح المحتمل"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -776,49 +776,49 @@ msgstr "الربح المحتمل"
 msgid "Activation"
 msgstr "تنشيط"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "تخصيص شريك"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "فرصة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "عميل"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "فبراير"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "الاسم"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -826,108 +826,108 @@ msgstr ""
 msgid "Country"
 msgstr "دولة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "سنة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "تحويل إلي فرصة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "تخصيص جغرافي"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "تأخر الفتح"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "تحليل الشراكة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "تقرير مهام إدارة العلافات للعملاء"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "معلومات عن الحالة"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "مرتفع"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "إنشاء تاريخ"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "مرشحات الفرز"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "شريك"
 
diff --git a/addons/crm_partner_assign/i18n/bg.po b/addons/crm_channel/i18n/bg.po
similarity index 71%
rename from addons/crm_partner_assign/i18n/bg.po
rename to addons/crm_channel/i18n/bg.po
index 46a537a7563..217bdf4438b 100644
--- a/addons/crm_partner_assign/i18n/bg.po
+++ b/addons/crm_channel/i18n/bg.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Планирани приходи"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Групиране по..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Препращане"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Фирма"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Най-висок"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Ден"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Последен имейл"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Отказанa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Дата на затваряне"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Предишен"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Мрежова грешка"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "От"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Секция"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Следващ"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Приоритет"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Тип"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Най-нисък"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Дата на създаване"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Висящи"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Юли"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Етап"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Препащане"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Отказ"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Затваряне"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Март"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Тегло"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Април"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr "Април"
 msgid "Grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Декември"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Месец"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Дата на отваряне"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Относно"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#Възможности"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Чернова"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Нисък"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Приключено"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Август"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Нормален"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Ескалиране"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Юни"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Брой дни до отваряне на случай"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Потребител"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Активен"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Ноември"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Разширени филтри"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Октомври"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Януари"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Последователност"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Септември"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Отваряне"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Текущ"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Препращане до контрагент"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Търговски отдел"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Май"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr ""
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Възможности"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Клиент"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Февруари"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,108 +825,108 @@ msgstr ""
 msgid "Country"
 msgstr "Държава"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Година"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Висок"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Създаване на дата"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Контрагент"
 
diff --git a/addons/crm_partner_assign/i18n/ca.po b/addons/crm_channel/i18n/ca.po
similarity index 73%
rename from addons/crm_partner_assign/i18n/ca.po
rename to addons/crm_channel/i18n/ca.po
index f63bc426e25..5c18cd58674 100644
--- a/addons/crm_partner_assign/i18n/ca.po
+++ b/addons/crm_channel/i18n/ca.po
@@ -17,172 +17,172 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Retard per tancar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Ingressos previstos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# de casos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Agrupa per..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Endavant"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo localitzar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Iniciativa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Retard per tancar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Històric complet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Companyia"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Data empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "El més alt"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Dia"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Últim email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo latitud"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Cancel·lada"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geo assignació"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Data de tancament"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -191,251 +191,251 @@ msgstr ""
 "Indica la probabilitat d'assignar una iniciativa a aquesta empresa. (0 "
 "significa cap assignació)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilitat mitjana"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Previ"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Error de la xarxa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Per"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Nivell de l'empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Secció"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Següent"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioritat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Data límit sobrepassada"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tipus"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Empresa a la qual aquest cas ha estat reexpedit/assignat."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Mínima"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Anàlisi d'iniciatives"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Data creació"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Pendent"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Assignació de l'empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "El tipus és utilitzat per separar iniciatives i oportunitats"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Juliol"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Etapa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Reenviament"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo localització"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Anàlisi d'assignació d'oportunitats"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Canceŀla"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Envia historial"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Tanca"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Març"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Anàlisi d'assignació d'oportunitat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Número de dies per tancar el cas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Pes"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Abril"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -443,333 +443,333 @@ msgstr "Abril"
 msgid "Grade"
 msgstr "Qualificació"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Desembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mes"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Data d'obertura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Assumpte"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "nº oportunitats"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Esborrany"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Baix"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Tancat"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Oportunitats assignades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Data d'assignació"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilitat màx."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Agost"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escalat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Juny"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Número de dies per obrir el cas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Retard d'obertura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Usuari"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Actiu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Novembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtres estesos..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Longitud Geo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Assignar iniciativa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Octubre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Asignació"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Gener"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Ingressos esperats"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.empresa.nivell"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Seqüència"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Setembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nom del nivell"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 "Última data en la qual aquest cas va ser reenviat/assignat a una empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Obre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Data geolocalització"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Actiu"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Reenvia a empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Equip de vendes"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Maig"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Ingrés previst"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -778,49 +778,49 @@ msgstr "Ingrés previst"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Empresa assignada"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Oportunitat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Client"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Febrer"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -828,108 +828,108 @@ msgstr ""
 msgid "Country"
 msgstr "País"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Any"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Converteix a oportunitat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Assignar geo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Retard d'obertura"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Informe d'iniciatives CRM"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Informació del cas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Alt"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Data de creació"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Empresa"
 
diff --git a/addons/crm_partner_assign/i18n/crm_partner_assign.pot b/addons/crm_channel/i18n/crm_partner_assign.pot
similarity index 68%
rename from addons/crm_partner_assign/i18n/crm_partner_assign.pot
rename to addons/crm_channel/i18n/crm_partner_assign.pot
index 3dc7f011bbf..d6616589610 100644
--- a/addons/crm_partner_assign/i18n/crm_partner_assign.pot
+++ b/addons/crm_channel/i18n/crm_partner_assign.pot
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* crm_partner_assign
+#	* crm_channel
 #
 msgid ""
 msgstr ""
@@ -15,416 +15,416 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid "Message type: email for email message, notification for system message, comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid "Email address of the sender. This field is set when no matching partner is found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid "Gives the probability to assign a lead to this partner. (0 means no assignation.)"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:77
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:77
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:77
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:77
 #, python-format
 msgid "Fwd"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -432,330 +432,330 @@ msgstr ""
 msgid "Grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid "Cannot contact geolocation servers. Please make sure that your internet connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -764,49 +764,49 @@ msgstr ""
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -814,104 +814,104 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid "Technical field holding the message notifications. Use notified_partner_ids to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid "Author of the message. If not set, email_from may hold an email address that did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/cs.po b/addons/crm_channel/i18n/cs.po
similarity index 69%
rename from addons/crm_partner_assign/i18n/cs.po
rename to addons/crm_channel/i18n/cs.po
index 12c03bf18eb..9cb494897c1 100644
--- a/addons/crm_partner_assign/i18n/cs.po
+++ b/addons/crm_channel/i18n/cs.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-31 05:27+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr ""
 msgid "Grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr ""
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,107 +825,107 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr ""
diff --git a/addons/crm_partner_assign/i18n/da.po b/addons/crm_channel/i18n/da.po
similarity index 69%
rename from addons/crm_partner_assign/i18n/da.po
rename to addons/crm_channel/i18n/da.po
index 93aa75ba0cb..8fb527d6582 100644
--- a/addons/crm_partner_assign/i18n/da.po
+++ b/addons/crm_channel/i18n/da.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr ""
 msgid "Grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr ""
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,107 +825,107 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr ""
diff --git a/addons/crm_partner_assign/i18n/de.po b/addons/crm_channel/i18n/de.po
similarity index 77%
rename from addons/crm_partner_assign/i18n/de.po
rename to addons/crm_channel/i18n/de.po
index 98625562638..05dc1ff12ac 100644
--- a/addons/crm_partner_assign/i18n/de.po
+++ b/addons/crm_channel/i18n/de.po
@@ -17,22 +17,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Zeit f. Beendigung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Urheber"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Geplanter Umsatz"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
@@ -41,43 +41,43 @@ msgstr ""
 "Nachrichtentyp: E-Mail für E-mailnachricht, Mitteilung für Systemnachricht, "
 "Kommentar für andere Mitteilungen wie Diskussionsbeiträgen von Benutzern."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "Fälle"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Gruppierung..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Automatisch bereinigter HTML Inhalt"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo-Lokalisierung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Markiert"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Nachricht"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -86,359 +86,359 @@ msgstr ""
 "E-Mail Adresse des Absenders. Dieses Feld wird ausgefüllt, wenn aufgrund "
 "eingehender E-Mails keine automatische Zuordnung eines Partners möglich ist."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr "Beginn Partnerschaft"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Lead"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Zeit f. Beendigung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Gesamte Historie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Unternehmen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Partner Daten"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Verkäufer"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Sehr Hoch"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Tag"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Eindeutige Identifikation der Nachricht"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr "Nächste Partnerbewertung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Letzte E-Mail"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo Längengrad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geogr. Zuweisung"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "E-Mail Assistent"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Umsatz"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Datum Beendigung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr "Ermöglicht automatische Zuweisung von Leads zu Partnern"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr "Aktivierung Partner"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "System Benachrichtigung"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr "Interessenten Übermittlung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Durch. Wahrscheinl."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Vorherige"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Netzwerk Fehler"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Von"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Partner Einstufung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Sektion"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Senden"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Weiter"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Priorität"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Überschrittene Frist"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Typ"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "E-Mail"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Partner zu dem der Fall zugewiesen wurde"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Sehr gering"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Datum Rechnung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Vorlage"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Datum festlegen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Statistik Verkaufskontakte"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Datum Erstellung"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Hauptnachricht"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "Dokumenten-ID"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Im Wartezustand"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Partner Zuweisung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Typ wird benutzt für die Trennung zwischen Leads und Verkaufschance"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Juli"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr "Bewertungsdatum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Stufe"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Status"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "ungelesen"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Weiterleiten"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo Lokalisierung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Statistik Kontaktzuweisung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Abbruch"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Sende Fallhistorie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Beenden"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "März"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Statistik Chancenzuweisung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Anzahl Tage f. Beendigung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 "Partner, die benachrichtigt wurden, dass diese E-Mail ihnen zugestellt wurde."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Kommentar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Gewicht"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "April"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -446,257 +446,257 @@ msgstr "April"
 msgid "Grade"
 msgstr "Einstufung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Dezember"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Benutzer die für diese Mitteilung gestimmt haben"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Monat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Datum Eröffnung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Kommentare"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "Letzte Partner Bewertung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Betreff"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "oder"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Inhalte"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Bewertungen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "# Verkaufschancen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr "Dieser Benutzer hat eine Markierung zu dieser Nachricht erstellt"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr "Beginn Partnerschaft"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Team"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Entwurf"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Gering"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Beendet"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Massenmail an Partner"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Zugewiesene Verkaufschancen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Zuweisungsdatum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Max. Wahrscheinl."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "August"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr "Bezeichnung kommt vom verbundenen Vorgang."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Eskalation"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Juni"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Anzahl Tage f. Eröffn."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Durch. Zeit b. Eröffn."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Benutzer"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Aktiv"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "November"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Erweiterter Filter..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Geo Längengrad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# der Verkaufschancen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Zuweisen Verkaufskontakt"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Oktober"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Zuweisung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Januar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "E-Mail senden"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Datum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Geplanter Umsatz"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "Partner Bewertung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Abrechnungsperiode"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Nachricht-ID"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Anhänge"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Mitteilung Bezeichnung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Sequenz"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
@@ -705,75 +705,75 @@ msgstr ""
 "Die Verbindung zum Geolokalisierung Server war nicht erfolgreich. Bitte "
 "stellen Sie sicher, daß Sie eine Internet Verbindung haben (%s)."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "September"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Einstufung Name"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "Letztmalige Zuweisung / Weitergabe des Leads"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Offen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Untertyp"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Geo Lokalisierung Daten"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Aktuell"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Interessent / Chance"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Benachrichtigter Partner"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Weiter zu Partner"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Verkauf Team"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Mai"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Geplanter Umsatz"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -782,49 +782,49 @@ msgstr "Geplanter Umsatz"
 msgid "Activation"
 msgstr "Aktivierung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Zugewiesener Partner"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "Partner Level"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr "Dieser Benutzer hat ungelesene Mitteilungen zu dieser Nachricht"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Verkaufschance"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Kunde"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Februar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Bezeichnung"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Partnerschaft Aktivierung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -832,34 +832,34 @@ msgstr "Partnerschaft Aktivierung"
 msgid "Country"
 msgstr "Land"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Jahr"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Konvertiere z. Verkaufschance"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Geogr. Zuweisung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "D. Dauer b. Eröff."
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "Partner Analyse"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
@@ -868,32 +868,32 @@ msgstr ""
 "Technisches Feld mit der Benachrichtigung. Zum Zugriff auf zu "
 "benachrichtigenden Partner verwenden Sie notified_partner_ids."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Partner Zuteilung Analyse"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Auswertung Leads"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Erstellungsmodus"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "verbundenes Datenmodell"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Fall Information"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -902,42 +902,42 @@ msgstr ""
 "Verfasser der Mitteilung. Wenn nicht gesetzt kann die E-Mail Absenderadresse "
 "keinem Partner zugeordnet werden."
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM Partner Report"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Hoch"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Weitere Kontakte"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "Anfangsmitteilung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Datum Erstellung"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filter"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Partner"
 
diff --git a/addons/crm_partner_assign/i18n/el.po b/addons/crm_channel/i18n/el.po
similarity index 72%
rename from addons/crm_partner_assign/i18n/el.po
rename to addons/crm_channel/i18n/el.po
index 9334b08f8fc..7cc46357a53 100644
--- a/addons/crm_partner_assign/i18n/el.po
+++ b/addons/crm_channel/i18n/el.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Καθυστέρηση για Κλείσιμο"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Προγραμματισμένα Έσοδα"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# από Υποθέσεις"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Ομαδοποίηση ανά..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Προώθηση"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Υποψήφιος Πελάτης"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Καθηστέρηση για κλείσιμο"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Εταιρία"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Ημερομηνία Συνεργάτη"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Υψηλότερο"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Ημέρα"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Ημερομηνία Ολοκλήρωσης"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Σφάλμα δικτύου"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Από"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Τομέας"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Επόμενο"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Προτεραιότητα"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Περασμένη Προθεσμία"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Τύπος"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Χαμηλότερο"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Ανάλυση Ευκαιριών"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Ημερομηνία Δημιουργίας"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Εκκρεμεί"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Ιούλιος"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Στάδιο"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Προοθ."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Αποστολή Ιστορικού"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Μάρτιος"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Αριθμός Ημερών για κλείσιμο της υπόθεσης"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Βάρος"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Απρίλιος"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr "Απρίλιος"
 msgid "Grade"
 msgstr "Βαθμίδα"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Δεκέμβριος"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Μήνας"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Μέρα Έναρξης"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Θέμα"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "# Ευκαιρίες"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Πρόχειρο"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Χαμηλό"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Έκλεισε"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Αύγουστος"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Κανονικό"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Διαβάθμιση"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Ιούνιος"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Αριθμός Ημερών για άνοιγμα υπόθεσης"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Χρήστης"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Ενεργό"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Νοέμβριος"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Εκτεταμένα Φίλτρα..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Οκτώβριος"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Προβλεπόμενα Έσοδα"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Σεπτέμβριος"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Ανοιχτό"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Τρέχων"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Μάιος"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Εκτιμώμενα Έσοδα"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr "Εκτιμώμενα Έσοδα"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Ευκαιρία"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Πελάτης"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Φεβρουάριος"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,108 +825,108 @@ msgstr ""
 msgid "Country"
 msgstr "Χώρα"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Μετατροπή σε Ευκαιρία"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Καθηστέρηση για άνοιγμα"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Αναφορά Υποψηφίων πελατών CRM"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Συνεργάτης"
 
diff --git a/addons/crm_partner_assign/i18n/es.po b/addons/crm_channel/i18n/es.po
similarity index 78%
rename from addons/crm_partner_assign/i18n/es.po
rename to addons/crm_channel/i18n/es.po
index 42c5924a82c..14bf571913d 100644
--- a/addons/crm_partner_assign/i18n/es.po
+++ b/addons/crm_channel/i18n/es.po
@@ -17,22 +17,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Tiempo restante para el cierre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Autor"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Ingreso previsto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
@@ -41,43 +41,43 @@ msgstr ""
 "Tipo de mensaje: email para mensajes de correo, notification para mensajes "
 "de sistema, comment para otros tipos de mensaje como respuestas de usuarios."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "nº de casos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Sanear automáticamente los contenidos HTML"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Reenviar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo localizar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Destacado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Cuerpo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -86,107 +86,107 @@ msgstr ""
 "Dirección de correo del remitente. Este campo se establece cuando no existe "
 "mail de empresa coincidente para correos entrantes."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr "Fecha de asociación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Iniciativa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Demora cierre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Historial completo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Fecha empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Comercial"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Más alta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Día"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Identificador único del mensaje"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr "Próxima revisiónd de la empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Último email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo latitud"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geo asignación"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Asistente de composición de e-mail"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Volumen de negocio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Fecha cierre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -195,230 +195,230 @@ msgstr ""
 "Indica la probabilidad de asignar una iniciativa a esta empresa. (0 "
 "significa ninguna asignación)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr "Activación de empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Notificación del sistema"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr "Reenviar iniciativa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilidad media"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Anterior"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Error de red"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "De"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Nivel empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Sección"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Enviar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Siguiente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioridad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Fecha límite excedida"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tipo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "Email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Empresa a la que este caso ha sido reenviado/asignado."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Más baja"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Fecha factura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Plantilla"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Fecha de asignación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Análisis de iniciativas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Fecha creación"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "Copy text \t res.partner.activation"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Mensaje padre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID del docuemtno relacionado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Pendiente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Asignación empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "El tipo es utilizado para separar iniciativas y oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Julio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr "Fecha revisión"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Etapa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Estado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "Para leer"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Reenvío"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo localización"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Análisis de asignación de oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Enviar historial"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Cerrar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Marzo"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Análisis de asignación de op."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Número de días para cerrar el caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
@@ -426,22 +426,22 @@ msgstr ""
 "Empresas que tienen una notificación poniendo este mensaje en sus bandejas "
 "de entrada"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Comentario"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Peso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Abril"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -449,258 +449,258 @@ msgstr "Abril"
 msgid "Grade"
 msgstr "Nivel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Diciembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Usuarios que votaron por este mensaje"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mes"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Fecha de apertura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Mensajes hijos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "Ultima revisión de la empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Asunto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "o"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Contenidos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Votos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "nº oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 "El usuario actual tiene una notificación destacada asociada a este mensaje"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr "Fecha de asociación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Equipo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Borrador"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Baja"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Cerrado"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Envío masivo a empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Oportunidades asignadas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Fecha de asignación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilidad max."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Agosto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr "Nombre cogido del documento relacionado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escalar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Junio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Número de días para abrir el caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Demora de apertura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Usuario"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Activo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Noviembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Longitud Geo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "Nº oportunidad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Asignar iniciativa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Octubre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Asignación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Enero"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Enviar correo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Fecha"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Beneficio previsto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "Revisión empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Periodo factura"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.empresa.nivel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Id del mensaje"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Nombre de registro del mensaje"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
@@ -709,76 +709,76 @@ msgstr ""
 "No es posible contactar servidores de geolocalización. Por favor, asegúrese "
 "que su conexión de internet esté arriba y funcionando (%s)."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Septiembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nombre de nivel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 "Última fecha en la que este caso fue reenviado/asignado a una empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Abierto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Subtipo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Fecha geolocalización"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Actual"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Iniciativa / Oportunbidad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Empresas notificadas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Reenviar a empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Equipo de ventas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Mayo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Ingreso estimado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -787,50 +787,50 @@ msgstr "Ingreso estimado"
 msgid "Activation"
 msgstr "Activación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Empresa asignada"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "Nivel partner"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 "El usuario actual tiene una notificación sin leer asociada a este mensaje"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Oportunidad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Febrero"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Nombre"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Activaciones de empresas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -838,34 +838,34 @@ msgstr "Activaciones de empresas"
 msgid "Country"
 msgstr "País"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Año"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Convertir en oportunidad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Asignar geo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Retraso de apertura"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "Análisis de la relación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
@@ -874,32 +874,32 @@ msgstr ""
 "Campo técnico que contiene notificaciones de mensaje. Use "
 "notified_partner_ids para acceder a las empresas notificadas."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Análisis de la empresa asignada"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Informe de iniciativas CRM"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Modo composición"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "Modelo de documento relacionado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Información de caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -908,42 +908,42 @@ msgstr ""
 "Autor del mensaje. Si no se establece, email_from puede contener una "
 "dirección de correo que no coincida con la de ningún cliente."
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "Informe de la empresa CRM"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Alta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Contactos adicionales"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "Mensaje inicial del hilo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Fecha de creación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filtros"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Empresa"
 
diff --git a/addons/crm_partner_assign/i18n/es_CR.po b/addons/crm_channel/i18n/es_CR.po
similarity index 76%
rename from addons/crm_partner_assign/i18n/es_CR.po
rename to addons/crm_channel/i18n/es_CR.po
index 19f4a7e455e..c1ac59b15a1 100644
--- a/addons/crm_partner_assign/i18n/es_CR.po
+++ b/addons/crm_channel/i18n/es_CR.po
@@ -18,172 +18,172 @@ msgstr ""
 "X-Generator: Launchpad (build 16532)\n"
 "Language: es\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Retraso para cerrar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Ingreso previsto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "nº de casos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Reenviar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo localizar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Cuerpo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Iniciativa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Demora cierre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Historial completo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Fecha empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Más alta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Día"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Identificador único del mensaje"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Último email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo latitud"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geo asignación"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Fecha cierre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -192,251 +192,251 @@ msgstr ""
 "Indica la probabilidad de asignar una iniciativa a esta empresa. (0 "
 "significa ninguna asignación)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilidad media"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Anterior"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Error de red"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "De"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Nivel empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Sección"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Enviar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Siguiente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioridad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Fecha límite excedida"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tipo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Empresa a la que este caso ha sido reenviado/asignado."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Más baja"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Plantilla"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Asignar Fecha"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Análisis de iniciativas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Fecha creación"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID del docuemtno relacionado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Pendiente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Asignación empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "El tipo es utilizado para separar iniciativas y oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Julio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Etapa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Reenvío"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo localización"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Análisis de asignación de oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Enviar historial"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Cerrar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Marzo"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Análisis de asignación de op."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Número de días para cerrar el caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Peso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Abril"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -444,333 +444,333 @@ msgstr "Abril"
 msgid "Grade"
 msgstr "Nivel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Diciembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mes"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Fecha de apertura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Asunto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "nº oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Equipo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Borrador"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Baja"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Cerrado"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Mass Interes de socio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Oportunidades asignadas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Fecha de asignación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilidad max."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Agosto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escalar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Junio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Número de días para abrir el caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Demora de apertura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Usuario"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Activo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Noviembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Longitud Geo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# de Oportunidad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Asignar iniciativa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Octubre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Asignación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Enero"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Enviar correo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Fecha"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Beneficio previsto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.empresa.nivel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Id del mensaje"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Septiembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nombre de nivel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 "Última fecha en la que este caso fue reenviado/asignado a una empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Abierto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Fecha geolocalización"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Actual"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Reenviar a empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Equipo de ventas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Mayo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Ingreso estimado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -779,49 +779,49 @@ msgstr "Ingreso estimado"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Empresa asignada"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Oportunidad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Febrero"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Nombre"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -829,108 +829,108 @@ msgstr ""
 msgid "Country"
 msgstr "País"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Año"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Convertir en oportunidad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Asignar geo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Retraso de apertura"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "Asociación de Análisis"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Análisis de socio asignado"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Informe de iniciativas CRM"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Información de caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM Informe de Socio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Alta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Fecha de creación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filtros"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Empresa"
 
diff --git a/addons/crm_partner_assign/i18n/es_MX.po b/addons/crm_channel/i18n/es_MX.po
similarity index 73%
rename from addons/crm_partner_assign/i18n/es_MX.po
rename to addons/crm_channel/i18n/es_MX.po
index 40dc0776df7..30dadccab13 100644
--- a/addons/crm_partner_assign/i18n/es_MX.po
+++ b/addons/crm_channel/i18n/es_MX.po
@@ -17,75 +17,75 @@ msgstr ""
 "X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,name:0
 msgid "Send to"
 msgstr "Enviar a"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Retraso para cerrar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Ingreso previsto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "nº de casos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: view:crm.lead.forward.to.partner:0
 msgid "Forward"
 msgstr "Reenviar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply-to of the Sales team defined on this case"
 msgstr "\"Responder a\" del equipo de ventas definido en este caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo localizar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Marzo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Iniciativa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Demora cierre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Whole Story"
 msgstr "Historial completo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:41
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:41
 #, python-format
 msgid ""
 "Could not contact geolocation servers, please make sure you have a working "
@@ -94,51 +94,51 @@ msgstr ""
 "No se puede conectar con los servidores de geolocalización, por favor "
 "asegúrese de tener conexión a internet (%s)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_date:0
 msgid "Partner Date"
 msgstr "Fecha empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Más alta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Día"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Latest email"
 msgstr "Último email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo latitud"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geo asignación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Fecha cierre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -147,8 +147,8 @@ msgstr ""
 "Indica la probabilidad de asignar una iniciativa a esta empresa. (0 "
 "significa ninguna asignación)"
 
-#. module: crm_partner_assign
-#: model:ir.module.module,description:crm_partner_assign.module_meta_information
+#. module: crm_channel
+#: model:ir.module.module,description:crm_channel.module_meta_information
 msgid ""
 "\n"
 "This is the module used by OpenERP SA to redirect customers to his "
@@ -162,38 +162,38 @@ msgstr ""
 "basándose en geo-localización.\n"
 "    "
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Pendiente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,name:0
 #: field:crm.lead.forward.to.partner,partner_id:0
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilidad media"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Anterior"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:40
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:40
 #, python-format
 msgid "Network error"
 msgstr "Error de red"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_cc:0
 msgid ""
 "These addresses will receive a copy of this email. To modify the permanent "
@@ -202,520 +202,520 @@ msgstr ""
 "Estas direcciones recibirán una copia de este correo electrónico. Para "
 "modificar la lista CC permanente, edite el campo CC global de este caso."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "De"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: field:res.partner,grade_id:0
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Nivel empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Section"
 msgstr "Sección"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Siguiente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioridad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "State"
 msgstr "Estado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Fecha límite excedida"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,html:0
 msgid "HTML formatting?"
 msgstr "Formato HTML?"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tipo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Empresa a la que este caso ha sido reenviado/asignado."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Más baja"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Análisis de iniciativas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Fecha creación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,html:0
 msgid "Select this if you want to send email with HTML formatting."
 msgstr "Seleccione esta opción si desea enviar emails con formato HTML"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "7 Days"
 msgstr "7 días"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Asignación empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "El tipo es utilizado para separar iniciativas y oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Julio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Etapa"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:271
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:271
 #, python-format
 msgid "Fwd"
 msgstr "Reenvío"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo localización"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Análisis de asignación de oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history:0
 msgid "Send history"
 msgstr "Enviar historial"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Contact"
 msgstr "Contactar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Cerrar"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Análisis de asignación de op."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Número de días para cerrar el caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Peso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Retraso de apertura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 msgid "Grade"
 msgstr "Nivel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Diciembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mes"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Fecha de apertura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Asunto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Salesman"
 msgstr "Comercial"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply To"
 msgstr "Responder a"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,categ_id:0
 msgid "Category"
 msgstr "Categoría"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "nº oportunidades"
 
-#. module: crm_partner_assign
-#: model:ir.module.module,shortdesc:crm_partner_assign.module_meta_information
+#. module: crm_channel
+#: model:ir.module.module,shortdesc:crm_channel.module_meta_information
 msgid "Partner Geo-Localisation"
 msgstr "Geolocalización empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
 msgstr "¡Error! No puede crear miembros asociados recursivos."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Borrador"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Baja"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,state:0
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Cerrado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Oportunidades asignadas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Fecha de asignación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilidad max."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Agosto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escalar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "unknown"
 msgstr "desconocido"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Junio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Número de días para abrir el caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Demora de apertura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,name:0
 #: field:crm.lead.forward.to.partner,user_id:0
 #: field:crm.lead.report.assign,user_id:0
 msgid "User"
 msgstr "Usuario"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Activo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Noviembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Longitud Geo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Asignar iniciativa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Octubre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Asignación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_cc:0
 msgid "CC"
 msgstr "CC"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Enero"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Beneficio previsto"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.empresa.nivel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,state:0
 msgid "Unchanged"
 msgstr "Sin cambios"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Septiembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Last 30 Days"
 msgstr "Últimos 30 días"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nombre de nivel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 "Última fecha en la que este caso fue reenviado/asignado a una empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Abierto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Fecha geolocalización"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Actual"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_to:0
 msgid "To"
 msgstr "Para"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Send new email"
 msgstr "Enviar nuevo email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Reenviar a empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Mayo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Ingreso estimado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Empresa asignada"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,address_id:0
 msgid "Address"
 msgstr "Dirección"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Oportunidad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Febrero"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,name:0
 msgid "Email Address"
 msgstr "Dirección de email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 msgid "Country"
 msgstr "País"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Convertir en oportunidad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Asignar geo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Abril"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "crm.lead"
 msgstr "crm.iniciativa"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Informe de iniciativas CRM"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Case Information"
 msgstr "Información de caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Message Body"
 msgstr "Cuerpo del mensaje"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Alta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Equipo de ventas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Fecha de creación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,state:0
 msgid "Set New State To"
 msgstr "Establecer nuevo estado a"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,name:0
 msgid "Year"
diff --git a/addons/crm_partner_assign/i18n/es_PY.po b/addons/crm_channel/i18n/es_PY.po
similarity index 73%
rename from addons/crm_partner_assign/i18n/es_PY.po
rename to addons/crm_channel/i18n/es_PY.po
index f930b8ed2c9..19bd2838223 100644
--- a/addons/crm_partner_assign/i18n/es_PY.po
+++ b/addons/crm_channel/i18n/es_PY.po
@@ -17,172 +17,172 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Tiempo restante para el cierre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Ingresos previstos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "Nº de casos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Reenviar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo localizar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Iniciativa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Demora a cerrar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Historial completo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Fecha empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Muy alto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Día"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Último email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo latitud"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geo asignación"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Fecha cierre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -191,251 +191,251 @@ msgstr ""
 "Indica la probabilidad de asignar una iniciativa a esta empresa. (0 "
 "significa ninguna asignación)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilidad media"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Anterior"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Error de red"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "De"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Nivel empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Sección"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Siguiente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioridad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Fecha límite excedida"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tipo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Empresa a la que este caso ha sido reenviado/asignado."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Muy bajo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Análisis de iniciativas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Fecha creación"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Pendiente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Asignación a Socio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "El tipo es utilizado para separar iniciativas y oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Julio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Etapa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Reenvío"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo localización"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Análisis de asignación de oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Enviar historial"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Cerrado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Marzo"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Análisis de asignación de op."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Número de días para cerrar el caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Peso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Abril"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -443,333 +443,333 @@ msgstr "Abril"
 msgid "Grade"
 msgstr "Nivel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Diciembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mes"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Fecha de apertura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Asunto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "# Oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Borrador"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Bajo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Cerrado"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Oportunidades asignadas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Fecha de asignación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilidad max."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Agosto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escalar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Junio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Número de días para abrir el caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Retraso de apertura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Usuario"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Activo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Noviembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Longitud Geo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Asignar iniciativa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Octubre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Asignación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Enero"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Ingresos esperados"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.empresa.nivel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Septiembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nombre de nivel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 "Última fecha en la que este caso fue reenviado/asignado a una empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Abrir"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Fecha geolocalización"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Actual"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Reenviar a empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Equipo de ventas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "may"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Ingreso estimado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -778,49 +778,49 @@ msgstr "Ingreso estimado"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Empresa asignada"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Oportunidad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Febrero"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -828,108 +828,108 @@ msgstr ""
 msgid "Country"
 msgstr "País"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Año"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Convertir a oportunidad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Asignar geo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Retraso de apertura"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Informe de iniciativas CRM"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Información de caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Alto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Fecha de creación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Socio"
 
diff --git a/addons/crm_partner_assign/i18n/es_VE.po b/addons/crm_channel/i18n/es_VE.po
similarity index 73%
rename from addons/crm_partner_assign/i18n/es_VE.po
rename to addons/crm_channel/i18n/es_VE.po
index 40dc0776df7..30dadccab13 100644
--- a/addons/crm_partner_assign/i18n/es_VE.po
+++ b/addons/crm_channel/i18n/es_VE.po
@@ -17,75 +17,75 @@ msgstr ""
 "X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,name:0
 msgid "Send to"
 msgstr "Enviar a"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Retraso para cerrar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Ingreso previsto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "nº de casos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: view:crm.lead.forward.to.partner:0
 msgid "Forward"
 msgstr "Reenviar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply-to of the Sales team defined on this case"
 msgstr "\"Responder a\" del equipo de ventas definido en este caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo localizar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Marzo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Iniciativa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Demora cierre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Whole Story"
 msgstr "Historial completo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:41
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:41
 #, python-format
 msgid ""
 "Could not contact geolocation servers, please make sure you have a working "
@@ -94,51 +94,51 @@ msgstr ""
 "No se puede conectar con los servidores de geolocalización, por favor "
 "asegúrese de tener conexión a internet (%s)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_date:0
 msgid "Partner Date"
 msgstr "Fecha empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Más alta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Día"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Latest email"
 msgstr "Último email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo latitud"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geo asignación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Fecha cierre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -147,8 +147,8 @@ msgstr ""
 "Indica la probabilidad de asignar una iniciativa a esta empresa. (0 "
 "significa ninguna asignación)"
 
-#. module: crm_partner_assign
-#: model:ir.module.module,description:crm_partner_assign.module_meta_information
+#. module: crm_channel
+#: model:ir.module.module,description:crm_channel.module_meta_information
 msgid ""
 "\n"
 "This is the module used by OpenERP SA to redirect customers to his "
@@ -162,38 +162,38 @@ msgstr ""
 "basándose en geo-localización.\n"
 "    "
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Pendiente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,name:0
 #: field:crm.lead.forward.to.partner,partner_id:0
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilidad media"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Anterior"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:40
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:40
 #, python-format
 msgid "Network error"
 msgstr "Error de red"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_cc:0
 msgid ""
 "These addresses will receive a copy of this email. To modify the permanent "
@@ -202,520 +202,520 @@ msgstr ""
 "Estas direcciones recibirán una copia de este correo electrónico. Para "
 "modificar la lista CC permanente, edite el campo CC global de este caso."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "De"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: field:res.partner,grade_id:0
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Nivel empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Section"
 msgstr "Sección"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Siguiente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioridad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "State"
 msgstr "Estado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Fecha límite excedida"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,html:0
 msgid "HTML formatting?"
 msgstr "Formato HTML?"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tipo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Empresa a la que este caso ha sido reenviado/asignado."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Más baja"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Análisis de iniciativas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Fecha creación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,html:0
 msgid "Select this if you want to send email with HTML formatting."
 msgstr "Seleccione esta opción si desea enviar emails con formato HTML"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "7 Days"
 msgstr "7 días"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Asignación empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "El tipo es utilizado para separar iniciativas y oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Julio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Etapa"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:271
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:271
 #, python-format
 msgid "Fwd"
 msgstr "Reenvío"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo localización"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Análisis de asignación de oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history:0
 msgid "Send history"
 msgstr "Enviar historial"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Contact"
 msgstr "Contactar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Cerrar"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Análisis de asignación de op."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Número de días para cerrar el caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Peso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Retraso de apertura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 msgid "Grade"
 msgstr "Nivel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Diciembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mes"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Fecha de apertura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Asunto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Salesman"
 msgstr "Comercial"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply To"
 msgstr "Responder a"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,categ_id:0
 msgid "Category"
 msgstr "Categoría"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "nº oportunidades"
 
-#. module: crm_partner_assign
-#: model:ir.module.module,shortdesc:crm_partner_assign.module_meta_information
+#. module: crm_channel
+#: model:ir.module.module,shortdesc:crm_channel.module_meta_information
 msgid "Partner Geo-Localisation"
 msgstr "Geolocalización empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
 msgstr "¡Error! No puede crear miembros asociados recursivos."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Borrador"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Baja"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,state:0
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Cerrado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Oportunidades asignadas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Fecha de asignación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilidad max."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Agosto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escalar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "unknown"
 msgstr "desconocido"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Junio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Número de días para abrir el caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Demora de apertura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,name:0
 #: field:crm.lead.forward.to.partner,user_id:0
 #: field:crm.lead.report.assign,user_id:0
 msgid "User"
 msgstr "Usuario"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Activo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Noviembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Longitud Geo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Asignar iniciativa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Octubre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Asignación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_cc:0
 msgid "CC"
 msgstr "CC"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Enero"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Beneficio previsto"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.empresa.nivel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,state:0
 msgid "Unchanged"
 msgstr "Sin cambios"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Septiembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Last 30 Days"
 msgstr "Últimos 30 días"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nombre de nivel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 "Última fecha en la que este caso fue reenviado/asignado a una empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Abierto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Fecha geolocalización"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Actual"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_to:0
 msgid "To"
 msgstr "Para"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Send new email"
 msgstr "Enviar nuevo email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Reenviar a empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Mayo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Ingreso estimado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Empresa asignada"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,address_id:0
 msgid "Address"
 msgstr "Dirección"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Oportunidad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Febrero"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,name:0
 msgid "Email Address"
 msgstr "Dirección de email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 msgid "Country"
 msgstr "País"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Convertir en oportunidad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Asignar geo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Abril"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "crm.lead"
 msgstr "crm.iniciativa"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Informe de iniciativas CRM"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Case Information"
 msgstr "Información de caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Message Body"
 msgstr "Cuerpo del mensaje"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Alta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Equipo de ventas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Fecha de creación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,state:0
 msgid "Set New State To"
 msgstr "Establecer nuevo estado a"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,name:0
 msgid "Year"
diff --git a/addons/crm_partner_assign/i18n/fi.po b/addons/crm_channel/i18n/fi.po
similarity index 72%
rename from addons/crm_partner_assign/i18n/fi.po
rename to addons/crm_channel/i18n/fi.po
index 9022aa67567..5ae6d8c547c 100644
--- a/addons/crm_partner_assign/i18n/fi.po
+++ b/addons/crm_channel/i18n/fi.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Sulkemisen viive"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Suunniteltu liikevaihto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "Tapausten määrä"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Ryhmittele"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Eteenpäin"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Alueellista"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Mahdollisuus"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Viive sulkemiseen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Koko tarina"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Yritys"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Kumppanin päiväys"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Korkein"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Päivä"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Viimeisin sähköposti"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Päättymispäivä"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Keskimääräinen todennäköisyys"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Edellinen"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Verkkovirhe"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Lähettäjä"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Kumppanitaso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Osa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Seuraava"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioriteetti"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Ylitetty aikaraja"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tyyppi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Kumppani jolle tämä tapaus on välitetty/siirretty."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Alin"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Mahdollisuuksien analyysi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Luontipäivämäärä"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Odottava"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Kumppanin määrittely"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tyyppiä käytetään erottamaan mahdollisuudet ja myyntimahdollisuudet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Heinäkuu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Vaihe"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Välitä"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Peruuta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Lähetyshistoria"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Sulje"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Maaliskuu"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Päivien määrä tapauksen sulkemiseen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Paino"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Huhtikuu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr "Huhtikuu"
 msgid "Grade"
 msgstr "Luokitus"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Joulukuu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Kuukausi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Avauspäivä"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Aihe"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "Mahdollisuuksien määrä"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Luonnos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Matala"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Suljettu"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Määritellyt mahdollisuudet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Määrittelypäivä"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Korkein todennäköisyys"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Elokuu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Tavallinen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Kohota"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Kesäkuu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Päivien määrä tapauksen avaamiseen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Viive avaamiseen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Käyttäjä"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Aktiivinen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Marraskuu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Laajennetut Suotimet..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Mahdollisuuden määrittely"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Lokakuu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Määrittely"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Tammikuu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Suunniteltu liikevaihto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Sekvenssi"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Syyskuu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Luokan nimi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Avaa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Nykyinen"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Välitä kumppanille"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Myyntitiimi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Toukokuu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Todennäköinen liikevaihto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr "Todennäköinen liikevaihto"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Mahdollisuus"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Asiakas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Helmikuu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,108 +825,108 @@ msgstr ""
 msgid "Country"
 msgstr "Maa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Vuosi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Muunna mahdollisuudeksi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Viive avaamiseen"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Tapauksen tiedot"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Korkea"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Luontipäivä"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Kumppani"
 
diff --git a/addons/crm_partner_assign/i18n/fr.po b/addons/crm_channel/i18n/fr.po
similarity index 77%
rename from addons/crm_partner_assign/i18n/fr.po
rename to addons/crm_channel/i18n/fr.po
index ca2e8d0af9e..dd01aa4e0fe 100644
--- a/addons/crm_partner_assign/i18n/fr.po
+++ b/addons/crm_channel/i18n/fr.po
@@ -18,172 +18,172 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Délai pour fermer"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Chiffre d'affaires prévu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "Nb. de cas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Regrouper par..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Transférer"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Géolocalisation"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Corps"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Piste"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Délai pour fermer"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Historique complet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Société"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Date du partenaire"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "La Plus haute"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Jour"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Identifiant unique de message"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Dernier courriel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Géo-latitude"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Annulé"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Assignation géographique"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Date de fermeture"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -192,251 +192,251 @@ msgstr ""
 "Donne la probabilité d'affecter une piste à ce partenaire (0 signifie pas "
 "d'affectation)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilité moyenne"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Précedent"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Erreur de réseau"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "De"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Note du partenaire"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Équipe de vente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Envoyer"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Suivant"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Priorité"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Échéance dépassée"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Type"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Le partenaire auquel ce cas a été transmis / affecté."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "La plus basse"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Modèle"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Attribuer une date"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Analyse des pistes"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Date de création"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID du document associé"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "En attente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Assignation de partenaire"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Le type est utilisé pour différencier les pistes des opportunités"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Juillet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Étape"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Transférer"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Géolocalisation"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Analyse de l'affectation des opportunités"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Annuler"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Envoyer l'historique"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Fermer"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Mars"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Analyse de l'affectation des opportunités"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Nombre de jours pour clôturer le cas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Poids"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Avril"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -444,333 +444,333 @@ msgstr "Avril"
 msgid "Grade"
 msgstr "Niveau"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Décembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mois"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Date d'ouverture"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Sujet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "Nb. d'opportunités"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Équipe"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Brouillon"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Basse"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Fermé"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Réexpédition en masse au partenaire"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Opportunités affectées"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Date d'affectation"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilité maximale"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Août"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normale"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escalader"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Juin"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Nombre de jours pour ouvrir le cas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Délai pour ouvrir"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Utilisateur"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Actif"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Novembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtres étendus"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Longitude"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "Nb d'opportunités"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Assignation de la piste"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Octobre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Affectation"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Janvier"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Envoyer le courriel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Date"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Revenus planifiés"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "ID du message"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Pièces jointes"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Séquence"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Septembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nom du niveau"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 "Dernière date à laquelle ce cas a été transmis / affecté à un partenaire"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Ouvert"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Date de la géolocalisation"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Actuel"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Transférer au partenaire"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Équipe commerciale"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Mai"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Revenu probable"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -779,49 +779,49 @@ msgstr "Revenu probable"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Partenaire affecté"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Opportunité"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Client"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Février"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Nom"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -829,108 +829,108 @@ msgstr ""
 msgid "Country"
 msgstr "Pays"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Année"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Convertir en opportunité"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Géo-affectation"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Délai pour ouvrir"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "Analyse du partenariat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Analyse du partenaire attribué"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Rapport sur les pistes du CRM"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Information sur l'incident"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "Rapport CRM du partenaire"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Élevée"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Date de création"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filtres"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Partenaire"
 
diff --git a/addons/crm_partner_assign/i18n/gl.po b/addons/crm_channel/i18n/gl.po
similarity index 73%
rename from addons/crm_partner_assign/i18n/gl.po
rename to addons/crm_channel/i18n/gl.po
index 46037a78b8b..8edf547b162 100644
--- a/addons/crm_partner_assign/i18n/gl.po
+++ b/addons/crm_channel/i18n/gl.po
@@ -17,172 +17,172 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Atraso para pechar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Ingresos previstos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "Nº de casos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Reenviar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Xeolocalizar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Posible cliente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Demora peche"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Historial completo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Data empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "A máis alta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Día"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Último email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Xeolatitude"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Anulado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Xeoasignación"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Data de peche"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -191,251 +191,251 @@ msgstr ""
 "Indica a probabilidade de asignar unha iniciativa a esta empresa. (0 "
 "significa ningunha asignación)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilidade media"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Previo"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Erro de rede"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Desde"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Nivel empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Sección"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Seguinte"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioridade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Data límite excedida"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tipo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Empresa á que se reenviou/asignou este caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Análise de posibles clientes"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Data de creación"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Pendente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Asignación empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Utilízase Tipo para separar iniciativas e oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Xullo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Fase"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Reenvío"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Xeolocalización"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Análise de asignación de oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Anular"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Enviar historial"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Pechar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Marzo"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Análise de asignación de op."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Número de días para pechar o caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Peso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Abril"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -443,332 +443,332 @@ msgstr "Abril"
 msgid "Grade"
 msgstr "Grao"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Decembro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mes"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Data de apertura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Asunto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "Nº oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Proxecto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Baixo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Pechado"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Oportunidades asignadas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Data de asignación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilidade máx."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Agosto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escalar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Xuño"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Número de días para abrir o caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Atraso de apertura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Usuario"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Activo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Novembro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Lonxitude Xeo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Asignar posible cliente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Outubro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Asignación"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Xaneiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Beneficio previsto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.empresa.nivel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Setembro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nome de nivel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "Última data na que este caso foi reenviado/asignado a unha empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Abrir"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Data xeolocalización"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Actual"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Reenviar a empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Equipo de vendas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Maio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Ingreso estimado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -777,49 +777,49 @@ msgstr "Ingreso estimado"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Empresa asignada"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Oportunidade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Febreiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -827,108 +827,108 @@ msgstr ""
 msgid "Country"
 msgstr "País"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Ano"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Convertir en oportunidade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Xeo asignar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Atraso de apertura"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Informe de iniciativas CRM"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Información do caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Alto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Crear data"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Socio"
 
diff --git a/addons/crm_partner_assign/i18n/hr.po b/addons/crm_channel/i18n/hr.po
similarity index 69%
rename from addons/crm_partner_assign/i18n/hr.po
rename to addons/crm_channel/i18n/hr.po
index 408163d9d03..82924ae92f4 100644
--- a/addons/crm_partner_assign/i18n/hr.po
+++ b/addons/crm_channel/i18n/hr.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Planirani prihod"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# Slučaja"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Grupiraj po..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Proslijedi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Cijela priča"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Organizacija"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Najviši"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Dan"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Datum zatvaranja"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Prethodni"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Greška mreže"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Na čekanju"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Ožujak"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr ""
 msgid "Grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Prodajni tim"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr ""
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,108 +825,108 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Partner"
 
diff --git a/addons/crm_partner_assign/i18n/hu.po b/addons/crm_channel/i18n/hu.po
similarity index 75%
rename from addons/crm_partner_assign/i18n/hu.po
rename to addons/crm_channel/i18n/hu.po
index e8353308eb5..219cd1881c0 100644
--- a/addons/crm_partner_assign/i18n/hu.po
+++ b/addons/crm_channel/i18n/hu.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#    * crm_partner_assign
+#    * crm_channel
 #
 msgid ""
 msgstr ""
@@ -16,22 +16,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Késleltetés a zárásig"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Szerző"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Tervezett jövedelem"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
@@ -40,43 +40,43 @@ msgstr ""
 "Üzenet típus: email az email üzenetre, figyelmeztetés egy rendszer üzenetre, "
 "hozzászólás egy másik üzenetre mint felhasználói válaszok"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "Esetek száma"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Csoportosítás..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Automatikusan letisztított HTML tartalom"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Előre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Földrajzi fekvés meghatározása"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Kedvenc"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Törzs"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -85,107 +85,107 @@ msgstr ""
 "A küldő e-mail címei. Ez a mező lesz beállítva, ha nem talált egyező "
 "partnert a bejövő levelekhez."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr "Partnerség dátuma"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Érdeklődő"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Késleltetés a zárásig"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Teljes történet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Vállalat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Értesítések"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Partner dátum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Értékesítő"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Legmagasabb"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Nap"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Üzenet egyedi azonosító"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr "Következő partner felülvizsgálata"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Utolsó e-mail"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Földrajzi szélesség"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Törölt"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geo hozzárendelés"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Email összeállító varázsló"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Tényleges árbevétel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Zárás dátuma"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -194,231 +194,231 @@ msgstr ""
 "A partnerhez kiadható érdeklődés valószínűségét adja meg. (A nincs kiadást a "
 "0 jelenti)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr "Partner aktiválás"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Rendszerüzenet"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr "Továbblépés érdeklődésről"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Átlagos valószínűség"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Előző"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Hálózati hiba"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Kezdő dátum"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Partner minősítése"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Szakasz"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Küldés"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Következő"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioritás"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Túllépett határidő"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Típus"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "E-mail"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 "A partenr ebben az esetben ezzel együtt el lesz küldve/hozzá lesz rendelve."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Legalacsonyabb"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Számla dátuma"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Sablon"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Dátum hozzárendelés"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Érdeklődők elemzése"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Létrehozás dátuma"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "res.partner.activation"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Partner üzenet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "Kapcsolódó dokumentum azonosító ID"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Függőben lévő"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Partner hozzárendelés"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "A típust az érdeklődők és a lehetőségek szétválasztására használja"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Július"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr "Felülvizsgálat dátuma"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Szakasz"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Állapot"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "Elolvas"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Továbbítandó"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Földrajzi fekvés"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Esély lehetőség hozzárendelés elemzések"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Mégsem"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Történet elküldése"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Zárás"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Március"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Esély hozzárendelés elemzések"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Napok száma az eset lezárásáig"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
@@ -426,22 +426,22 @@ msgstr ""
 "Partnerek akiknek van egy értesítésük ennek az üzenetnek a levelező "
 "ládájukba való mozgatására"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Súly"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Április"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -449,259 +449,259 @@ msgstr "Április"
 msgid "Grade"
 msgstr "Fokozat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "December"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Felhasználók akik szavaztak erre az üzenetre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Hónap"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Nyitó dátum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Alcsoportba rakott üzenetek"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "Legutóbbi partner felülvizsgálat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Tárgy"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "vagy"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Tartalmak"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Szavazatok"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "Esélyek száma"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 "A jelenlegi felhasználónak van egy kicsillagozott, kedvenc értesítése mely "
 "hozzá van rendelve az üzenethez."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr "Partnerkapcsolat dátuma"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Csapat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Tervezet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Alacsony"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Lezárt"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Tömeges továbbküldés partnereknek"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Hozzárendelt esélyek"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Hozzárendelés dátuma"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Max. valószínűség"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Augusztus"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr "A név az ide vonatkozó dokumentumról levéve."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normál"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Fokozat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Június"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Napok száma az eset megnyitásáig"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Nyitás késleltetése"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Felhasználó"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Aktív"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "November"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Kiterjesztett szűrők…"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Földrajzi hosszúság"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# esélyek száma"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Lehetőség hozzárendelés"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Október"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Hozzárendelések"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Január"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Levél küldése"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Dátum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Tervezett bevételek"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "Partner felülvizsgálata"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Számlázási időszak"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Üzenet-ID azonosító"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Mellékletek"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Üzenet rekord név"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Sorszám"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
@@ -710,77 +710,77 @@ msgstr ""
 "Nem tud a geo szerverhez kapcsolódni. Győződjön meg róla, hogy az internet "
 "kapcsolat csatlakoztatva van és működik (%s)."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Szeptember"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Fokozat neve"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 "Ebben az esetben az utolsó dátum a partnerhez el lesz küldve/hozzá lesz "
 "rendelve"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Nyitott"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Altípus"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Földrajzi helymeghatározás dátuma"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Jelenleg"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Érdeklődő/Lehetőség"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Értesített partnerek"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "A partnernek továbbküldve"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Értékesítési csapat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Május"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Várható bevétel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -789,51 +789,51 @@ msgstr "Várható bevétel"
 msgid "Activation"
 msgstr "Aktiválás"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Hozzárendelt partner"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "Partner szint"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 "A jelenlegi felhasználónak van egy olvasatlan értesítése ehhez az üzenethez "
 "csatolva"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Lehetőség"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Vevő"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Február"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Név"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Partner aktiválások"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -841,34 +841,34 @@ msgstr "Partner aktiválások"
 msgid "Country"
 msgstr "Ország"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Év"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Átalakítás lehetőséggé"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Geo hozzárend."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Késleltetés a nyitáshoz"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "Partnerkapcsolat elemzések"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
@@ -877,32 +877,32 @@ msgstr ""
 "Technikai mező a értesítés üzenetek tárolásához. Használja a "
 "notified_partner_ids az értesített partnerek eléréséhez."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Partner hozzárendelés elemzés"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "CRM Érdeklődők jelentése"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Összeállítási mód"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "Ide vonatkozó dokumentum modell"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Eset információ"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -911,42 +911,42 @@ msgstr ""
 "Az üzenet szerzője. Ha nincs beállítva,  az e-mail ettől, egy címet "
 "tartalmaz ami nem mutat egyik partnerre sem."
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM Partner jelentés"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Magas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "További kapcsolatok"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "Elsődleges összefűzött üzenet."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Létrehozás dátuma"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Szűrők"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Partner"
 
diff --git a/addons/crm_partner_assign/i18n/it.po b/addons/crm_channel/i18n/it.po
similarity index 74%
rename from addons/crm_partner_assign/i18n/it.po
rename to addons/crm_channel/i18n/it.po
index 1f5a95ed07f..a344a40b2ad 100644
--- a/addons/crm_partner_assign/i18n/it.po
+++ b/addons/crm_channel/i18n/it.po
@@ -17,65 +17,65 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Ritardo chiusura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Autore"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Entrate pianificate"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# di Casi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Raggruppa per..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Pulisci automaticamente il contenuto HTML"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Inoltra"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo localizzazione"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Corpo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -84,107 +84,107 @@ msgstr ""
 "Indirizzo email del mittente. Questo campo è impostato quando non viene "
 "trovato nessun partner corrispondente per le email in arrivo."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr "Data della partnership"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Iniziativa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Ritardo chiusura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Storia intera"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Azienda"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Notifiche"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Data Partner"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Commerciale"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Maggiore"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Giorno"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Identificativo univoco messaggio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr "Prossuma revisione partner"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Ultima email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo Latitudine"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Annullato"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geo assegnazione"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Wizard composizione email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Ricambio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Data chiusura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -193,251 +193,251 @@ msgstr ""
 "Fornisce la probabilità di assegnare una iniziativa a questo Partner. (0 "
 "significa nessun assegnamento)."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr "Attivazione partner"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Notifica di sistema"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilità media"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Precedente"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Errore di rete"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Da"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Qualità del Partner"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Sezione"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Invia"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Prossimo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Priorità"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Scadenza superata"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tipo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "Email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Il partner di questo caso è stato inoltrato/assegnato a"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Minore"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Data fattura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Modello"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Data assegnamento"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Analisi iniziative"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Data creazione"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "res.partner.activation"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Messaggio padre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID documento collegato"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "In sospeso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Assegnazione Partner"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tipo è utilizzato per separare Iniziative e Opportunità"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Luglio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr "Data revisione"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Stadio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Stato"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "Da leggere"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Inoltra"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo Localizzazione"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Analisi assegnamento opportunità"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Annulla"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Invia storico"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Chiudi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Marzo"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Analisi assegnamento opportunità"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Numero di giorni per chiudere il caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Commento"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Peso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Aprile"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -445,332 +445,332 @@ msgstr "Aprile"
 msgid "Grade"
 msgstr "Qualità"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Dicembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mese"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Data apertura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Messaggi Figli"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "Ultima revisione partner"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Oggetto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "o"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Contenuti"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Voti"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "# Opportunità"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr "Data partnership"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Team"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Bozza"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Basso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Chiuso"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Inoltro massivo a partner"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Opportunità assegnate"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Data assegnazione"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilità massima"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Agosto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normale"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Intensificare"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Giugno"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Numero di giorni per aprire il caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Ritardo di apertura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Utente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Attivo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Novembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtri estesi..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Geo Longitudine"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# di opportunità"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Ottobre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Assegnamento"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Gennaio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Invia email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Data"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Entrate pianificate"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "Revisione partner"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Periodo fatturazione"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "ID Messaggio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Allegati"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Sequenza"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Settembre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nome grado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Apri"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Sottotipo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Data geo localizzazione"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Attuale"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Lead/Opportunità"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Partners notificati"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Inoltra a Partner"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Team di vendita"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Maggio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Entrate probabili"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -779,49 +779,49 @@ msgstr "Entrate probabili"
 msgid "Activation"
 msgstr "Attivazione"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Partner assegnato"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "Livello partner"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Opportunità"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Febbraio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Nome"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Attivazione partner"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -829,108 +829,108 @@ msgstr "Attivazione partner"
 msgid "Country"
 msgstr "Paese"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Anno"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Converti in Opportunità"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Geo assegnamento"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Ritardo apertura"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "Analisi partnership"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "CRM Report iniziative"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Data creazione"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Partner"
 
diff --git a/addons/crm_partner_assign/i18n/ja.po b/addons/crm_channel/i18n/ja.po
similarity index 75%
rename from addons/crm_partner_assign/i18n/ja.po
rename to addons/crm_channel/i18n/ja.po
index 3fb3fb15764..6f2ba678cca 100644
--- a/addons/crm_partner_assign/i18n/ja.po
+++ b/addons/crm_channel/i18n/ja.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "締めを延期する"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "売上予定"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "事例の数"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "グループ化…"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "転送"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "ジオロカライゼーション"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "本文"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "リード"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "締めを延期する"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "全ストーリー"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "会社"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "パートナ日付"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "最高"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "日"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "メッセージ識別番号"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "前回のEメール"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "ジオ緯度"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "キャンセルされました"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "ジオ割当て"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "締切り日"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr "リードをこのパートナに割当てる確率を指定します（0 は割当て無しを意味します）"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "平均確率"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "前へ"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "ネットワークエラー"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "差出人"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "パートナー等級"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "セクション"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "送信する"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "次へ"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "優先度"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "締切日を経過"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "タイプ"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "当件を転送 / 割当てたパートナ"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "最低"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "テンプレート"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "割当て日"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "リード分析"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "作成日"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "関連する文書ID"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "保留"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "パートナの割当て"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "リードと商談を区別するためにタイプを使います。"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "7月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "段階"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "転送"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "ジオロケーション"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "商談割当分析"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "キャンセル"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "履歴を送る"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "締める"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "3月"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "好機割当て分析"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "当件を締めるまでの日数"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "重量"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "4月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr "4月"
 msgid "Grade"
 msgstr "等級"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "12月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "開始日"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "件名"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "商談の数"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "チーム"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "予定"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "低い"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "終了"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "パートナに大量に転送"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "割当済商談"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "割当て日"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "最大確率"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "8月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "正常"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "エスカレート"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "6月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "案件を開くまでの日数"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "開始を延期する"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "ユーザ"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "仕掛り中"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "11月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "拡張フィルタ…"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "ジオ緯度"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "商談の数"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "リードの割当て"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "10月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "割当て"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "1月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Eメールを送信"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "日付"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "予定売上"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "メッセージID"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "添付"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "順序"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "9月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "等級名"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "当件がパートナに転送/割当てられて最後の日付"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "未割当て"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "ジオローカル化の日付"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "現在"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "パートナへ転送する"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "営業チーム"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "5月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "見込み売上"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr "見込み売上"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "割当てたパートナ"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "商談"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "顧客"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "2月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "氏名"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,108 +825,108 @@ msgstr ""
 msgid "Country"
 msgstr "国"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "年"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "商談に変換"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "ジオ割当て"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "開始を延期する"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "パートナ分析"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "割当てパートナの分析"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "CRMリード報告書"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "事象情報"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRMパートナ報告書"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "高"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "作成日"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "フィルタ"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "パートナ"
 
diff --git a/addons/crm_partner_assign/i18n/ko.po b/addons/crm_channel/i18n/ko.po
similarity index 73%
rename from addons/crm_partner_assign/i18n/ko.po
rename to addons/crm_channel/i18n/ko.po
index f5b394c4634..cb8970bc8a9 100644
--- a/addons/crm_partner_assign/i18n/ko.po
+++ b/addons/crm_channel/i18n/ko.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-30 05:27+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "마감까지의 지연"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "작성자"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "계획된 수익"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr "메시지 유형: 이메일 메시지를 위한 이메일, 시스템 메시지를 위한 알림, 사용자 댓글과 같은 기타 메시지에 대한 의견"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "사례 #"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "분류 기준..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "HTML 내용 중 불건전한 내용을 자동으로 제거함"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "전달"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "지리적 지역화"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "별표 추가됨"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "본문"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr "보내는 사람의 이메일 주소. 이 필드는 수신 메일에서 일치하는 협력업체를 찾을 수 없을 때 설정됩니다."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr "협력관계 합의일"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "리드"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "마감까지의 지연"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "전체 이야기"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "업체"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "알림"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "협력업체 날짜"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "영업사원"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "가장 높음"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "일"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "메시지 유일 식별자"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr "다음 협력업체 검토"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "최근 이메일"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "지리적 위도"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "취소됨"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "지리적 할당"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "이메일 작성 마법사"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "회전율"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "마감일"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr "이 협력업체에 리드를 할당할 확률을 제공함. (0은 할당 없음을 의미,)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr "협력업체 활성화"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "시스템 알림"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr "리드 전달"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "평균 확률"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "이전"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "네트워크 오류"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "보낸 사람"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "협력업체 등급"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "부서"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "보내기"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "다음"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "우선 순위"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "과거 기한"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "유형"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "이메일"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "이 사례가 전달/할당된 협력업체"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "가장 낮음"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "송장 발행일"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "서식"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "날짜 할당"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "리드 분석"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "생성일"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "res.partner.activation"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "상위 메시지"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "관련 문서 ID"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "보류 중"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "협력업체 할당"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "유형은 리드와 기회를 구분하기 위해 사용됩니다"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "7월"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr "검토 날짜"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "단계"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "상태"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "읽기 대상"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "전달"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "지리적 지역화"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "기회 할당 분석"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "취소"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "전송 기록"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "닫기"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "3월"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Opp. Assignment Analysis"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "사례를 마감하기까지의 잔여일수"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr "편지함에 이 메시지를 푸시하는 알림이 있는 협력업체"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "의견"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "가중"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "4월"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr "4월"
 msgid "Grade"
 msgstr "등급"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "12월"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "이 메시지에 투표한 사용자"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "월"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "개시일"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "하위 메시지"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "최근 협력업체 검토"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "제목"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "또는"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "내용"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "투표수"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "기회#"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr "현재 사용자에게 이 메시지와 연결된 별표 표시된 알림이 있습니다."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr "협력관계 협약일"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "팀"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "초안"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "낮음"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "마감됨"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "협력업체에게 대량 전달"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "할당된 기회"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "할당일"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "최대 확률"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "8월"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "보통"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "승급"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "6월"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "사례 개시까지의 소요일수"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "개시까지의 지연"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "사용자"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "활성"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "11월"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "확장 필터..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "지리적 경도"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "기회 #"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "리드 할당"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "10월"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "할당"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "1월"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "메일 보내기"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "날짜"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "계획된 수익"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "협력업체 검토"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "송장 발행 주기"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Message-Id"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "첨부 파일"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "메시지 기록명"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "순서"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr "지리위치서버를 연결할 수 없음. 인터넷 연결이 존재하고 실행 중인지 확인하십시오 (%s)."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "9월"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "등급명"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "이 사례가 협력업체로 전달/할당된 최근 날짜"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "열기"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "하위형식"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "지리위치일"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "현재"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "리드/기회"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "통보한 협력업체"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "협력업체에 전달"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "영업팀"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "5월"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "예상 수익"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr "예상 수익"
 msgid "Activation"
 msgstr "활성화"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "할당된 협력업체"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "협력업체 수준"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr "현재 사용자에게 이 메시지와 연결된 읽지 않은 알림이 있습니다."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "기회"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "고객"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "2월"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "이름"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "협력업체 활성화"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,66 +825,66 @@ msgstr "협력업체 활성화"
 msgid "Country"
 msgstr "국가"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "연도"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "기회로 전환"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "지역적 할당"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "개시까지의 지연"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "협력관계 분석"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr "메시지 알림을 포함한 기술적 필드. notified_partner_id를 이용하여 통보된 협력업체에 접근하십시오."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "할당된 협력업체 분석"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "CRM 리드 보고서"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "작성 모드"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "관련된 문서 모델"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "사례 정보"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -892,41 +892,41 @@ msgid ""
 msgstr ""
 "메시지의 작성자. 설정되지 않았을 경우, email_from에 모든 협력업체와 일치하지 않은 이메일 주소를 포함할 수 있습니다."
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM 협력업체 보고서"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "높음"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "추가적인 연락처"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "초기 스레드 메시지"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "생성일"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "필터"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "협력업체"
diff --git a/addons/crm_partner_assign/i18n/lt.po b/addons/crm_channel/i18n/lt.po
similarity index 69%
rename from addons/crm_partner_assign/i18n/lt.po
rename to addons/crm_channel/i18n/lt.po
index ffeb7e9a9a6..83c41b07562 100644
--- a/addons/crm_partner_assign/i18n/lt.po
+++ b/addons/crm_channel/i18n/lt.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr ""
 msgid "Grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr ""
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,107 +825,107 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr ""
diff --git a/addons/crm_partner_assign/i18n/lv.po b/addons/crm_channel/i18n/lv.po
similarity index 73%
rename from addons/crm_partner_assign/i18n/lv.po
rename to addons/crm_channel/i18n/lv.po
index 48f66608aa9..77176fd057e 100644
--- a/addons/crm_partner_assign/i18n/lv.po
+++ b/addons/crm_channel/i18n/lv.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Aizkave līdz slēgšanai"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Plānotie ieņēmumi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "Lietu skaits"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Grupēt pēc..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Pārsūtīt"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Ģeo. lokalizācija"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Pavediens"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Aizkave pirms slēgšanas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Viss stāsts"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Uzņēmums"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Partnera datums"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Augstākā"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Diena"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Pēdējais e-pasts"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Ģeo. platums"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Atcelts"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Ģeo. noteikšana"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Slēgšanas datums"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Vidējā iespējamība"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Iepriekšējais"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Tīkla kļūda"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "No"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Partnera novērtējums"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Sadaļa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Nākamais"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioritāte"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Noilgušais termiņš"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tips"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Partneris, kuram šī lieta tika nodota/uzticēta."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Zemākā"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Pavedienu analīze"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Izveidošanas datums"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Neizlemts"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Partnera uzticēšana"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tips tiek lietots, lai atdalītu pavedienus no izdevībām"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Jūlijs"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Posms"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Pārs."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo. lokalizācoja"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Izdevību uzticēšanas analīze"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Atcelt"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Sūtīt vēsturi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Aizvērt"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Marts"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Izdevību uzticēšanas analīze"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Dienu skaits līdz lietas slēgšanai"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Svars"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Aprīlis"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr "Aprīlis"
 msgid "Grade"
 msgstr "Novērtējums"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Decembris"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mēnesis"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Atvēršanas datums"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Temats"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "Izdevību skaits"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Melnraksts"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Zema"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Slēgts"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Uzticētas izdevības"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Uzticēšanas datums"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Maks. iespējamība"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Augusts"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normāla"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Eskalēt"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Jūnijs"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Dienu skaits līdz lietas atvēršanai"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Aizkave līdz atvēršanai"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Lietotājs"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Aktīvs"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Novembris"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Paplašinātie filtri..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Geo. garums"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Oktobris"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Uzticēšana"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Janvāris"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Plānotie ieņēmumi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Secība"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Septembris"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Novērtējuma nosaukums"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "Pēdējais datums, kad šī lieta tika pārsūtīta/uzticēta partnerim"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Atvērts"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Ģeo. lokalizācijas datums"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Pašreizējs"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Pārsūtīt partnerim"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Pārdošanas komanda"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Maijs"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Iespējamie ieņēmumi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr "Iespējamie ieņēmumi"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Partneris, kam uzticēts"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Izdevība"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Klients"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Februāris"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,108 +825,108 @@ msgstr ""
 msgid "Country"
 msgstr "Valsts"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Gads"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Pārveidot par izdevību"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Ģeo. uzt."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Aizkave līdz atvēršanai"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "CRM pavedienu atskaite"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Lietas informācija"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Augsta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Izveidošanas datums"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Partneris"
 
diff --git a/addons/crm_partner_assign/i18n/mk.po b/addons/crm_channel/i18n/mk.po
similarity index 74%
rename from addons/crm_partner_assign/i18n/mk.po
rename to addons/crm_channel/i18n/mk.po
index cb1d49c8580..4c72d48d3f2 100644
--- a/addons/crm_partner_assign/i18n/mk.po
+++ b/addons/crm_channel/i18n/mk.po
@@ -17,22 +17,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Одолжување до затварање"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Автор"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Планиран приход"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
@@ -41,43 +41,43 @@ msgstr ""
 "Тип на порака: e-mail за e-mail порака, известување за системски пораки, "
 "коментар за други пораки како кориснички одговори"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# од случаи"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Групирај по..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Автоматски санирани HTML содржини"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Напред"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Набљудувани"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Тело"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -86,337 +86,337 @@ msgstr ""
 "E-mail адреса на испраќачот. Ова поле се поставува кога нема партнер што се "
 "совпаѓа за дојдовните e-mail пораки."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Водечко"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Одолжување до затварање"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Цела сторија"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Компанија"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Известувања"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Продавач"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Највисоко"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Ден"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Единствен идентификатор на порака"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Откажано"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Волшебник за креирање на Е-пошта"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Промет"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Системско известување"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Претходно"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Грешка во мрежата"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Од"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Секција"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Испрати"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Следно"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Приоритет"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Пречекорен краен рок"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tип"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "Е-пошта"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Партнер кому овој предмет му е препратен/доделен."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Најниско"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Урнек"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Датум на креирање"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Изворна порака"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID на поврзан документ"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Чекам"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Типот се користи за да се разделат Траги и Можности"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Јули"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Етапа"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Статус"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "За читање"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Откажи"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Затвори"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Март"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Број на денови за затварање на случај"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
@@ -424,22 +424,22 @@ msgstr ""
 "Партнери што имаат известувања што ја проследуваат пораката до нивните "
 "сандачиња"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Коментар"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Тежина"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Април"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -447,332 +447,332 @@ msgstr "Април"
 msgid "Grade"
 msgstr "Степен"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Декември"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Корисници што гласале за оваа порака"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Месец"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Датум на отварање"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Порака (дете)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Тема"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "или"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Содржина"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Гласови"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#Можности"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr "Моменталниот корисник има известување поврзано со оваа порака"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Тим"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Нацрт"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Ниско"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Затворено"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Назначени можности"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Датум на назначување"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Максимална веројатност"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Август"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Нормално"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Јуни"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Одолжување до отварање"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Корисник"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Активно"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Ноември"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Проширени филтри..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Октомври"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Јануари"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Испрати маил"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Датум"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Планирани приходи"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Идентификатор на порака"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Прилози"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Име на записот на пораката"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Секвенца"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Септември"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "Последниот датум овој предмет беше препратен/доделен на партнер"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Отвори"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Подтип"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Тековно"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Известени партнери"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Препрати до партнер"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Продажен тим"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Мај"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Веројатен приход"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -781,49 +781,49 @@ msgstr "Веројатен приход"
 msgid "Activation"
 msgstr "Активација"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Назначен партнер"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr "Овој корисник има непрочитано известување поврзано со оваа порака"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Можност"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Купувач"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Февруари"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Име"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -831,34 +831,34 @@ msgstr ""
 msgid "Country"
 msgstr "Земја"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Година"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Претвори во можност"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Одложување до отварање"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "Анализа на партнерство"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
@@ -867,32 +867,32 @@ msgstr ""
 "Техничко поле што ги содржи пораките за известувања. Користете "
 "notified_partner_ids за пристап до известените партнери."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Режим на составување"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "Поврзан модел на документ"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Информација за случај"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -901,41 +901,41 @@ msgstr ""
 "Автор на пораката. Доколку не е подесено, email_from може да содржи e-mail "
 "адреса што не се совпаѓа со никој партнер."
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Висок"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Додатни контакти"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "Почетна тема на пораката"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Креирај датум"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Филтри"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Партнер"
diff --git a/addons/crm_partner_assign/i18n/mn.po b/addons/crm_channel/i18n/mn.po
similarity index 72%
rename from addons/crm_partner_assign/i18n/mn.po
rename to addons/crm_channel/i18n/mn.po
index a42c612f6e1..9fa10322664 100644
--- a/addons/crm_partner_assign/i18n/mn.po
+++ b/addons/crm_channel/i18n/mn.po
@@ -17,22 +17,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Хаахыг Азнах"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Зохиогч"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Төлөвлөсөн орлого"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
@@ -41,43 +41,43 @@ msgstr ""
 "Зурвасын төрөл: имэйл зурваст зориулсан имэйл, системийн зурвасын мэдэгдэл, "
 "бусад зурвас дахь сэтгэгдэл буюу хариулт гэх мэт"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Бүлэглэх..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Автомат янзлагдсан HTML агуулга"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Урагш"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Одоор тэмдэглэсэн"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -86,358 +86,358 @@ msgstr ""
 "Илгээгчийн имэйл хаяг. Ирсэн имэйлд тохирох харилцагч олдоогүй тохиолдолд "
 "энэ талбар нь тохируулагдана."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Хаахыг азнах"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Компани"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Мэдэгдлүүд"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Хамтрагч огноо"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Худалдагч"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Хамгийн Өндөр"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Өдөр"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Хамгийн сүүлийн Имэйл"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Цуцлагдсан"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Имэйл үүсгэх харилцах цонх"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Хаах огноо"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Системийн мэдэгдэл"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Өмнөх"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Сүлжээний алдаа"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Хамтрагч түвшин"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Хэсэг"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Илгээх"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Дараагийх"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Чухалчлал"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Хугацаа хэтэрсэн тов"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Төрөл"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "Имэйл"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Хамгийн Бага"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Үлгэр"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Үүсгэсэн огноо"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "res.partner.activation"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Эцэг зурвас"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "Холбогдох Баримтын ID"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Хүлээгдэж буй"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Сэжим болон Борлуулалтыг тусгаарлахад хэрэглэхэд төрөл"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "7-р сар"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Шат"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Төлөв"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Цуцлах"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Түүх илгээх"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Хаах"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "3-р сар"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Сэтгэгдэл"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Жин"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "4-р сар"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -445,332 +445,332 @@ msgstr "4-р сар"
 msgid "Grade"
 msgstr "Түвшин"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "12-р сар"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Энэ зурвасд санал өгсөн хэрэглэгчид"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Сар"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Нээх огноо"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Дэд зурвасууд"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Гарчиг"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "эсвэл"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Агуулга"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Саналууд"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#Боломжууд"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Баг"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Ноорог"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Хаагдсан"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "8-р сар"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Энгийн"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Томруулах"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "6-р сар"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Хэрэгийг нээх өдрийн тоо"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Нээхийг Азнах"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Хэрэглэгч"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Идэвхтэй"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "11-р сар"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Өргөтгөсөн Шүүлтүүр..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "10-р сар"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "1-р сар"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Имэйл илгээх"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Огноо"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Төлөвлөсөн орлого"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Хавсралт"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Зурвасын Бичлэгийн Нэр"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Дараалал"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "9-р сар"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Дэд төрөл"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Идэвхтэй"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Сэжим/Боломж"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Мэдэгдэл хүрсэн харилцагчид"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Борлуулалтын баг"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "5-р сар"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Магадлалт орлого"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -779,49 +779,49 @@ msgstr "Магадлалт орлого"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Боломж"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Үйлчлүүлэгч"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "2-р сар"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Нэр"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Хамтрагч идэвхжүүлэлт"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -829,34 +829,34 @@ msgstr "Хамтрагч идэвхжүүлэлт"
 msgid "Country"
 msgstr "Улс"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Жил"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Боломж руу хөрвүүлэх"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Нээхээ азнах"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
@@ -865,73 +865,73 @@ msgstr ""
 "Зурвас мэдэгдлийг хадгалах талбарын техник нэр. notified_partner_ids-г "
 "мэдэгдэл очсон харилцагчид руу хандахдаа хэрэглэ."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "CRM Судалгааны Тайлан"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "Холбогдох Баримтын Модель"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Өндөр"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Нэмэлт холбогчид"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "Мөчирийн эхлэлийн зурвас."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Үүсгэх огноо"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Шүүлтүүд"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Харилцагч"
diff --git a/addons/crm_partner_assign/i18n/nb.po b/addons/crm_channel/i18n/nb.po
similarity index 72%
rename from addons/crm_partner_assign/i18n/nb.po
rename to addons/crm_channel/i18n/nb.po
index c47ef3d732c..ce9a6a1cdce 100644
--- a/addons/crm_partner_assign/i18n/nb.po
+++ b/addons/crm_channel/i18n/nb.po
@@ -17,65 +17,65 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Forsinkelse til lukking."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Forfatter."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Planlagt omsetning."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# av Saker."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Grupper etter ..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Fremover."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo lokalisert."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Kropp."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -84,359 +84,359 @@ msgstr ""
 "E-postadressen til avsenderen. Dette feltet er satt når ingen samsvarende "
 "partner er funnet for innkommende e-post."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr "Dato Partnerskap."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Fører."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Forsinket til lukking."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Hele historien."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Firma."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Varsling."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Partner dato."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Salgsman."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Høyest."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Dag."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Unik melding identifikator."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr "Neste partner anmeldelse."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Siste e-posten."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Kansellert."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Epost komposisjon veiviseren."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Omsetning."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Lukkingsdato."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr "Partner Aktivisering."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "System varsling."
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr "Fører framover."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Forrige."
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Nettverks feil."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Fra."
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Partner grad."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Seksjon."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Send."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Neste."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioritet."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Passert frist."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Type."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "E-post."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Partner, denne saken har blitt videresendt / tildelt."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Laveste."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Faktura dato."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Mal."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Tildel dato."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Fører analyse."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Opprettelses dato."
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "Res.partner.aktivering."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Partner melding."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "Relatert dokument ID."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Venter."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Typen brukes til å skille fører og muligheter."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Juli."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr "Anmeldelse dato."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Fase."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Status."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "Å lese."
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Fwd."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo lokalisering."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Tilordnet muligheter analyse."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Avbryt."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Send historie."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Lukk."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Mars."
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Antall dager til sak lukkes."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 "Partnere som har et varsel om skyve denne meldingen i sine postkasser."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Kommentar."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Vekt."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "April."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -444,332 +444,332 @@ msgstr "April."
 msgid "Grade"
 msgstr "Nivå."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Desember."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Brukere som stemte på denne beskjeden."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Måned."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Åpningsdato."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Barne meldinger."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "Siste partner anmeldelse."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Emne."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "Eller."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Innhold."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Stemmer."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#Muligheter."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr "Partnerskap dato."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Lag."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Kladd."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Lav."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Lukket."
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Massen frem til partner."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Tilordnede muligheter."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Maksimalt sannsynlighet."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "August."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr "Navngi få av relaterte dokument."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Juni."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Antall dager til åpningen av saken."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Forsinkelse før åpning."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Bruker."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Aktiv."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "November."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Utvidet Filtere ..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "#Av muligheter."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Oktober."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Januar."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Send e-post."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Dato."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Planlagt omsetning"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "Partner anmeldelse."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Faktura periode."
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "Res.partner.nivå."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Melding - ID."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Vedlegg."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Melding rekord navn."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Sekvens."
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "September."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nivå navn."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Åpen."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Nåværende."
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Fører/Mulighet."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Fram til partner."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Salgslag."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Mai."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -778,49 +778,49 @@ msgstr ""
 msgid "Activation"
 msgstr "Aktivering."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Tilordnet partner."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "Partner nivå."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Muligheter."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Kunde."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Februar."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Navn."
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Partner aktiveringer."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -828,66 +828,66 @@ msgstr "Partner aktiveringer."
 msgid "Country"
 msgstr "Land."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "År."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Konverter til mulighet."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Forsinket til åpning."
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "Partnerskap analyse."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Partner tilordnet analyse."
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "CRM fører rapport."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "Relatert dokument modell."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Sakinformasjon."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -896,41 +896,41 @@ msgstr ""
 "Forfatter av meldingen. Hvis det ikke er angitt, kan email_fra Mai holde en "
 "e-postadresse som ikke samsvarer med noen partner."
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM partner rapport."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Høy."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Flere kontakter."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Opprettet dato."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filtere."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Partner."
diff --git a/addons/crm_partner_assign/i18n/nl.po b/addons/crm_channel/i18n/nl.po
similarity index 77%
rename from addons/crm_partner_assign/i18n/nl.po
rename to addons/crm_channel/i18n/nl.po
index d72aa0d55ab..c841ed4c345 100644
--- a/addons/crm_partner_assign/i18n/nl.po
+++ b/addons/crm_channel/i18n/nl.po
@@ -17,22 +17,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Vertraging tot sluiten"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Auteur"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Geplande omzet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
@@ -41,43 +41,43 @@ msgstr ""
 "Berichttype: e-mail voor e-mailbericht, notificatie voor systeembericht, "
 "commentaar voor andere berichten zoals gebruiker beantwoord"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# Dossiers"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Groepeer op..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Automatisch opgeschoonde HTML-inhoud"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Doorsturen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo lokaliseren"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Met ster"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Inhoud"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -86,107 +86,107 @@ msgstr ""
 "E-mail adres van zender. Dit veld wordt ingesteld wanneer geen relatie wordt "
 "gevonden voor binnenkomende e-mails."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr "Datum partnerovereenkomst"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Lead"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Vertraging tot sluiting"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Hele verhaal"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Bedrijf"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Meldingen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Relatie datum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Verkoper"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Hoogste"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Dag"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Bericht unieke identifier"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr "Volgende relatie beoordeling"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Laatste email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo breedtegraad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geo toekenning"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "E-mail samenstellen wizard"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Omzet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Sluitdatum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -195,230 +195,230 @@ msgstr ""
 "Geeft de waarschijnlijkheid om de lead aan deze relatie toe te kennen (0 "
 "betekent geen toekenning)."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr "Relatie activatie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Systeem melding"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr "Lead doorsturen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Gem Waarschijnlijkheid"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Vorige"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Netwerkprobleem"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Van"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Relatie klasse"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Afdeling"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Verzend"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Volgende"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioriteit"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Overschreden einddatum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Soort"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "E-mail"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Relatie waaraan dit dossier is toegewezen."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Laagste"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Factuur datum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Sjabloon"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Wijs datum toe"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Leads analyse"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Datum gemaakt"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "res.partner.activation"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Bovenliggend bericht"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "Gerelateerde document ID"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "In afwachting"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Relatie toekenning"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Soort wordt gebruikt om leads en prospects te scheiden"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Juli"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr "Datum review"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Stadium"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Status"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "Te lezen"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Doorsturen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo lokalisatie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Prospect toekenning analyse"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Annuleren"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Verstuur geschiedenis"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Sluiten"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Maart"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Prospect toekenning analyse"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Aantal dagen om dossier af te sluiten"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
@@ -426,22 +426,22 @@ msgstr ""
 "Relaties die een notificatie hebben, die dit bericht doorgestuurd hebben "
 "naar hun e-mailbox"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Opmerking"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Gewicht"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "April"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -449,258 +449,258 @@ msgstr "April"
 msgid "Grade"
 msgstr "Klasse"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "December"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Gebruikers die op dit bericht hebben gestemd."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Maand"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Openingsdatum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Onderliggende berichten"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "Laatste partner review"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Onderwerp"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "of"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Inhoud"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Stemmen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#Prospects"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 "De huidige gebruiker heeft een ster notificatie gekoppeld aan dit bericht."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr "Datum partnerovereenkomst"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Team"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Concept"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Laag"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Gesloten"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Als bulk doorsturen naar relatie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Toegewezen prospects"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Datum toewijzing"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Max waarschijnlijkheid"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Augustus"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr "Verkrijg naam van het gerelateerde document"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normaal"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escaleren"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Juni"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Aantal dagen tot openen dossier"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Vertraging tot openen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Gebruiker"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Actief"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "November"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Uitgebreide filters..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Geo lengtegraad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# of prospect"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Lead toewijzen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Oktober"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Toewijzing"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Januari"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Verstuur bericht"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Datum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Geplande omzet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "Partner review"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Factuur periode"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Bericht-Id"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Bijlagen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Bericht veldnaam"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Volgnummer"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
@@ -709,76 +709,76 @@ msgstr ""
 "Kan geen contact maken met geolocatie servers. Controleer a.u.b. of uw "
 "internet verbinding werkt (%s)."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "September"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Klassenaam"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 "Laatste datum dat dit dossier was doorgestuurd/toegewezen aan een relatie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Openen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Subtype"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Geo lokalisatie datum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Actueel"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Lead/Prospect"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Op de hoogte gebrachte relaties"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Doorsturen aan relatie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Verkoopteam"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Mei"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Verwachte omzet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -787,51 +787,51 @@ msgstr "Verwachte omzet"
 msgid "Activation"
 msgstr "Activatie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Toegewezen relatie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "Relatie nivo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 "De huidige gebruiker heeft een ongelezen notificatie gekoppeld aan dit "
 "bericht."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Prospect"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Klant"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Februari"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Naam"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Partner activaties"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -839,34 +839,34 @@ msgstr "Partner activaties"
 msgid "Country"
 msgstr "Land"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Jaar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Converteren naar prospect"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Geo toewijzing"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Vertraging tot openen"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "Relatieanalyses"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
@@ -875,32 +875,32 @@ msgstr ""
 "Technisch veld bevat de berichtnotificaties. Gebruik notified_partner_ids "
 "voor toegang tot geïnformeerde partners."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Relatie toewijzinganalyses"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "CRM Lead overzicht"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Bewerkmodus"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "Gerelateerde document model"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Dossier informatie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -909,42 +909,42 @@ msgstr ""
 "Schrijver van het bericht. Als deze niet ingesteld is, kan email_from een e-"
 "mailadres bevatten wat niet overeenkomt met een relatie."
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM relatierapport"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Hoog"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Extra contactpersonen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "Initiële bericht thread"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Datum gemaakt"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filters"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Relatie"
 
diff --git a/addons/crm_partner_assign/i18n/pl.po b/addons/crm_channel/i18n/pl.po
similarity index 73%
rename from addons/crm_partner_assign/i18n/pl.po
rename to addons/crm_channel/i18n/pl.po
index 6a260ee1738..d5fd5bbb455 100644
--- a/addons/crm_partner_assign/i18n/pl.po
+++ b/addons/crm_channel/i18n/pl.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Opóźnienie do zamknięcia"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Autor"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Planowany dochód"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# spraw"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Grupuj wg..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Przekaż"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Lokalizacja geograficzna"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Treść"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Sygnał"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Opóźnienie do zamknięcia"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Cała historia"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Firma"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Powiadomienia"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Data partnera"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Sprzedawca"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Najwyższy"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Dzień"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Unikalny identyfikator wiadomości"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Ostatnia wiadomość"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Szerokość geograficzna"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Anulowano"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Położenie geograficzne"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Kreator email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Obrót"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Data zamknięcia"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Poprzedni"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Błąd sieciowy"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Od"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Sekcja"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Wyślij"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Następny"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Priorytet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Przekroczony termin"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Typ"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Najniższy"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Data faktury"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Szablon"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Przypisz datę"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Analiza sygnałów"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Data utworzenia"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Wiadomość nadrzędna"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID dokumentu związanego"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Oczekiwanie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Typ jest stosowany do rozróżnienia sygnałów od szans"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Lipiec"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Etap"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Stan"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "Do przeczytania"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Przek."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Lokalizacja geograficzna"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Analiza przypisań szans"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Anuluj"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Wyślij historię"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Zamknij"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Marzec"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Liczba dni do zamknięcia sprawy"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Komentarz"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Waga"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Kwiecień"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr "Kwiecień"
 msgid "Grade"
 msgstr "Ocena"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Grudzień"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Użytkownicy głosujący za tą wiadomością"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Miesiąc"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Data otwarcia"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Wiadomości podrzędne"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Temat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Zawartość"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Głosy"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#Szans"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Zespół"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Projekt"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Niski"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Zamknięte"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Data przypisania"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Maks. prawdop."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Sierpień"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normalny"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Przekaż"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Czerwiec"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Liczba dni do otwarcia sprawy"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Opóźnienie do otwarcia"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Użytkownik"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Aktywne"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Listopad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Rozszerzone filtry..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Długość geograficzna"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# Szans"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Przypisz sygnał"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Październik"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Przypisanie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Styczeń"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Wyślij wiadomość"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Data"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Planowany dochód"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "Przegląd partnera"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Okres faktury"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Załączniki"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Nazwa rekordu wiadomości"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Numeracja"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Wrzesień"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nazwa poziomu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "Ostatnia data przekazania/przypisania sprawy do partnera"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Otwórz"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Podtyp"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Data lokalizacji geograficznej"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Bieżące"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Sygnały/Szanse"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Powiadomieni partnerzy"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Przekaż partnerowi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Zespół sprzedaży"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Maj"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Prawdopodobny dochód"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr "Prawdopodobny dochód"
 msgid "Activation"
 msgstr "Aktywacja"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Przypisany partner"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "Poziom partnera"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Szansa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Klient"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Luty"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Nazwa"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Aktywacja partnera"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,108 +825,108 @@ msgstr "Aktywacja partnera"
 msgid "Country"
 msgstr "Kraj"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Rok"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Konwertuj do szansy"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Opóźnienie do otwarcia"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "Analiza partnerstwa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Analiza przypisanego partnera"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Raport sygnałów CRM"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Tryb pisania"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "Model dokumentu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Informacja o sprawie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "Raport partnera CRM"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Wysoki"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Dodatkowe kontakty"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "Wiadomość inicjująca wątek"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Data utworzenia"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filtry"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/pt.po b/addons/crm_channel/i18n/pt.po
similarity index 76%
rename from addons/crm_partner_assign/i18n/pt.po
rename to addons/crm_channel/i18n/pt.po
index a319c146039..e88fd7e456a 100644
--- a/addons/crm_partner_assign/i18n/pt.po
+++ b/addons/crm_channel/i18n/pt.po
@@ -17,172 +17,172 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Demora para fechar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Receita planeada"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "Número de casos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Avançar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Localizar Geograficamente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Corpo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Lead"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Atraso para encerrar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Toda a história"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Notificações"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Data do parceiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Vendedor"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Maior"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Dia"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Identificador de mensagem exclusivo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Último email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Latitude Geográfica"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Localização Geográfica"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Assistente de criação de mensagem eletrónica"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Data de fecho"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -191,251 +191,251 @@ msgstr ""
 "Dá a possibilidade de associar a oportunidade a este parceiro. (0 significa "
 "que não se associou.)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Notificação do sistema"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilidade média"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Anterior"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Erro de rede"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "De"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Nível do parceiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Secção"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Enviar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Próximo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioridade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Prazo ultrapassado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tipo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "E-mail"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Parceiro deste caso foi encaminhado / atribuído."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Menor"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Template"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Atribuir Data"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Análise de lead"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Data de criação"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "res.partner.activation"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID Documentos Relacionados"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Pendente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Atribuição parceiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tipo é usado para separar leads e oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Julho"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Fase"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Estado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Redirecionar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Localização Geográfica"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Oportunidades de Análise de Atribuição"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Enviar histórico"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Fechar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Março"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Análise do Encaminhamento de Oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Número de dias para fechar o caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Peso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Abril"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -443,332 +443,332 @@ msgstr "Abril"
 msgid "Grade"
 msgstr "Grau"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Dezembro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Utilizadores que votaram nesta mensagem"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mês"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Data de abertura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Assunto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Votos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#Oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Equipa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Rascunho"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Baixo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Encerrado"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Envio em massa para um parceiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Oportunidades atribuídas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Data de atribuição"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilidade máxima"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Agosto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escalate"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Junho"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Número de dias para abrir o caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Demora para abrir"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Utilizador"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Ativo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Novembro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtros avançados"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Longitude Geográfica"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# da Oportunidade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Lead atríbuir"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Outubro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Atribuição"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Janeiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Enviar e-mail"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Data"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Rendimentos planeados"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Id mensagem"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Anexos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Sequência"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Setembro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nome grau"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "Última data neste caso foi encaminhada / atribuída a um parceiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Abrir"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Data da Localização Geográfica"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Atual"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Reencaminhar para o parceiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Equipa de vendas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Maio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Retorno provável"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -777,49 +777,49 @@ msgstr "Retorno provável"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Parceiro Atribuído"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Oportunidade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Fevereiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Nome"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -827,108 +827,108 @@ msgstr ""
 msgid "Country"
 msgstr "País"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Ano"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Converter em oportunidade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Localização Geográfica"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Tempo para abrir"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "Análise de Parceria"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Parceiro atribuído Análise"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Relatório de Dicas de CRM"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Modo de composição"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Informações sobre o caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "Relatório Parceiro CRM"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Alto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Contactos adicionais"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Data de criação"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filtros"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Parceiro"
 
diff --git a/addons/crm_partner_assign/i18n/pt_BR.po b/addons/crm_channel/i18n/pt_BR.po
similarity index 78%
rename from addons/crm_partner_assign/i18n/pt_BR.po
rename to addons/crm_channel/i18n/pt_BR.po
index aba69c91977..e2e09e2d636 100644
--- a/addons/crm_partner_assign/i18n/pt_BR.po
+++ b/addons/crm_channel/i18n/pt_BR.po
@@ -18,22 +18,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Adiar Fechamento"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Autor"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Receita Planejada"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
@@ -43,43 +43,43 @@ msgstr ""
 "mensagens do sistema e comentário para outros tipos como respostas de "
 "usuário."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "Nº de Casos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Agrupar Por..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Conteúdos HTML limpos automaticamente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Encaminhar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Localização Geográfica"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Favoritos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Conteúdo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -88,107 +88,107 @@ msgstr ""
 "Endereço de email do remetente. Este campo é preenchido quando não é "
 "encontrado um parceiro cadastrado para o email recebido."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr "Data da parceria"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Prospecto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Adiar o fechamento"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Histórico Completo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Empresa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Notificações"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Data do Parceiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Vendedor"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Mais Alta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Dia"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Identificador da mensagem"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr "Próxima Revisão de Parceiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Último email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Latitude Geográfica"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Atribuição Geográfica"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Assistente de composição de Email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Volume de Negócios"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Data de Fechamento"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -197,252 +197,252 @@ msgstr ""
 "Fornece a probabilidade para se atribuir o prospecto para este parceiro. (0 "
 "significa sem atribuição.)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr "Ativação do Parceiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Notificação do sistema"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr "Encaminhamento de prospecto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilidade Média"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Anterior"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Erro na rede"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "De"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Grade do Parceiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Seção"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Enviar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Próximo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioridade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Prazo Ultrapassado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tipo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "E-mail"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Parceiro para que este caso foi enviado/atribuído"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Mínima"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Data da Fatura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Modelo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Data Associada"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Analisar Prospecções"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Data de Criação"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "res.partner.activation"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Mensagem Principal"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID do Documento Relacionado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Pendente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Atribuição do Parceiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tipo é utilizado para separar Prospectos e Oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Julho"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr "Data de Revisão"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Estágio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Situação"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "Não lidas"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Enc"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Localização Geográfica"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Análise de Atribuição de Oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Enviar Histórico"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Fechar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Março"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Análise de Atribuição de Oport."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Número de Dias para concluir o Caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 "Parceiros que tiveram uma notificação enviada para sua caixa de entrada."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Comentário"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Peso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Abril"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -450,257 +450,257 @@ msgstr "Abril"
 msgid "Grade"
 msgstr "Nota (graduação)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Dezembro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Usuários que votaram para esta mensagem"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mês"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Data de Abertura"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Mensagens Relacionadas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "Última revisão do parceiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Assunto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "ou"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Conteúdos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Votos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "Nº de Oportunidades"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr "Usuário atual marcou uma notificação ligada a esta mensagem"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr "Data de Parceria"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Equipe"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Provisório"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Baixo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Fechado"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Encaminhar em massa para o parceiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Oportunidades Atribuidas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Data da Atribuição"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilidade Máxima"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Agosto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr "Nome obtido do documento relacionado."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escalar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Junho"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Número de Dias para abrir o caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Espera para Abrir"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Usuário"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Ativo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Novembro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtros Extendidos..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Longitude Geográfica"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# da Oportunidade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Atribuir Prospecto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Outubro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Atribuição"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Janeiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Enviar Email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Data"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Receitas Programadas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "Revisão do Parceiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Período de Fatura"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Cód da Mensagem"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Anexos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Nome do Registro da Mensagem"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Sequência"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
@@ -709,75 +709,75 @@ msgstr ""
 "Não foi possível conectar a um servidor de geolocalização. Por favor, "
 "certifique-se que sua internet está funcionando (%s)."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Setembro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nome da Grade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "Última data que este caso foi enviado/atribuído a um parceiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Aberto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Sub-tipo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Data da Loc. Geográfica"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Atual"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Prospecção/Oportunidade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Parceiros Notificados"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Encaminhar para o Parceiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Equipe de Vendas"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Maio"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Receita Provável"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -786,49 +786,49 @@ msgstr "Receita Provável"
 msgid "Activation"
 msgstr "Ativação"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Parceiro Atribuído"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "Categoria do Parceiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr "Usuário atual tem uma notificação não lida ligada a esta mensagem"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Oportunidade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Fevereiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Nome"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Ativação do Parceiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -836,34 +836,34 @@ msgstr "Ativação do Parceiro"
 msgid "Country"
 msgstr "País"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Ano"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Converter para Oportunidade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Atribuição Geográfica"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Espera para abrir"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "Análise de Parceria"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
@@ -872,32 +872,32 @@ msgstr ""
 "Campo técnico que armazena as notificações de mensagem. Utilize "
 "notified_partner_ids para acessar os parceiros notificados."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Análise do Parceiro"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Relatório de Prospecto CRM"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Modo de composição"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "Modelo de Documento Relacionado"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Informação do Caso"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -906,42 +906,42 @@ msgstr ""
 "Autor da mensagem. Se não definido, o campo email_from pode conter um "
 "endereço de e-mail que não corresponde a nenhum parceiro."
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM Relatório de Parceiro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Alta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Contatos adicionais"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "Mensagem inicial do tópico."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Data de Criação"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filtros"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Parceiro"
 
diff --git a/addons/crm_partner_assign/i18n/ro.po b/addons/crm_channel/i18n/ro.po
similarity index 78%
rename from addons/crm_partner_assign/i18n/ro.po
rename to addons/crm_channel/i18n/ro.po
index d53a0e2282c..dca991fc7f1 100644
--- a/addons/crm_partner_assign/i18n/ro.po
+++ b/addons/crm_channel/i18n/ro.po
@@ -17,22 +17,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Intarziere la inchidere"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Autor"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Venitul planificat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
@@ -41,43 +41,43 @@ msgstr ""
 "Tipul de mesaj: email pentru mesaj email, notificare pentru mesajul sistem, "
 "comentariu pentru alte mesaje, cum ar fi raspunsurile utilizatorului"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# de Cazuri"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Grupeaza dupa..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Continuturi HTML cenzurate automat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Redirectionare"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Localizare Geo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Marcat cu asterisc"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Continut"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -86,107 +86,107 @@ msgstr ""
 "Adresa de email a expeditorului. Acest camp este setat atunci cand nu este "
 "gasit nici un partener care sa se potriveasca email-urilor primite."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr "Data Parteneriatului"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Pista"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Intarziere la inchidere"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Intreaga poveste"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Companie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Notificari"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Data partener"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Agent de vanzari"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Cel mai ridicat (cea mai ridicata)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Zi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Identificator unic mesaj"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr "Urmatoarea Verificare a Partenerului"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Ultimul email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Latitudine Geo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Anulat(a)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Alocare Geo"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Wizardul de compunere email-uri"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Cifra de afaceri"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Data inchiderii"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -195,251 +195,251 @@ msgstr ""
 "Da probabilitatea alocarii unei piste acestui partener. (0 inseamna nici o "
 "alocare.)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr "Activare Partener"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Notificare sistem"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr "Redirectioneaza"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilitatea medie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Precedent(a)"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Eroare de retea"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "De la"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Grad partener"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Sectiune"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Trimite"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Urmatorul (urmatoarea)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioritate"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Termen limita depasit"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tip"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "Email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Partenerul caruia i-a fost redirectionat/atribuit cazul."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Cel mai scazut (cea mai scazuta)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Data Facturii"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Sablon"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Data atribuirii"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Analiza pistelor"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Data crearii"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "res.activare.partener"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Mesaj Principal"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID Document Asociat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "In asteptare"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Atribuire partener"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tip folosit pentru a separa Clientii potentiali si Oportunitatile"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Iulie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr "Verificarea Datei"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Etapa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Stare"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "De citit"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Fwd (redirectionare)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Localizare geo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Analiza Atribuirii Oportunitatilor"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Anuleaza"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Trimite istoric"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Inchideti"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Martie"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Analiza Alocarii Oportunitatilor"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Numarul de zile pana la inchiderea cazului"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr "Partenerii care au o notificare ce a dus la primirea acestui mesaj"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Comentariu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Greutate"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Aprilie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -447,259 +447,259 @@ msgstr "Aprilie"
 msgid "Grade"
 msgstr "Grad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Decembrie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Utilizatorii care au votat pentru acest mesaj"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Luna"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Data deschiderii"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Mesaje secundare"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "Verificarea cea mai Recenta a Partenerului"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Subiect"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "sau"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Cuprins"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Voturi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#Oportunitati"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 "Utilizatorul actual are o notificare marcata cu asterisc atasata acestui "
 "mesaj"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr "Data Parteneriatului"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Echipa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Ciorna"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Scazut(a)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Inchis(a)"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Redirectionare in masa catre partener"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Oportunitati alocate"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Data alocarii"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilitate maxima"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "August"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr "Obtine numele documentului asociat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Promoveaza"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Iunie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Numarul de zile pana la deschiderea cazului"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Intarziere la Deschidere"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Utilizator"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Activ(a)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Noiembrie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtre Extinse..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Geo Longitudine"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# Oportunitate"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Alocare pista"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Octombrie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Alocare"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Ianuarie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Trimite email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Data"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Veniturile planificate"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "Verificare Partener"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Perioada de facturare"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.grad.partener"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Id-Mesaj"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Atasamente"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Numele Inregistrarii Mesajului"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Secventa"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
@@ -708,76 +708,76 @@ msgstr ""
 "Serverele geolocalizare nu pot fi contactate. Va rugam sa va asigurati ca "
 "aveti conexiune la internet (%s)."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Septembrie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nume grad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 "Ultima data cand acest caz a fost redirectionat/atribuit unui partener"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Deschideti"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Subtip"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Data Geo Localizare"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Actual(a)"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Pista/Oportunitate"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Parteneri instiintati"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Redirectioneaza catre partener"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Echipa de vanzari"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Mai"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Venituri probabile"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -786,49 +786,49 @@ msgstr "Venituri probabile"
 msgid "Activation"
 msgstr "Activare"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Partener alocat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "Nivel Partener"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr "Utilizatorul actual are o notificare necitita atasata acestui mesaj"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Oportunitate"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Client"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Februarie"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Nume"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Activari Partener"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -836,34 +836,34 @@ msgstr "Activari Partener"
 msgid "Country"
 msgstr "Tara"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "An"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Transforma in Oportunitate"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Alocare Geo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Intarziere la deschidere"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "Analiza Parteneriatului"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
@@ -872,32 +872,32 @@ msgstr ""
 "Camp tehnic ce contine mesajele de notificare. Folositi notifice_partner_ids "
 "(id-uri_partener_instiintat) pentru a accesa partenerii instiintati."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Analiza Partener alocat"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Raport pista MRC"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Modul de compunere"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "Model Document Asociat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Informatii caz"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -906,42 +906,42 @@ msgstr ""
 "Autorul mesajului. Daca nu este selectat, email_from (expeditor_email) poate "
 "sa contina o adresa de email care nu s-a potrivit cu nici un partener."
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "Raport Partener MRC"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Ridicat(a)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Persoane de contact suplimentare"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "Continutul mesajului initial."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Data Crearii"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filtre"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Partener"
 
diff --git a/addons/crm_partner_assign/i18n/ru.po b/addons/crm_channel/i18n/ru.po
similarity index 80%
rename from addons/crm_partner_assign/i18n/ru.po
rename to addons/crm_channel/i18n/ru.po
index fa995c8e7a1..b6a94b97be2 100644
--- a/addons/crm_partner_assign/i18n/ru.po
+++ b/addons/crm_channel/i18n/ru.po
@@ -17,22 +17,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-06-07 05:48+0000\n"
 "X-Generator: Launchpad (build 16667)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Задержка закрытия"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Автор"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Планируемая выручка"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
@@ -42,43 +42,43 @@ msgstr ""
 "сообщений, комментарий - для остальных сообщений таких как сообщения "
 "пользователя"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "кол-во вопросов"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Группировать по ..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Автоматически обработанное HTML содержимое"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Вперед"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Геолоцировать"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Отмеченные"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Содержимое"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -87,107 +87,107 @@ msgstr ""
 "Адрес эл. почты отправителя. Это поле устанавливается когда партнер не "
 "определен для входящих писем."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Кандидат"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Задержка закрытия"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Вся история"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Компания"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Уведомления"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Дата партнера"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Продавец"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Высший"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "День"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Уникальный идентификатор сообщения"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Последнее эл. письмо"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Географическая широта"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Отменено"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Географическое назначение"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Мастер составления эл. почты"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Оборот"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Дата закрытия"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -196,251 +196,251 @@ msgstr ""
 "Дает вероятность назначения кандидата этому партнёру. 0 обозначает "
 "отсутствие назначения."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Системное уведомление"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Средн. вероятность"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Предыдущий"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Ошибка сети"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "От"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Статус партнёра"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Раздел"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Отправить"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Следующий"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Приоритет"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Просрочено"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Тип"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "Эл. почта"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Партнер которому был назначен этот вопрос."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Низший"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Дата счета"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Шаблон"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Дата назначения"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Анализ  кандидатов"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Дата создания"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "res.partner.activation"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Родительское сообщение"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID связанного документа"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "В ожидании"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Назначение партнера"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Тип используется для разделения кандидатов и предложений"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Июль"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Этап"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Статус"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "Прочитать"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Прд"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Геолокация"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Анализ назначений предложений"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Отмена"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Послать историю"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Закрыть"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Март"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Анализ назначений предложений"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Количество дней, для закрытия вопроса"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr "Партнеры которые имеют уведомление доставляемое в их почтовые ящики"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Комментарий"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Вес"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Апрель"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -448,259 +448,259 @@ msgstr "Апрель"
 msgid "Grade"
 msgstr "Класс"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Декабрь"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Пользователи, которые проголосовали за это сообщение"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Месяц"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Дата открытия"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Связанные сообщения"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Тема"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "или"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Содержимое"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Голоса"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "# Предложений"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 "Текущий пользователь имеет отмеченное уведомление, связанное с этим "
 "сообщением"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Команда"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Черновик"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Низкий"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Закрыто"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Массовая отправка партнёру"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Назначенные предложения"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Дата назначения"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Макс. вероятность"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Август"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr "Название связанного документа."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Обычный"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Обострить"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Июнь"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Количество дней на открытие вопроса"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Задержка открытия"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Пользователь"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Активно"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Ноябрь"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Расширенные фильтры..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Географическая долгота"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# предложений"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Кандидат распределен"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Октябрь"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Назначение"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Январь"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Отправить письмо"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Дата"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Планируемая выручка"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Период счета"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "ID сообщения"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Вложения"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Название записи сообщения"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Нумерация"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
@@ -709,75 +709,75 @@ msgstr ""
 "Не удается связаться с сервером геолокации. Пожалуйста, убедитесь, что ваше "
 "подключение к интернету работает (%s)."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Сентябрь"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Наименование уровня"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "Последняя дата, когда этот вопрос был назначен партнёру"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Открыто"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Подтип"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Дата геолокации"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Текущий"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Кандидат/Предложение"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Уведомленные партнеры"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Переслать партнёру"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Отдел продаж"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Май"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Вероятная выручка"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -786,51 +786,51 @@ msgstr "Вероятная выручка"
 msgid "Activation"
 msgstr "Активация"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Назначенный партнер"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 "Текущий пользователь имеет непрочитанные уведомления, связанные с этим "
 "сообщением"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Предложение"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Заказчик"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Февраль"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Названия"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -838,34 +838,34 @@ msgstr ""
 msgid "Country"
 msgstr "Страна"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Год"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Преобразовать в предложение"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Гео-назначение"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Задержка открытия"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "Анализ сотрудничества"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
@@ -874,32 +874,32 @@ msgstr ""
 "Техническое поле, содержащее уведомления. Используйте notified_partner_ids "
 "для доступа к оповещаемым партнерам."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Анализ назначений партнеру"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "CRM - отчет по кандидатам"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Режим составления"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "Модель связанного документа"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Информация о вопросе"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -908,42 +908,42 @@ msgstr ""
 "Автор сообщения. Если не установлен, email_from может содержать адрес почты, "
 "который не соответствует ни одному партнеру."
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM - отчет по партнерам"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Высокий"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Дополнительные контакты"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "Первое сообщение цепочки."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Дата создания"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Фильтры"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Партнер"
 
diff --git a/addons/crm_partner_assign/i18n/sl.po b/addons/crm_channel/i18n/sl.po
similarity index 70%
rename from addons/crm_partner_assign/i18n/sl.po
rename to addons/crm_channel/i18n/sl.po
index e119a38ad42..3a5159cfd92 100644
--- a/addons/crm_partner_assign/i18n/sl.po
+++ b/addons/crm_channel/i18n/sl.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Avtor"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Načrtovani prihodki"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# primerov"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Združeno po..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Posreduj"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Začeto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Vsebina"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Podjetje"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Obvestila"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Prodajalec"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Dan"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Zadnja E-pošta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Preklicano"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Čarovnik za sestavljanje e-pošte"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Predhodni"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Napaka v omrežju"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Od"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Pošlji"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Naprej"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioriteta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Vrsta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "E-pošta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Predloga"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Ustvarjeno dne"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Nadrejeno sporočilo"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Na čakanju"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Julij"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Stopnja"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Status"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Prekliči"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Zapri"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Marec"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Opomba"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Teža"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "April"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr "April"
 msgid "Grade"
 msgstr "Stopnja"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "December"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mesec"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Datum odprtja"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Zadeva"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "ali"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Vsebina"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Glasovi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Tím"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Osnutek"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Zaprto"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Avgust"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Običajno"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Junij"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Uporabnik"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Aktivno"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "November"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Razširjeni filtri..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Oktober"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Januar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Datum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Priponke"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Zaporedje"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "September"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Odprto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Podvrsta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Trenutno"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Prodajna ekipa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Maj"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr ""
 msgid "Activation"
 msgstr "Aktivacija"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Priložnost"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Kupec"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Februar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Ime"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,107 +825,107 @@ msgstr ""
 msgid "Country"
 msgstr "Država"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Leto"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Spremeni v priložnost"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Datum nastanka"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filtri"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Partner"
diff --git a/addons/crm_partner_assign/i18n/sq.po b/addons/crm_channel/i18n/sq.po
similarity index 69%
rename from addons/crm_partner_assign/i18n/sq.po
rename to addons/crm_channel/i18n/sq.po
index 369e306aeb2..23d73f59123 100644
--- a/addons/crm_partner_assign/i18n/sq.po
+++ b/addons/crm_channel/i18n/sq.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr ""
 msgid "Grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr ""
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,107 +825,107 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr ""
diff --git a/addons/crm_partner_assign/i18n/sr@latin.po b/addons/crm_channel/i18n/sr@latin.po
similarity index 69%
rename from addons/crm_partner_assign/i18n/sr@latin.po
rename to addons/crm_channel/i18n/sr@latin.po
index e147c04764e..2f851cb5bf9 100644
--- a/addons/crm_partner_assign/i18n/sr@latin.po
+++ b/addons/crm_channel/i18n/sr@latin.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr ""
 msgid "Grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr ""
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,108 +825,108 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/sv.po b/addons/crm_channel/i18n/sv.po
similarity index 75%
rename from addons/crm_partner_assign/i18n/sv.po
rename to addons/crm_channel/i18n/sv.po
index 2f204719115..950b439b6c1 100644
--- a/addons/crm_partner_assign/i18n/sv.po
+++ b/addons/crm_channel/i18n/sv.po
@@ -17,172 +17,172 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Ledtid till avslut"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Plannerade intäkter"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# Ärenden"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Gruppera på..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Framåt"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geoplacering"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Brödtext"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Lead"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Stängledtid"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Hela historien"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Företag"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Företagsdatum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Högsta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Dag"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Meddelandets unika identifierare"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Senaste email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo-latitud"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geografisk tilldelning"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Avslutsdatum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -191,251 +191,251 @@ msgstr ""
 "Ger sannolikheten för att tilldela ett kundämne till detta företag. (0 "
 "betyder ingen tilldelning)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Genomsnittlig sannorlikhet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Föregående"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Nätverksfel"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Från"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Företagsgrad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Sektion"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Skicka"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "Nästa"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioritet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Passerad tidsfrist"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Typ"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Företag detta ärende har flyttats till."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Lägsta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Mall"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Tilldelningsdatum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Kundämnesanalys"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Skapad datum"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID relaterat dokument"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Vilande"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Företagstilldelning"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Typ är använd för att skilja kundämnen från affärsmöjligheter"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Juli"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Läge"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Vb"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geografisk placering"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Affärsmöjlighetstilldelningsanalys"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Avbryt"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Skicka historik"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Stäng"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Mars"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Aff.möjlighetstilldelningsanalys"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Antal dagar att behandla ärendet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Vikt"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "april"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -443,332 +443,332 @@ msgstr "april"
 msgid "Grade"
 msgstr "Betyg"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "December"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Månad"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Öppningsdatum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Ämne"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "# Affärsmöjligheter"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Lag"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Utkast"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Låg"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Stängd"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Massöverföring till företag"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Tilldela affärdmöjligheter"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Tilldelningsdatum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Största sannorlikhet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Augusti"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Eskalera"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "juni"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Antal dagar för att öppna ärendet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Öppningsledtid"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Användare"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Aktiv"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "november"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Utökade filter..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Geo-longitud"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# affärsmöjligheter"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Tilldela kundämne"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "oktober"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Tilldelning"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "januari"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Skicka e-post"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Datum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Planerade intäkter"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Meddelande-id"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Bilagor"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Nummerserie"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "september"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Gradnamn"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "Sista dag det här ärendet överlämnades / tilldelats ett företag"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Öppen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Geo platsdatum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Aktuellt"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Vidarebefordra till företag"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Säljlag"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "maj"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Förväntad intäkt"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -777,49 +777,49 @@ msgstr "Förväntad intäkt"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Tilldelat företag"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Affärsmöjlighet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Kund"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "februari"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Namn"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -827,108 +827,108 @@ msgstr ""
 msgid "Country"
 msgstr "Land"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "År"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Konvertera till affärsmöjlighet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Geo tilldelning"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Öppningsledtid"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "Partnerskapsanalys"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Företagstilldeningsanalys"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "CRM kundämnesrapport"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Ärendeinformation"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM företagsrapport"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Hög"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Registreringsdatum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filter"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Partner"
 
diff --git a/addons/crm_partner_assign/i18n/tr.po b/addons/crm_channel/i18n/tr.po
similarity index 77%
rename from addons/crm_partner_assign/i18n/tr.po
rename to addons/crm_channel/i18n/tr.po
index a7ea1c787d1..8f6bcf7dbfc 100644
--- a/addons/crm_partner_assign/i18n/tr.po
+++ b/addons/crm_channel/i18n/tr.po
@@ -17,22 +17,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Kapanmada gecikme"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Yazan"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Planlanan Gelir"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
@@ -41,150 +41,150 @@ msgstr ""
 "Mesaj türü: eposta mesajı için eposta, sistem mesajı için bildirim, diğer "
 "mesajlara verilen kullanıcı yanıtları gibilere yorum"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "Vak'aların sayısı"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Grupla İle..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Otomatik olarak ayıklanmış HTML içeriği"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "İlet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Coğrafi konumlama"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Yıldızlı"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Gövde"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr "Göndericinin eposta adresi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr "Ortaklık Tarihi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Aday"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Kapanmada gecikme"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Bütün Hikaye"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Firma"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Bildirimler"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Partner Tarihi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "SatışElemanı"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "En yüksek"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Gün"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Benzersiz mesaj tanımlayıcısı"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr "Sonraki İş Ortağı İncelemesi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "En son gelen e-posta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Coğrafi enlem"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "İptalEdildi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Coğrafi Saptama"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "E-posta kompozisyonu sihirbazı"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Ciro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Kapanış Tarihi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -192,251 +192,251 @@ msgid ""
 msgstr ""
 "Bu iş ortağına iş atama olasılığını verir. (0 hiç atama yapılmamış demektir.)"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr "İş Ortağı Etkinleştirmesi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Sistem bildirimi"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr "Aday ilet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Ortalama Olasılık"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Önceki"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Ağ hatası"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Gönderen"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Partner Derecesi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Bölüm"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Gönder"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "İleri"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Öncelik"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "ZamanSınırını Aşan"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tür"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "Eposta"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Bu vak'anın iletildiği/ atandığı İş Ortağı"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "En düşük"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Fatura Tarihi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Şablon"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Tarih Atama"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "aday Analizi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Oluşturulma Tarihi"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "res.partner.activation"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Üst Mesaj"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "İlgili Döküman ID"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Bekleyen"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Partner Atama"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tür, talepler ve fırsatları ayırdetmek için kullanılır"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Temmuz"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr "Görüşme Tarihi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Aşama"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Durumu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "Okumak için"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "İlet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Coğ Yerelleştirme"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Fırsat Atamaları Analizi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "İptal"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Geçmişi Gönder"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "Kapat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Mart"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Fır. Atamaları Analizi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Şikayeti sonuçlandırmak için kalan günler"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr "Bu mesajı posta kutularına iteleyen bildirimi olan iş ortakları"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Yorumlar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Ağırlık"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Nisan"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -444,257 +444,257 @@ msgstr "Nisan"
 msgid "Grade"
 msgstr "Derece"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Aralık"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Kullanıcıları bu mesaj için oylandı"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Ay"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Açılış Tarihi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Alt Mesajlar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "Son Partner Görüşmesi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Konu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "veya"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Yorumlar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Oylar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#Fırsatlar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr "Geçerli kullanıcı bu mesajı bağlı Yıldızlı bir bildirim var"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr "Ortaklık Tarihi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Takım"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Taslak"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Düşük"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Kapandı"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Partner toplu iletme"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Atanmış Fırsatlar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Atama Tarihi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Maksimum Olasılık"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Ağustos"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr "İlgili belgenin aldığı ad."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Artırma"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Haziran"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Durumu açmak için gerekli Gün Sayısı"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Açmada Gecikme"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Kullanıcı"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Etkin"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Kasım"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Genişletilmiş Filtreler..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Coğ Boylam"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# nın Fırsat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Aday Ataması"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Ekim"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Atama"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Ocak"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "İleti Gönder"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Tarih"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Planlanan Ciro"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "Partner Görüşmesi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Fatura Dönemi"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Mesaj-Id"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Ekler"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Mesaj Kayıt Adı"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Sıralama"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
@@ -703,75 +703,75 @@ msgstr ""
 "Coğrafi konumlandıma sunucusuna bağlanılamıyor. Lütfen internet bağlantınızı "
 "açık ve çalışmakta olduğundan emin olun (%s)."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Eylül"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Derece Adı"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "Bu durumun bir paydaşa iletildiği/atandığı son tarihtir."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Açık"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Alttürü"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Coğ Konum Tarihi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Geçerli"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Aday/Fırsat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Haberdar partnerler"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Partnere İlet"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Satış Takımı"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Mayıs"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Olası Gelir"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -780,49 +780,49 @@ msgstr "Olası Gelir"
 msgid "Activation"
 msgstr "Aktivisyon"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Atanmış Partner"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "Partner Düzeyi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr "Geçerli kullanıcı bu mesajı bağlantılı okunmadı bildirim var"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Fırsat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Müşteri"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Şubat"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Adı"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Partner Aktivasyonları"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -830,34 +830,34 @@ msgstr "Partner Aktivasyonları"
 msgid "Country"
 msgstr "Ülke"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Yıl"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Fırsata Dönüştür"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Coğ Atama"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Açmada gecikme"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "Paydaşlık İncelemesi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
@@ -866,32 +866,32 @@ msgstr ""
 "Mesaj bildirimlerini tutan teknik alan. Bildirim yapılan iş ortaklarına "
 "erişim için notified_partner_ids kullanın."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Partner Analiz Atanan"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "MİY Aday Raporu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Yazma modu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "İlgili Belge Modeli"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Vakka Bilgisi"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -900,42 +900,42 @@ msgstr ""
 "Mesajı yazan. Ayarlı değilse email_from hiç bir iş ortağı ile eşleşmeyen nir "
 "eposta adresini tutabilir."
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM Partner Raporu"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Yüksek"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Ek kontaklar"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "İlk mesaj konusu."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Tarih Oluştur"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filtreler"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "Partner"
 
diff --git a/addons/crm_partner_assign/i18n/zh_CN.po b/addons/crm_channel/i18n/zh_CN.po
similarity index 75%
rename from addons/crm_partner_assign/i18n/zh_CN.po
rename to addons/crm_channel/i18n/zh_CN.po
index af764d72747..336bed832a5 100644
--- a/addons/crm_partner_assign/i18n/zh_CN.po
+++ b/addons/crm_channel/i18n/zh_CN.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "延迟关闭"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "作者"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "计划收入"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# 业务"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "分组..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "跟进"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "geolocalization定位"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "正文"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "线索"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "延迟关闭"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "完整的情况"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "公司"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "业务伙伴日期"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "最高"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "日"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "消息唯一编号"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "最近的邮件"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "geolocalization纬度"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "已取消"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "指派的geolocalization"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "营业额"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "结束日期"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr "为线索指定一个业务伙伴的概率（0表示没指派）"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "系统通知"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "平均概率"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "前一个"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "网络错误"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "来自"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "业务伙伴级别"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "划分"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "发送"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "下一个"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "优先级"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "超过截止日期"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "类型"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "Email"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "这业务的业务伙伴已跟进/已指定"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "最低"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "模版"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "分配日期"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "线索分析"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "创建日期"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "父消息"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "相关单据编号"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "待处理"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "指定业务伙伴"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "类型用于区分线索和商机"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "7月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "阶段"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "转发"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "geolocalization定位"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "商机指定分析"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "取消"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "发送日志"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "结束"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "3月"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "商机指定分析"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "到期天数"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "重要性"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "4月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr "4月"
 msgid "Grade"
 msgstr "级别"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "12月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "开启日期"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "主题"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#商机"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "团队"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "草稿"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "低"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "已结束"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "批量转发给业务伙伴"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "转为商机"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "指定日期"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "最大可能"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "8月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "普通"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "提升"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "6月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "业务开启的天数"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "延迟开启"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "用户"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "生效"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "11月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "增加筛选条件"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "geolocalization经度"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "商机编号"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "线索指定"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "10月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "指定"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "1月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "发送邮件"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "日期"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "计划收入"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Message-Id"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "附件"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "序列"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "9月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "级别名称"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "这业务指定/跟进的业务伙伴的最后期限"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "开启"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "geolocalization定位的日期"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "当前的"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "跟进的业务伙伴"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "销售团队"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "5月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "可能收入"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr "可能收入"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "指定的业务伙伴"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "商机"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "客户"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "2月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "名称"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,108 +825,108 @@ msgstr ""
 msgid "Country"
 msgstr "国家"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "年"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "转换为商机"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "指定geolocalization"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "延迟开启"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "业务伙伴分析"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "业务伙伴分配分析"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "客户关系管理 线索报表"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "业务信息"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM业务伙伴报表"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "高"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "创建日期"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "过滤器"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "业务伙伴"
 
diff --git a/addons/crm_partner_assign/i18n/zh_TW.po b/addons/crm_channel/i18n/zh_TW.po
similarity index 74%
rename from addons/crm_partner_assign/i18n/zh_TW.po
rename to addons/crm_channel/i18n/zh_TW.po
index 7e5b64cf468..22d609edb75 100644
--- a/addons/crm_partner_assign/i18n/zh_TW.po
+++ b/addons/crm_channel/i18n/zh_TW.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "延遲關閉"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "計劃收入"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# 業務量"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "分組..."
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "轉寄"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo 定位"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "內文"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "潛在客戶"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "延遲關閉"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "完整的情況"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "公司"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "業務夥伴日期"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "最高"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "日"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "訊息唯一編號"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "最近的郵件"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo 緯度"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "已取消"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geo 指派的"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "電子郵件成分嚮導"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "結束日期"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr "為潛在客戶指定一個業務夥伴的概率（表示沒指派）"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "平均概率"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Previous"
 msgstr "前一個"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "網絡錯誤"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "來自"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "業務夥伴級別"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "劃分"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "發送"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Next"
 msgstr "下一個"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "優先級"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "超過截止日期"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "類型"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "這業務的業務夥伴已提出/已指定"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "最低"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "範本"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "分配日期"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "潛在客戶分析"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "建立日期"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "相關單據編號"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "待處理"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "指定業務夥伴"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "類型用於區分線索和商機"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "7月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "階段"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
+#. module: crm_channel
+#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "轉發"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo 定位"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "商機指定分析"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "取消"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "發送日誌"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Close"
 msgstr "結束"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "3月"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "商機指定分析"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "到期天數"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "重要性"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "4月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr "4月"
 msgid "Grade"
 msgstr "級別"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "12月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "開啟日期"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "主題"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#商機"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Team"
 msgstr "團隊"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "草稿"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "低"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "已結束"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "批量轉發給業務夥伴"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "轉為商機"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "指定日期"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "最大可能"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "8月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "普通"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "提升"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "6月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "業務開啟的天數"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "延遲開啟"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "使用者"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "生效"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "11月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "增加篩選條件"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Geo 經度"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "商機編號"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "潛在客戶指定"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "10月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "指定"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "1月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "發送郵件"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "日期"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "已計劃收入"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "訊息-Id"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "附件"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "順序"
 
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#. module: crm_channel
+#: code:addons/crm_channel/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "9月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "級別名稱"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "這業務指定/轉發的業務夥伴的最後期限"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "開啟"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Geo 定位的日期"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "當前的"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "轉發給業務夥伴"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "銷售團隊"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "5月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "預計收入"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr "預計收入"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "指定的業務夥伴"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "商機"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "客戶"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "2月"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "名稱"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,108 +825,108 @@ msgstr ""
 msgid "Country"
 msgstr "國家"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "年"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "轉換為商機"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "指定geolocalization"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "延遲開啟"
 
-#. module: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: crm_channel
+#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
+#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
 msgid "Partnership Analysis"
 msgstr "業務夥伴分析"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "業務夥伴分配分析"
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "客戶關係管理 線索報表"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "業務資訊"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: crm_channel
+#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM業務夥伴報表"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "高"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "建立日期"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "篩選"
 
-#. module: crm_partner_assign
+#. module: crm_channel
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_partner_assign.model_res_partner
+#: model:ir.model,name:crm_channel.model_res_partner
 msgid "Partner"
 msgstr "業務夥伴"
 
diff --git a/addons/crm_partner_assign/report/__init__.py b/addons/crm_channel/report/__init__.py
similarity index 100%
rename from addons/crm_partner_assign/report/__init__.py
rename to addons/crm_channel/report/__init__.py
diff --git a/addons/crm_partner_assign/report/crm_lead_report.py b/addons/crm_channel/report/crm_lead_report.py
similarity index 100%
rename from addons/crm_partner_assign/report/crm_lead_report.py
rename to addons/crm_channel/report/crm_lead_report.py
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_channel/report/crm_lead_report_view.xml
similarity index 100%
rename from addons/crm_partner_assign/report/crm_lead_report_view.xml
rename to addons/crm_channel/report/crm_lead_report_view.xml
diff --git a/addons/crm_partner_assign/report/crm_partner_report.py b/addons/crm_channel/report/crm_partner_report.py
similarity index 100%
rename from addons/crm_partner_assign/report/crm_partner_report.py
rename to addons/crm_channel/report/crm_partner_report.py
diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_channel/report/crm_partner_report_view.xml
similarity index 90%
rename from addons/crm_partner_assign/report/crm_partner_report_view.xml
rename to addons/crm_channel/report/crm_partner_report_view.xml
index 4e7e13afb15..60ccbb1c2ad 100644
--- a/addons/crm_partner_assign/report/crm_partner_report_view.xml
+++ b/addons/crm_channel/report/crm_partner_report_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <!--     Opportunity tree view  -->
-        <record id="view_report_crm_partner_assign_filter" model="ir.ui.view">
+        <record id="view_report_crm_channel_filter" model="ir.ui.view">
             <field name="name">crm.partner.report.assign.select</field>
             <field name="model">crm.partner.report.assign</field>
             <field name="arch" type="xml">
@@ -37,7 +37,7 @@
 
 <!-- Crm Lead Assign report Graph View -->
 
-       <record id="view_report_crm_partner_assign_tree" model="ir.ui.view">
+       <record id="view_report_crm_channel_tree" model="ir.ui.view">
             <field name="name">crm.partner.assign.report.tree</field>
             <field name="model">crm.partner.report.assign</field>
             <field name="arch" type="xml">
@@ -59,7 +59,7 @@
 
        <!-- Leads by user and section Action -->
 
-       <record id="action_report_crm_partner_assign" model="ir.actions.act_window">
+       <record id="action_report_crm_channel" model="ir.actions.act_window">
             <field name="name">Partnership Analysis</field>
             <field name="res_model">crm.partner.report.assign</field>
             <field name="context">{'search_default_group_grade': 1, 'group_by_no_leaf':1,'group_by':[]}</field>
@@ -67,8 +67,8 @@
             <field name="domain">[('grade_id', '!=', False)]</field>
         </record>
 
-       <menuitem id="menu_report_crm_partner_assign_tree"
-           parent="base.next_id_64" action="action_report_crm_partner_assign" sequence="25"/>
+       <menuitem id="menu_report_crm_channel_tree"
+           parent="base.next_id_64" action="action_report_crm_channel" sequence="25"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_channel/res_partner_demo.xml
similarity index 100%
rename from addons/crm_partner_assign/res_partner_demo.xml
rename to addons/crm_channel/res_partner_demo.xml
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_channel/res_partner_view.xml
similarity index 100%
rename from addons/crm_partner_assign/res_partner_view.xml
rename to addons/crm_channel/res_partner_view.xml
diff --git a/addons/crm_partner_assign/security/ir.model.access.csv b/addons/crm_channel/security/ir.model.access.csv
similarity index 100%
rename from addons/crm_partner_assign/security/ir.model.access.csv
rename to addons/crm_channel/security/ir.model.access.csv
diff --git a/addons/crm_partner_assign/test/partner_assign.yml b/addons/crm_channel/test/partner_assign.yml
similarity index 100%
rename from addons/crm_partner_assign/test/partner_assign.yml
rename to addons/crm_channel/test/partner_assign.yml
diff --git a/addons/crm_partner_assign/wizard/__init__.py b/addons/crm_channel/wizard/__init__.py
similarity index 100%
rename from addons/crm_partner_assign/wizard/__init__.py
rename to addons/crm_channel/wizard/__init__.py
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_channel/wizard/crm_forward_to_partner.py
similarity index 98%
rename from addons/crm_partner_assign/wizard/crm_forward_to_partner.py
rename to addons/crm_channel/wizard/crm_forward_to_partner.py
index f4c58279b24..6d33dd0bd09 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_channel/wizard/crm_forward_to_partner.py
@@ -36,7 +36,7 @@ class crm_lead_forward_to_partner(osv.TransientModel):
         email_template_obj = self.pool.get('email.template')
         base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
         try:
-            template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', 'email_template_lead_forward_mail')[1]
+            template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'email_template_lead_forward_mail')[1]
         except ValueError:
             template_id = False
         res = super(crm_lead_forward_to_partner, self).default_get(cr, uid, fields, context=context)
@@ -79,7 +79,7 @@ class crm_lead_forward_to_partner(osv.TransientModel):
         record = self.browse(cr, uid, ids[0], context=context)
         email_template_obj = self.pool.get('email.template')
         try:
-            template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', 'email_template_lead_forward_mail')[1]
+            template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'email_template_lead_forward_mail')[1]
         except ValueError:
             raise osv.except_osv(_('Email Template Error'),
                                  _('The Forward Email Template is not in the database'))
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_channel/wizard/crm_forward_to_partner_view.xml
similarity index 100%
rename from addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
rename to addons/crm_channel/wizard/crm_forward_to_partner_view.xml

From e42ea7126d88c1da96d144ed87b526e1537adcc5 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Jun 2013 17:10:39 +0200
Subject: [PATCH 58/94] [FIX]crm_channel: raise error when at least one of the
 partner to forward has no email address set

bzr revid: dle@openerp.com-20130620151039-gmjuql79f51tpjv2
---
 addons/crm_channel/wizard/crm_forward_to_partner.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/crm_channel/wizard/crm_forward_to_partner.py b/addons/crm_channel/wizard/crm_forward_to_partner.py
index 6d33dd0bd09..edbafddf229 100644
--- a/addons/crm_channel/wizard/crm_forward_to_partner.py
+++ b/addons/crm_channel/wizard/crm_forward_to_partner.py
@@ -85,10 +85,20 @@ class crm_lead_forward_to_partner(osv.TransientModel):
                                  _('The Forward Email Template is not in the database'))
         local_context = context.copy()
         if not (record.forward_type == 'single'):
+            no_email = []
             for lead in record.assignation_lines:
                 if not lead.partner_assigned_id:
                     raise osv.except_osv(_('Assignation Error'),
                                          _('Some leads have not been assigned to any partner so assign partners manualy'))
+                if not lead.partner_assigned_id.email:
+                    no_email.append(lead.partner_assigned_id.name)
+            if no_email:
+                raise osv.except_osv(_('Email Error'),
+                                    ('Set an email address for the partner(s): %s' % ", ".join(no_email)))
+        if record.forward_type == 'single' and not record.partner_id.email:
+            raise osv.except_osv(_('Email Error'),
+                                ('Set an email address for the partner %s' % record.partner_id.name))
+
         partners_leads = {}
         for lead in record.assignation_lines:
             lead_details = {

From bf71769054349425b646d6d6d6389a0b630f22db Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Jun 2013 17:15:21 +0200
Subject: [PATCH 59/94] [ADD]crm_channel: portal view

bzr revid: dle@openerp.com-20130620151521-93m6q1eiqz97ovh5
---
 addons/crm_channel/__init__.py                |   1 +
 addons/crm_channel/__openerp__.py             |   7 +-
 addons/crm_channel/crm_data.xml               |  19 ++
 addons/crm_channel/crm_lead.py                |  51 ++++
 addons/crm_channel/crm_portal_view.xml        | 224 ++++++++++++++++++
 addons/crm_channel/portal_data.xml            |  57 +++++
 .../crm_channel/security/ir.model.access.csv  |   1 +
 7 files changed, 358 insertions(+), 2 deletions(-)
 create mode 100644 addons/crm_channel/crm_data.xml
 create mode 100644 addons/crm_channel/crm_lead.py
 create mode 100644 addons/crm_channel/crm_portal_view.xml
 create mode 100644 addons/crm_channel/portal_data.xml

diff --git a/addons/crm_channel/__init__.py b/addons/crm_channel/__init__.py
index 2156cd0273d..357fbf153ed 100644
--- a/addons/crm_channel/__init__.py
+++ b/addons/crm_channel/__init__.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import crm_channel
+import crm_lead
 import wizard
 import report
 
diff --git a/addons/crm_channel/__openerp__.py b/addons/crm_channel/__openerp__.py
index 874474e97d2..d0aabe4f722 100644
--- a/addons/crm_channel/__openerp__.py
+++ b/addons/crm_channel/__openerp__.py
@@ -37,7 +37,7 @@ The most appropriate partner can be assigned.
 You can also use the geolocalization without using the GPS coordinates.
     """,
     'author': 'OpenERP SA',
-    'depends': ['crm', 'account'],
+    'depends': ['crm', 'account', 'portal'],
     'demo': ['res_partner_demo.xml'],
     'data': [
         'security/ir.model.access.csv',
@@ -45,9 +45,12 @@ You can also use the geolocalization without using the GPS coordinates.
         'wizard/crm_forward_to_partner_view.xml',
         'crm_lead_view.xml',
         'crm_channel_data.xml',
+        'crm_data.xml',
+        'crm_portal_view.xml',
+        'portal_data.xml',
         'report/crm_lead_report_view.xml',
         'report/crm_partner_report_view.xml',
-        'data/lead_mail_template_data.xml'
+        'data/lead_mail_template_data.xml',
     ],
     'test': ['test/partner_assign.yml'],
     'installable': True,
diff --git a/addons/crm_channel/crm_data.xml b/addons/crm_channel/crm_data.xml
new file mode 100644
index 00000000000..89c84bff9d2
--- /dev/null
+++ b/addons/crm_channel/crm_data.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+
+        <!-- Crm stages -->
+        <record model="crm.case.stage" id="stage_portal_lead_recycle">
+            <field name="name">To Recycle</field>
+            <field eval="1" name="case_default"/>
+            <field eval="0" name="probability"/>
+            <field eval="6" name="sequence"/>
+        </record>
+        <record model="crm.case.stage" id="stage_portal_lead_interested">
+            <field name="name">Interested</field>
+            <field eval="1" name="case_default"/>
+            <field eval="10" name="probability"/>
+            <field eval="5" name="sequence"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/crm_channel/crm_lead.py b/addons/crm_channel/crm_lead.py
new file mode 100644
index 00000000000..5bdd3b6fd63
--- /dev/null
+++ b/addons/crm_channel/crm_lead.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import osv
+from openerp import SUPERUSER_ID
+from openerp.tools.translate import _
+
+
+class crm_lead(osv.osv):
+    _inherit = 'crm.lead'
+
+    def case_interested(self, cr, uid, ids, context=None):
+        self.check_access_rights(cr, uid, 'write')
+        try:
+            stage_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'stage_portal_lead_interested')[1]
+        except ValueError:
+            stage_id = False
+        if stage_id:
+            self.write(cr, SUPERUSER_ID, ids, {'stage_id': stage_id})
+        self.message_post(cr, uid, ids, body=_('I am interested by this lead'), context=context)
+
+    def case_disinterested(self, cr, uid, ids, context=None):
+        self.check_access_rights(cr, uid, 'write')
+        try:
+            stage_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'stage_portal_lead_recycle')[1]
+        except ValueError:
+            stage_id = False
+        values = {}
+        # values = {'partner_assigned_id': False}
+        if stage_id:
+            values['stage_id'] = stage_id
+        self.write(cr, SUPERUSER_ID, ids, values, context=context)
+        self.message_post(cr, uid, ids, body=_('I am not interested by this lead'), context=context)
diff --git a/addons/crm_channel/crm_portal_view.xml b/addons/crm_channel/crm_portal_view.xml
new file mode 100644
index 00000000000..d2fe7c4daa5
--- /dev/null
+++ b/addons/crm_channel/crm_portal_view.xml
@@ -0,0 +1,224 @@
+<openerp>
+    <data>
+    <!-- lead views-->
+        <record model="ir.ui.view" id="crm_lead_portal_tree">
+            <field name="name">partner lead</field>
+            <field name="model">crm.lead</field>
+            <field name="priority" eval="32"/>
+            <field name="arch" type="xml">
+            <tree string="Leads" colors="blue:state=='pending';grey:state in ('cancel', 'done');red:stage_id[1]=='Disinterested';black:stage_id[1]=='Interested'">
+              <field name="date_deadline" invisible="1"/>
+              <field name="create_date"/>
+              <field name="name" string="Subject"/>
+              <field name="contact_name"/>
+              <field name="country_id" invisible="context.get('invisible_country', True)" />
+              <field name="email_from"/>
+              <field name="phone"/>
+              <field name="stage_id" invisible="1"/>
+              <field name="type_id" invisible="1"/>
+              <field name="referred" invisible="1"/>
+              <field name="channel_id" invisible="1"/>
+              <field name="state" invisible="1"/>
+              <field name="section_id" invisible="context.get('invisible_section', True)" />
+
+              <button string="I'm interested" name="case_interested" icon="gtk-index" type="object"/>
+              <button string="I'm not interested" name="case_disinterested" icon="gtk-close" type="object"/>
+            </tree>
+            </field>
+        </record>
+        <record model= "ir.ui.view" id="crm_lead_portal_form">
+            <field name="name">crm_portal_form</field>
+            <field name="model">crm.lead</field>
+            <field name="priority" eval="32"/>
+            <field name="arch" type="xml">
+              <form string="Leads" version="7.0">
+                <header>
+                  <button string="I'm interested" name="case_interested" icon="gtk-index" type="object"/>
+                  <button string="I'm not interested" name="case_disinterested" icon="gtk-close" type="object"/>
+                </header>
+                <sheet>
+                  <group>
+                    <field name="priority" readonly="1"/>
+                    <field name="type" invisible="1" readonly="1"/>
+                    <field name="partner_name" string="Partner Name" readonly="1"/>
+                    <field name="stage_id" string="Interest Status"/>
+                  </group>
+                  <notebook>
+                    <page string='Lead'>
+                      <group col="2">
+                        <separator string="Contact" colspan="2"/>
+                        <group col="2">
+                           <field name="contact_name" readonly="1"/>
+                           <field domain="[('domain', '=', 'contact')]" name="title" widget="selection" readonly="1"/>
+                           <field name="function" readonly="1"/>
+                           <field name="street" readonly="1"/>
+                           <field name="street2" readonly="1"/>
+                        </group>
+                        <group col="2">
+                           <field name="zip" readonly="1"/>
+                           <field name="city" readonly="1"/>
+                           <field name="country_id" readonly="1"/>
+                           <field name="state_id" readonly="1"/>
+                        </group>
+                      </group>
+                      <group col="2">
+                        <group col="2">
+                           <separator string="Communication" colspan="2"/>
+                           <field name="email_from" readonly="1"/>
+                           <field name="phone" readonly="1"/>
+                           <field name="fax" readonly="1"/>
+                           <field name="mobile" readonly="1"/>
+                        </group>
+                      </group>
+                      <separator string="Details" />
+                      <field name="description" nolabel="1" />
+                    </page>
+                  </notebook>
+                </sheet>
+              </form>
+            </field>
+        </record>
+        <!-- opportunity views-->
+        <record model="ir.ui.view" id="crm_opportunity_portal_tree">
+            <field name="name">partner lead</field>
+            <field name="model">crm.lead</field>
+            <field name="priority" eval="32"/>
+            <field name="arch" type="xml">
+               <tree string="Leads" colors="blue:state=='pending';grey:state in ('cancel', 'done')">
+                   <field name="date_deadline" invisible="1"/>
+                   <field name="create_date" groups="base.group_no_one"/>
+                   <field name="name" string="Opportunity"/>
+                   <field name="partner_id" string="Customer"/>
+                   <field name="country_id" invisible="context.get('invisible_country', True)" />
+                   <field name="date_action"/>
+                   <field name="title_action" />
+                   <field name="channel_id" invisible="1"/>
+                   <field name="type_id" invisible="1"/>
+                   <field name="planned_revenue" sum="Expected Revenues"/>
+                   <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
+                   <field name="section_id" invisible="context.get('invisible_section', True)" />
+                   <field name="priority" invisible="1"/>
+                   <field name="state" invisible="1"/>
+               </tree>
+            </field>
+        </record>
+        <record model= "ir.ui.view" id="crm_opportunity_portal_form">
+            <field name="name">crm_portal_form</field>
+            <field name="model">crm.lead</field>
+            <field name="priority" eval="32"/>
+            <field name="arch" type="xml">
+              <form string="Leads" version="7.0">
+                <sheet>
+                <group>
+                    <field name="name"  required="1" string="Opportunity"/>
+                    <field name="planned_revenue" readonly="1"/>
+                    <field name="probability" readonly="1"/>
+                    <field name="date_deadline"/>
+                    <newline/>
+                    <field name="date_action" readonly="1"/>
+                    <field name="title_action" readonly="1"/>
+                    <field name="priority" string="Priority" readonly="1"/>
+                    <newline/>
+                    <field name="type" invisible="1" readonly="1"/>
+                </group>
+                <notebook colspan="4">
+                <page string="Opportunity">
+                    <group col="2">
+                      <separator string="Contact" colspan="2"/>
+                      <group col="2">
+                          <field name="partner_id" select="1"
+                            on_change="onchange_partner_id(partner_id, email_from)" string="Customer"
+                            colspan="2" readonly="1"/>
+                          <field name="partner_name" string="Customer Name" readonly="1"/>
+                          <field domain="[('domain', '=', 'contact')]" name="title" widget="selection" readonly="1"/>
+                          <field name="function" readonly="1"/>
+                          <field name="street" readonly="1"/>
+                          <field name="street2" readonly="1"/>
+                      </group>
+                      <group col="2">
+                         <field name="zip" readonly="1"/>
+                         <field name="city" readonly="1"/>
+                         <field name="country_id" readonly="1"/>
+                         <field name="state_id" readonly="1"/>
+                         <field name="phone" readonly="1"/>
+                      </group>
+                    </group>
+                    <group col="2">
+                      <group col="2">
+                         <separator string="Communication" colspan="2"/>
+                         <field name="email_from" readonly="1"/>
+                         <field name="phone" readonly="1"/>
+                         <field name="fax" readonly="1"/>
+                         <field name="mobile" readonly="1"/>
+                      </group>
+                      <group col="2">
+                         <separator string="Categorization" colspan="2"/>
+                        <field name="type_id" widget="selection" readonly="1"/>
+                        <field name="channel_id" widget="selection" readonly="1"/>
+                      </group>
+                    </group>
+                    <separator string="Details" />
+                    <field name="description" nolabel="1" colspan="4"/>
+                </page>
+                </notebook>
+              </sheet>
+              </form>
+            </field>
+        </record>
+
+
+    <!-- leads -->
+
+       <record id="action_portal_leads" model="ir.actions.act_window">
+          <field name="name">Leads</field>
+          <field name="res_model">crm.lead</field>
+          <field name="view_mode">tree,form</field>
+          <field name="view_id" ref="crm_lead_portal_tree"/>
+          <field name="domain">[('type','like','lead')]</field>
+      </record>
+
+      <record id="action_portal_lead_tree" model="ir.actions.act_window.view">
+          <field name="sequence" eval="0"/>
+          <field name="view_mode">tree</field>
+          <field name="view_id" ref="crm_lead_portal_tree"/>
+          <field name="act_window_id" ref="action_portal_leads"/>
+      </record>
+      
+      <record id="action_portal_lead_form" model="ir.actions.act_window.view">
+          <field name="sequence" eval="1"/>
+          <field name="view_mode">form</field>
+          <field name="view_id" ref="crm_lead_portal_form"/>
+          <field name="act_window_id" ref="action_portal_leads"/>
+      </record>
+      
+    <!-- opportunities -->
+      
+      <record id="action_portal_opportunities" model="ir.actions.act_window">
+          <field name="name">Opportunities</field>
+          <field name="res_model">crm.lead</field>
+          <field name="view_mode">tree,form</field>
+          <field name="view_id" ref="crm_opportunity_portal_tree"/>
+          <field name="domain">[('type','like','opportunity')]</field>
+      </record>
+
+      <record id="action_portal_opportunities_tree" model="ir.actions.act_window.view">
+          <field name="sequence" eval="0"/>
+          <field name="view_mode">tree</field>
+          <field name="view_id" ref="crm_opportunity_portal_tree"/>
+          <field name="act_window_id" ref="action_portal_opportunities"/>
+      </record>
+      
+      <record id="action_portal_opportunities_form" model="ir.actions.act_window.view">
+          <field name="sequence" eval="1"/>
+          <field name="view_mode">form</field>
+          <field name="view_id" ref="crm_opportunity_portal_form"/>
+          <field name="act_window_id" ref="action_portal_opportunities"/>
+      </record>
+
+      <!--menus-->
+      <menuitem name="Leads &amp; Opportunities" id="portal_leads" parent="portal.portal_menu" sequence="25"/>
+      <menuitem action="action_portal_leads" sequence="0" id="openerp_portal_menu_sales_leads_current" parent="portal_leads"/>
+      <menuitem action="action_portal_opportunities" sequence="1" id="openerp_portal_menu_sales_leads_current1" parent="portal_leads"/>
+
+    </data>
+</openerp>
diff --git a/addons/crm_channel/portal_data.xml b/addons/crm_channel/portal_data.xml
new file mode 100644
index 00000000000..394b469dc5b
--- /dev/null
+++ b/addons/crm_channel/portal_data.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- menu Administration/Portals/Partners Portal -->
+
+        <record model="ir.actions.client" id="openerp_contact_us">
+          <field name="name">Portal Contact Us</field>
+          <field name="tag">contact_us_page</field>
+          <field name="params_store">{}</field>
+        </record>
+
+        <!-- Partner and address -->
+        <record id="res_partner_access" model="ir.model.access">
+            <field name="name">openerp.portal.res.partner</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="group_id" ref="portal.group_portal"/>
+            <field name="perm_read" eval="1"/>
+            <field name="perm_create" eval="0"/>
+            <field name="perm_write" eval="0"/>
+            <field name="perm_unlink" eval="0"/>
+        </record>
+        <record id="res_partner_rule" model="ir.rule">
+            <field name="name">openerp.portal.res.partner</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="groups" eval="[(6,0,[ref('portal.group_portal')])]"/>
+            <field name="domain_force">[('id','child_of',user.commercial_partner_id.id)]</field>
+        </record>
+        <record id="res_partner_grade_access" model="ir.model.access">
+            <field name="name">openerp.portal.res.partner.grade</field>
+            <field name="model_id" ref="crm_channel.model_res_partner_grade"/>
+            <field name="group_id" ref="portal.group_portal"/>
+            <field name="perm_read" eval="1"/>
+            <field name="perm_create" eval="0"/>
+            <field name="perm_write" eval="0"/>
+            <field name="perm_unlink" eval="0"/>
+        </record>
+
+        <!-- CRM Lead portal -->
+        <record id="assigned_lead_portal_rule_1" model="ir.rule">
+            <field name="name">openerp.portal.crm.lead</field>
+            <field name="model_id" ref="crm.model_crm_lead"/>
+            <field name="groups" eval="[(6,0,[ref('portal.group_portal')])]"/>
+            <field name="domain_force">[('partner_assigned_id','child_of',user.commercial_partner_id.id)]</field>
+        </record>
+        <record id="lead_portal_access" model="ir.model.access">
+            <field name="name">openerp.portal.crm.lead</field>
+            <field name="model_id" ref="crm.model_crm_lead"/>
+            <field name="group_id" ref="portal.group_portal"/>
+            <field name="perm_read" eval="1"/>
+            <field name="perm_create" eval="0"/>
+            <field name="perm_write" eval="1"/>
+            <field name="perm_unlink" eval="0"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/crm_channel/security/ir.model.access.csv b/addons/crm_channel/security/ir.model.access.csv
index 69b74ef6b3d..81d74bf43e3 100644
--- a/addons/crm_channel/security/ir.model.access.csv
+++ b/addons/crm_channel/security/ir.model.access.csv
@@ -5,3 +5,4 @@ access_crm_partner_report,crm.partner.report.assign.all,model_crm_partner_report
 access_res_partner_grade,res.partner.grade,model_res_partner_grade,base.group_sale_salesman,1,1,1,0
 access_res_partner_grade_manager,res.partner.grade.manager,model_res_partner_grade,base.group_sale_manager,1,1,1,1
 "access_partner_activation_manager","res.partner.activation.manager","model_res_partner_activation","base.group_partner_manager",1,1,1,1
+partner_access_crm_lead,crm.lead,model_crm_lead,portal.group_portal,1,1,0,0
\ No newline at end of file

From 201add666f8ffac7c61a257a41ff4ead6c7eab25 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Jun 2013 17:16:48 +0200
Subject: [PATCH 60/94] [FIX]crm_channel: wrong indentation

bzr revid: dle@openerp.com-20130620151648-wu8ijbi5vnvsb9cg
---
 .../wizard/crm_forward_to_partner.py          | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/crm_channel/wizard/crm_forward_to_partner.py b/addons/crm_channel/wizard/crm_forward_to_partner.py
index edbafddf229..a2a4a46f622 100644
--- a/addons/crm_channel/wizard/crm_forward_to_partner.py
+++ b/addons/crm_channel/wizard/crm_forward_to_partner.py
@@ -59,19 +59,19 @@ class crm_lead_forward_to_partner(osv.TransientModel):
                     lead_location.append(lead.country_id.name)
                 if lead.city:
                     lead_location.append(lead.city)
-                    partner_id = partner_assigned_ids.get(lead.id) or False
-                    if partner_id:
-                        partner = partner_obj.browse(cr, uid, partner_id, context=context)
-                        if partner.country_id:
-                            partner_location.append(partner.country_id.name)
-                        if partner.city:
-                            partner_location.append(partner.city)
-                    res['assignation_lines'].append({'lead_id': lead.id,
-                                                     'lead_location': ", ".join(lead_location),
-                                                     'partner_assigned_id': partner_id,
-                                                     'partner_location': ", ".join(partner_location),
-                                                     'lead_link': "%s/?db=%s#id=%s&model=crm.lead" % (base_url, cr.dbname, lead.id)
-                                                     })
+                partner_id = partner_assigned_ids.get(lead.id) or False
+                if partner_id:
+                    partner = partner_obj.browse(cr, uid, partner_id, context=context)
+                    if partner.country_id:
+                        partner_location.append(partner.country_id.name)
+                    if partner.city:
+                        partner_location.append(partner.city)
+                res['assignation_lines'].append({'lead_id': lead.id,
+                                                 'lead_location': ", ".join(lead_location),
+                                                 'partner_assigned_id': partner_id,
+                                                 'partner_location': ", ".join(partner_location),
+                                                 'lead_link': "%s/?db=%s#id=%s&model=crm.lead" % (base_url, cr.dbname, lead.id)
+                                                 })
         return res
 
     def action_forward(self, cr, uid, ids, context=None):

From c13e5b8c9a573cbfb97cc5e285dba9b3b0359806 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Jun 2013 17:17:17 +0200
Subject: [PATCH 61/94] [ADD]crm_channel: crm lead forward wizard add clean
 unassigned butotn

bzr revid: dle@openerp.com-20130620151717-sisb0mdsgp7kzjl9
---
 .../wizard/crm_forward_to_partner.py          | 56 ++++++++++++-------
 .../wizard/crm_forward_to_partner_view.xml    |  1 +
 2 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/addons/crm_channel/wizard/crm_forward_to_partner.py b/addons/crm_channel/wizard/crm_forward_to_partner.py
index a2a4a46f622..b040e6d8602 100644
--- a/addons/crm_channel/wizard/crm_forward_to_partner.py
+++ b/addons/crm_channel/wizard/crm_forward_to_partner.py
@@ -28,13 +28,31 @@ class crm_lead_forward_to_partner(osv.TransientModel):
     """ Forward info history to partners. """
     _name = 'crm.lead.forward.to.partner'
 
+    def _convert_to_assignation_line(self, cr, uid, lead, partner):
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        lead_location = []
+        partner_location = []
+        if lead.country_id:
+            lead_location.append(lead.country_id.name)
+        if lead.city:
+            lead_location.append(lead.city)
+        if partner:
+            if partner.country_id:
+                partner_location.append(partner.country_id.name)
+            if partner.city:
+                partner_location.append(partner.city)
+        return {'lead_id': lead.id,
+                'lead_location': ", ".join(lead_location),
+                'partner_assigned_id': partner and partner.id or False,
+                'partner_location': ", ".join(partner_location),
+                'lead_link': "%s/?db=%s#id=%s&model=crm.lead" % (base_url, cr.dbname, lead.id)
+                }
+
     def default_get(self, cr, uid, fields, context=None):
         if context is None:
             context = {}
         lead_obj = self.pool.get('crm.lead')
-        partner_obj = self.pool.get('res.partner')
         email_template_obj = self.pool.get('email.template')
-        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
         try:
             template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'email_template_lead_forward_mail')[1]
         except ValueError:
@@ -53,25 +71,11 @@ class crm_lead_forward_to_partner(osv.TransientModel):
                 partner_assigned_ids = dict((lead.id, lead.partner_assigned_id and lead.partner_assigned_id.id or False) for lead in lead_ids)
                 res['partner_id'] = lead_ids[0].partner_assigned_id.id
             for lead in lead_ids:
-                lead_location = []
-                partner_location = []
-                if lead.country_id:
-                    lead_location.append(lead.country_id.name)
-                if lead.city:
-                    lead_location.append(lead.city)
                 partner_id = partner_assigned_ids.get(lead.id) or False
+                partner = False
                 if partner_id:
-                    partner = partner_obj.browse(cr, uid, partner_id, context=context)
-                    if partner.country_id:
-                        partner_location.append(partner.country_id.name)
-                    if partner.city:
-                        partner_location.append(partner.city)
-                res['assignation_lines'].append({'lead_id': lead.id,
-                                                 'lead_location': ", ".join(lead_location),
-                                                 'partner_assigned_id': partner_id,
-                                                 'partner_location': ", ".join(partner_location),
-                                                 'lead_link': "%s/?db=%s#id=%s&model=crm.lead" % (base_url, cr.dbname, lead.id)
-                                                 })
+                    partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+                res['assignation_lines'].append(self._convert_to_assignation_line(cr, uid, lead, partner))
         return res
 
     def action_forward(self, cr, uid, ids, context=None):
@@ -120,6 +124,18 @@ class crm_lead_forward_to_partner(osv.TransientModel):
             self.pool.get('crm.lead').message_subscribe(cr, uid, lead_ids, [partner_id], context=context)
         return True
 
+    def action_clean_lines(self, cr, uid, ids, context=None):
+        record = self.browse(cr, uid, ids[0], context=context)
+        invalid_lines = []
+        for line in record.assignation_lines:
+            if not line.partner_assigned_id:
+                invalid_lines.append((2, line.id))
+        self.write(cr, uid, ids[0], {'assignation_lines': invalid_lines}, context=context)
+        model, action_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'action_crm_send_mass_forward')
+        action = self.pool[model].read(cr, uid, action_id, context=context)
+        action['res_id'] = ids[0]
+        return action
+
     def get_portal_url(self, cr, uid, ids, context=None):
         portal_link = "%s/?db=%s" % (self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url'), cr.dbname)
         return portal_link
@@ -133,7 +149,7 @@ class crm_lead_forward_to_partner(osv.TransientModel):
     }
 
     _defaults = {
-        'forward_type': 'single',
+        'forward_type': lambda self, cr, uid, c: c.get('forward_type') or 'single',
     }
 
 
diff --git a/addons/crm_channel/wizard/crm_forward_to_partner_view.xml b/addons/crm_channel/wizard/crm_forward_to_partner_view.xml
index fdf02f81219..8bb329611fd 100644
--- a/addons/crm_channel/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_channel/wizard/crm_forward_to_partner_view.xml
@@ -16,6 +16,7 @@
                         <group>
                         </group>
                     </group>
+                    <button name="action_clean_lines" string="Clean Unassigned" type="object" attrs="{'invisible': [('forward_type', 'in', ['single',False])]}"/>
                     <field name="assignation_lines" attrs="{'invisible': [('forward_type', 'in', ['single',False])]}">
                         <tree create="false" editable="bottom">
                             <field name="lead_id" readonly="1" on_change="on_change_lead_id(lead_id)"/>

From 7be461473149a680ddced5c030198da9054cbd11 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Jun 2013 17:18:05 +0200
Subject: [PATCH 62/94] [ADD]crm_channel: portal, Im not interested button go
 to next lead or to list if none

bzr revid: dle@openerp.com-20130620151805-pvjkozq41wwpfodo
---
 addons/crm_channel/__openerp__.py        |  3 +++
 addons/crm_channel/crm_lead.py           | 10 ++++++++--
 addons/crm_channel/static/src/js/next.js | 12 ++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 addons/crm_channel/static/src/js/next.js

diff --git a/addons/crm_channel/__openerp__.py b/addons/crm_channel/__openerp__.py
index d0aabe4f722..c0c1e6ef30f 100644
--- a/addons/crm_channel/__openerp__.py
+++ b/addons/crm_channel/__openerp__.py
@@ -52,6 +52,9 @@ You can also use the geolocalization without using the GPS coordinates.
         'report/crm_partner_report_view.xml',
         'data/lead_mail_template_data.xml',
     ],
+    'js': [
+        'static/src/js/next.js',
+    ],
     'test': ['test/partner_assign.yml'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/crm_channel/crm_lead.py b/addons/crm_channel/crm_lead.py
index 5bdd3b6fd63..d08425729a1 100644
--- a/addons/crm_channel/crm_lead.py
+++ b/addons/crm_channel/crm_lead.py
@@ -44,8 +44,14 @@ class crm_lead(osv.osv):
         except ValueError:
             stage_id = False
         values = {}
-        # values = {'partner_assigned_id': False}
+        values = {'partner_assigned_id': False}
         if stage_id:
             values['stage_id'] = stage_id
-        self.write(cr, SUPERUSER_ID, ids, values, context=context)
         self.message_post(cr, uid, ids, body=_('I am not interested by this lead'), context=context)
+        self.write(cr, SUPERUSER_ID, ids, values, context=context)
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'next_or_list',
+            'params': {
+            },
+        }
diff --git a/addons/crm_channel/static/src/js/next.js b/addons/crm_channel/static/src/js/next.js
new file mode 100644
index 00000000000..4f0c58c0e18
--- /dev/null
+++ b/addons/crm_channel/static/src/js/next.js
@@ -0,0 +1,12 @@
+openerp.crm_channel = function (instance) {
+	instance.crm_channel = instance.crm_channel || {};
+	instance.crm_channel.next_or_list = function(parent) {
+		var form = parent.inner_widget.views.form.controller;
+		form.dataset.remove_ids([form.dataset.ids[form.dataset.index]]);
+		form.reload();
+		if (!form.dataset.ids.length){
+			parent.inner_widget.switch_mode('list');
+		}
+	};
+	instance.web.client_actions.add("next_or_list", "instance.crm_channel.next_or_list");
+}
\ No newline at end of file

From f650c896e2ad5c10178df31a9dd9131e6cd18bb9 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Jun 2013 17:18:42 +0200
Subject: [PATCH 63/94] [FIX]crm_channel: email template improvment

bzr revid: dle@openerp.com-20130620151842-06bzm9ru0ez2pej5
---
 .../data/lead_mail_template_data.xml          | 28 +++++++------
 .../wizard/crm_forward_to_partner.py          | 41 +++++++++----------
 .../wizard/crm_forward_to_partner_view.xml    |  8 ++--
 3 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/addons/crm_channel/data/lead_mail_template_data.xml b/addons/crm_channel/data/lead_mail_template_data.xml
index a964fc36ddb..df9d63cbf43 100644
--- a/addons/crm_channel/data/lead_mail_template_data.xml
+++ b/addons/crm_channel/data/lead_mail_template_data.xml
@@ -10,25 +10,29 @@
             <field name="subject">Fwd: Lead: ${ctx['partner_id'].name}</field>
             <field name="body_html"><![CDATA[
             
-Hello ${ctx['partner_id'].name},
-</br>
-</br>
+<p>Hello,</p>
+
+
+<p>We have been contacted by those prospects that are in your region. Thus, the following leads have been assigned to ${ctx['partner_id'].name}:</p>
 
-<blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;">Some leads have been assigned to you. Here are the various leads we propose: </blockquote></br></br>
-<b>
 <ol>
 % for lead in ctx['partner_leads']:
-     <li><a href="${lead.lead_link}">${lead.lead_id.name or 'Subject Undefined'}</a>, ${lead.lead_id.contact_name or 'Contact Name Undefined'}, ${lead.lead_id.country_id and lead.lead_id.country_id.name or 'Country Undefined' }, ${lead.lead_id.email_from or 'Email Undefined'}, ${lead.lead_id.phone or 'Phone Number Undefined'} </li></br>
+     <li><a href="${lead.lead_link}">${lead.lead_id.name or 'Subject Undefined'}</a>, ${lead.lead_id.contact_name or 'Contact Name Undefined'}, ${lead.lead_id.country_id and lead.lead_id.country_id.name or 'Country Undefined' }, ${lead.lead_id.email_from or 'Email Undefined'}, ${lead.lead_id.phone or ''} </li></br>
 % endfor
 </ol>
-</b>
 
-</br>
-<blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;">Connect you to your <b><a href="${object.get_portal_url()}">Partner Portal</a></b> to see leads details.</blockquote>
+<p>Please connect to your <a href="${object.get_portal_url()}">Partner Portal</a> to get details. On each lead are two buttons on the top left corner that you should press after having contacted the lead: "I'm interested" & "I'm not interested".</p>
 
-</br>   
-Thanks,</br>
-    Account Manager
+<p>If you did not contact the lead after 4 weeks (20 days), the lead will be send to another partner.</p>
+
+<p>Thanks,</p>
+
+<pre>
+${ctx['partner_id'].user_id and ctx['partner_id'].user_id.signature or 'The OpenERP Team'}
+</pre>
+% if not ctx['partner_id'].user_id:
+PS: It looks like you do not have an account manager assigned to you, please contact us.
+% endif
             ]]></field>
         </record>
     </data>
diff --git a/addons/crm_channel/wizard/crm_forward_to_partner.py b/addons/crm_channel/wizard/crm_forward_to_partner.py
index b040e6d8602..d54a96d527a 100644
--- a/addons/crm_channel/wizard/crm_forward_to_partner.py
+++ b/addons/crm_channel/wizard/crm_forward_to_partner.py
@@ -91,10 +91,7 @@ class crm_lead_forward_to_partner(osv.TransientModel):
         if not (record.forward_type == 'single'):
             no_email = []
             for lead in record.assignation_lines:
-                if not lead.partner_assigned_id:
-                    raise osv.except_osv(_('Assignation Error'),
-                                         _('Some leads have not been assigned to any partner so assign partners manualy'))
-                if not lead.partner_assigned_id.email:
+                if lead.partner_assigned_id and not lead.partner_assigned_id.email:
                     no_email.append(lead.partner_assigned_id.name)
             if no_email:
                 raise osv.except_osv(_('Email Error'),
@@ -105,16 +102,17 @@ class crm_lead_forward_to_partner(osv.TransientModel):
 
         partners_leads = {}
         for lead in record.assignation_lines:
+            partner = record.forward_type == 'single' and record.partner_id or lead.partner_assigned_id
             lead_details = {
                 'lead_link': lead.lead_link,
                 'lead_id': lead.lead_id,
             }
-            partner = record.forward_type == 'single' and record.partner_id or lead.partner_assigned_id
-            partner_leads = partners_leads.get(partner.id)
-            if partner_leads:
-                partner_leads['leads'].append(lead_details)
-            else:
-                partners_leads[partner.id] = {'partner': partner, 'leads': [lead_details]}
+            if partner:
+                partner_leads = partners_leads.get(partner.id)
+                if partner_leads:
+                    partner_leads['leads'].append(lead_details)
+                else:
+                    partners_leads[partner.id] = {'partner': partner, 'leads': [lead_details]}
         for partner_id, partner_leads in partners_leads.items():
             local_context['partner_id'] = partner_leads['partner']
             local_context['partner_leads'] = partner_leads['leads']
@@ -124,17 +122,17 @@ class crm_lead_forward_to_partner(osv.TransientModel):
             self.pool.get('crm.lead').message_subscribe(cr, uid, lead_ids, [partner_id], context=context)
         return True
 
-    def action_clean_lines(self, cr, uid, ids, context=None):
-        record = self.browse(cr, uid, ids[0], context=context)
-        invalid_lines = []
-        for line in record.assignation_lines:
-            if not line.partner_assigned_id:
-                invalid_lines.append((2, line.id))
-        self.write(cr, uid, ids[0], {'assignation_lines': invalid_lines}, context=context)
-        model, action_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'action_crm_send_mass_forward')
-        action = self.pool[model].read(cr, uid, action_id, context=context)
-        action['res_id'] = ids[0]
-        return action
+    # def action_clean_lines(self, cr, uid, ids, context=None):
+    #     record = self.browse(cr, uid, ids[0], context=context)
+    #     invalid_lines = []
+    #     for line in record.assignation_lines:
+    #         if not line.partner_assigned_id:
+    #             invalid_lines.append((2, line.id))
+    #     self.write(cr, uid, ids[0], {'assignation_lines': invalid_lines}, context=context)
+    #     model, action_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'action_crm_send_mass_forward')
+    #     action = self.pool[model].read(cr, uid, action_id, context=context)
+    #     action['res_id'] = ids[0]
+    #     return action
 
     def get_portal_url(self, cr, uid, ids, context=None):
         portal_link = "%s/?db=%s" % (self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url'), cr.dbname)
@@ -144,7 +142,6 @@ class crm_lead_forward_to_partner(osv.TransientModel):
         'forward_type': fields.selection([('single', 'a single partner: manual selection of partner'), ('assigned', "several partners: automatic assignation, using GPS coordinates and partner's grades"), ], 'Forward selected leads to'),
         'partner_id': fields.many2one('res.partner', 'Forward Leads To'),
         'assignation_lines': fields.one2many('crm.lead.assignation', 'forward_id', 'Partner Assignation'),
-        'show_mail': fields.boolean('Show the email will be sent'),
         'body': fields.html('Contents', help='Automatically sanitized HTML contents'),
     }
 
diff --git a/addons/crm_channel/wizard/crm_forward_to_partner_view.xml b/addons/crm_channel/wizard/crm_forward_to_partner_view.xml
index 8bb329611fd..11598558f00 100644
--- a/addons/crm_channel/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_channel/wizard/crm_forward_to_partner_view.xml
@@ -16,7 +16,7 @@
                         <group>
                         </group>
                     </group>
-                    <button name="action_clean_lines" string="Clean Unassigned" type="object" attrs="{'invisible': [('forward_type', 'in', ['single',False])]}"/>
+                    <!-- <button name="action_clean_lines" string="Clean Unassigned" type="object" attrs="{'invisible': [('forward_type', 'in', ['single',False])]}"/> -->
                     <field name="assignation_lines" attrs="{'invisible': [('forward_type', 'in', ['single',False])]}">
                         <tree create="false" editable="bottom">
                             <field name="lead_id" readonly="1" on_change="on_change_lead_id(lead_id)"/>
@@ -25,10 +25,8 @@
                             <field name="partner_location" readonly="1"/>
                         </tree>
                     </field>
-                    <field name="show_mail" />
-                    <label for="show_mail" />
-                    <notebook colspan="4" attrs="{'invisible': [('show_mail', '=', False)]}">
-                        <page string="Body">
+                    <notebook colspan="4" groups="base.group_no_one">
+                        <page string="Email Template">
                             <field name="body" readonly="1"/>
                         </page>
                     </notebook>

From 21dd35ede560a2f15a61525a9526566c1dc62e73 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Jun 2013 17:19:07 +0200
Subject: [PATCH 64/94] [ADD&FIX]crm_channel: add wizard for buttons interested
 & not, fix portal url

bzr revid: dle@openerp.com-20130620151907-qeu1c2wkk5vs72l7
---
 addons/crm_channel/__openerp__.py             |  1 +
 addons/crm_channel/crm_data.xml               |  6 +++
 addons/crm_channel/crm_lead.py                | 37 ++++++-------------
 addons/crm_channel/static/src/js/next.js      |  1 +
 addons/crm_channel/wizard/__init__.py         |  1 +
 .../wizard/crm_forward_to_partner.py          | 35 ++++++++----------
 .../wizard/crm_forward_to_partner_view.xml    |  1 -
 7 files changed, 36 insertions(+), 46 deletions(-)

diff --git a/addons/crm_channel/__openerp__.py b/addons/crm_channel/__openerp__.py
index c0c1e6ef30f..2d14e7caa22 100644
--- a/addons/crm_channel/__openerp__.py
+++ b/addons/crm_channel/__openerp__.py
@@ -43,6 +43,7 @@ You can also use the geolocalization without using the GPS coordinates.
         'security/ir.model.access.csv',
         'res_partner_view.xml',
         'wizard/crm_forward_to_partner_view.xml',
+        'wizard/crm_channel_interested_view.xml',
         'crm_lead_view.xml',
         'crm_channel_data.xml',
         'crm_data.xml',
diff --git a/addons/crm_channel/crm_data.xml b/addons/crm_channel/crm_data.xml
index 89c84bff9d2..31ad686e2d9 100644
--- a/addons/crm_channel/crm_data.xml
+++ b/addons/crm_channel/crm_data.xml
@@ -3,6 +3,12 @@
     <data noupdate="1">
 
         <!-- Crm stages -->
+        <record model="crm.case.stage" id="stage_portal_lead_assigned">
+            <field name="name">Assigned</field>
+            <field eval="1" name="case_default"/>
+            <field eval="0" name="probability"/>
+            <field eval="4" name="sequence"/>
+        </record>
         <record model="crm.case.stage" id="stage_portal_lead_recycle">
             <field name="name">To Recycle</field>
             <field eval="1" name="case_default"/>
diff --git a/addons/crm_channel/crm_lead.py b/addons/crm_channel/crm_lead.py
index d08425729a1..2639e92d60a 100644
--- a/addons/crm_channel/crm_lead.py
+++ b/addons/crm_channel/crm_lead.py
@@ -20,38 +20,25 @@
 ##############################################################################
 
 from openerp.osv import osv
-from openerp import SUPERUSER_ID
 from openerp.tools.translate import _
 
 
 class crm_lead(osv.osv):
     _inherit = 'crm.lead'
 
-    def case_interested(self, cr, uid, ids, context=None):
-        self.check_access_rights(cr, uid, 'write')
+    def get_interested_action(self, cr, uid, interested, context=None):
         try:
-            stage_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'stage_portal_lead_interested')[1]
+            model, action_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'crm_lead_channel_interested_act')
         except ValueError:
-            stage_id = False
-        if stage_id:
-            self.write(cr, SUPERUSER_ID, ids, {'stage_id': stage_id})
-        self.message_post(cr, uid, ids, body=_('I am interested by this lead'), context=context)
+            raise osv.except_osv(_('Error!'), _("The CRM Channel Interested Action is missing"))
+        action = self.pool[model].read(cr, uid, action_id, context=context)
+        action_context = eval(action['context'])
+        action_context['interested'] = interested
+        action['context'] = str(action_context)
+        return action
+
+    def case_interested(self, cr, uid, ids, context=None):
+        return self.get_interested_action(cr, uid, True, context=context)
 
     def case_disinterested(self, cr, uid, ids, context=None):
-        self.check_access_rights(cr, uid, 'write')
-        try:
-            stage_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'stage_portal_lead_recycle')[1]
-        except ValueError:
-            stage_id = False
-        values = {}
-        values = {'partner_assigned_id': False}
-        if stage_id:
-            values['stage_id'] = stage_id
-        self.message_post(cr, uid, ids, body=_('I am not interested by this lead'), context=context)
-        self.write(cr, SUPERUSER_ID, ids, values, context=context)
-        return {
-            'type': 'ir.actions.client',
-            'tag': 'next_or_list',
-            'params': {
-            },
-        }
+        return self.get_interested_action(cr, uid, False, context=context)
diff --git a/addons/crm_channel/static/src/js/next.js b/addons/crm_channel/static/src/js/next.js
index 4f0c58c0e18..53614c0ee64 100644
--- a/addons/crm_channel/static/src/js/next.js
+++ b/addons/crm_channel/static/src/js/next.js
@@ -7,6 +7,7 @@ openerp.crm_channel = function (instance) {
 		if (!form.dataset.ids.length){
 			parent.inner_widget.switch_mode('list');
 		}
+		parent.do_action({ type: 'ir.actions.act_window_close' });
 	};
 	instance.web.client_actions.add("next_or_list", "instance.crm_channel.next_or_list");
 }
\ No newline at end of file
diff --git a/addons/crm_channel/wizard/__init__.py b/addons/crm_channel/wizard/__init__.py
index 9224173145b..ab6c7b7f06a 100644
--- a/addons/crm_channel/wizard/__init__.py
+++ b/addons/crm_channel/wizard/__init__.py
@@ -20,3 +20,4 @@
 ##############################################################################
 
 import crm_forward_to_partner
+import crm_channel_interested
\ No newline at end of file
diff --git a/addons/crm_channel/wizard/crm_forward_to_partner.py b/addons/crm_channel/wizard/crm_forward_to_partner.py
index d54a96d527a..58501e511ab 100644
--- a/addons/crm_channel/wizard/crm_forward_to_partner.py
+++ b/addons/crm_channel/wizard/crm_forward_to_partner.py
@@ -28,8 +28,7 @@ class crm_lead_forward_to_partner(osv.TransientModel):
     """ Forward info history to partners. """
     _name = 'crm.lead.forward.to.partner'
 
-    def _convert_to_assignation_line(self, cr, uid, lead, partner):
-        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+    def _convert_to_assignation_line(self, cr, uid, lead, partner, context=None):
         lead_location = []
         partner_location = []
         if lead.country_id:
@@ -45,7 +44,7 @@ class crm_lead_forward_to_partner(osv.TransientModel):
                 'lead_location': ", ".join(lead_location),
                 'partner_assigned_id': partner and partner.id or False,
                 'partner_location': ", ".join(partner_location),
-                'lead_link': "%s/?db=%s#id=%s&model=crm.lead" % (base_url, cr.dbname, lead.id)
+                'lead_link': self.get_portal_url(cr, uid, lead.id, context=context),
                 }
 
     def default_get(self, cr, uid, fields, context=None):
@@ -89,10 +88,10 @@ class crm_lead_forward_to_partner(osv.TransientModel):
                                  _('The Forward Email Template is not in the database'))
         local_context = context.copy()
         if not (record.forward_type == 'single'):
-            no_email = []
+            no_email = set()
             for lead in record.assignation_lines:
                 if lead.partner_assigned_id and not lead.partner_assigned_id.email:
-                    no_email.append(lead.partner_assigned_id.name)
+                    no_email.add(lead.partner_assigned_id.name)
             if no_email:
                 raise osv.except_osv(_('Email Error'),
                                     ('Set an email address for the partner(s): %s' % ", ".join(no_email)))
@@ -113,29 +112,25 @@ class crm_lead_forward_to_partner(osv.TransientModel):
                     partner_leads['leads'].append(lead_details)
                 else:
                     partners_leads[partner.id] = {'partner': partner, 'leads': [lead_details]}
+        try:
+            stage_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'stage_portal_lead_assigned')[1]
+        except ValueError:
+            stage_id = False
         for partner_id, partner_leads in partners_leads.items():
             local_context['partner_id'] = partner_leads['partner']
             local_context['partner_leads'] = partner_leads['leads']
             email_template_obj.send_mail(cr, uid, template_id, ids[0], context=local_context)
             lead_ids = [lead['lead_id'].id for lead in partner_leads['leads']]
-            lead_obj.write(cr, uid, lead_ids, {'partner_assigned_id': partner_id, 'user_id': partner_leads['partner'].user_id.id})
+            lead_obj.write(cr, uid, lead_ids, {'partner_assigned_id': partner_id, 'user_id': partner_leads['partner'].user_id.id, 'stage_id': stage_id})
             self.pool.get('crm.lead').message_subscribe(cr, uid, lead_ids, [partner_id], context=context)
         return True
 
-    # def action_clean_lines(self, cr, uid, ids, context=None):
-    #     record = self.browse(cr, uid, ids[0], context=context)
-    #     invalid_lines = []
-    #     for line in record.assignation_lines:
-    #         if not line.partner_assigned_id:
-    #             invalid_lines.append((2, line.id))
-    #     self.write(cr, uid, ids[0], {'assignation_lines': invalid_lines}, context=context)
-    #     model, action_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'action_crm_send_mass_forward')
-    #     action = self.pool[model].read(cr, uid, action_id, context=context)
-    #     action['res_id'] = ids[0]
-    #     return action
-
-    def get_portal_url(self, cr, uid, ids, context=None):
-        portal_link = "%s/?db=%s" % (self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url'), cr.dbname)
+    def get_portal_url(self, cr, uid, lead_id, context=None):
+        try:
+            action_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'action_portal_leads')[1]
+        except ValueError:
+            action_id = False
+        portal_link = "%s/?db=%s#id=%s&action=%s&view_type=form" % (self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url'), cr.dbname, lead_id, action_id)
         return portal_link
 
     _columns = {
diff --git a/addons/crm_channel/wizard/crm_forward_to_partner_view.xml b/addons/crm_channel/wizard/crm_forward_to_partner_view.xml
index 11598558f00..26ad08f1528 100644
--- a/addons/crm_channel/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_channel/wizard/crm_forward_to_partner_view.xml
@@ -16,7 +16,6 @@
                         <group>
                         </group>
                     </group>
-                    <!-- <button name="action_clean_lines" string="Clean Unassigned" type="object" attrs="{'invisible': [('forward_type', 'in', ['single',False])]}"/> -->
                     <field name="assignation_lines" attrs="{'invisible': [('forward_type', 'in', ['single',False])]}">
                         <tree create="false" editable="bottom">
                             <field name="lead_id" readonly="1" on_change="on_change_lead_id(lead_id)"/>

From 5fcad3d41043daec648eda7676793d05456331b3 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Jun 2013 17:19:34 +0200
Subject: [PATCH 65/94] [FIX]crm_channel: forward to partner not changing stage
 if opps. + informing in chatter if the lead was contacted or not when not
 interessted

bzr revid: dle@openerp.com-20130620151934-c9312wa6qkg1yrn3
---
 .../wizard/crm_forward_to_partner.py          | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/addons/crm_channel/wizard/crm_forward_to_partner.py b/addons/crm_channel/wizard/crm_forward_to_partner.py
index 58501e511ab..bf26d64d72f 100644
--- a/addons/crm_channel/wizard/crm_forward_to_partner.py
+++ b/addons/crm_channel/wizard/crm_forward_to_partner.py
@@ -44,7 +44,7 @@ class crm_lead_forward_to_partner(osv.TransientModel):
                 'lead_location': ", ".join(lead_location),
                 'partner_assigned_id': partner and partner.id or False,
                 'partner_location': ", ".join(partner_location),
-                'lead_link': self.get_portal_url(cr, uid, lead.id, context=context),
+                'lead_link': self.get_lead_portal_url(cr, uid, lead.id, lead.type, context=context),
                 }
 
     def default_get(self, cr, uid, fields, context=None):
@@ -112,27 +112,38 @@ class crm_lead_forward_to_partner(osv.TransientModel):
                     partner_leads['leads'].append(lead_details)
                 else:
                     partners_leads[partner.id] = {'partner': partner, 'leads': [lead_details]}
-        try:
-            stage_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'stage_portal_lead_assigned')[1]
-        except ValueError:
-            stage_id = False
+        stage_id = False
+        if record.assignation_lines and record.assignation_lines[0].lead_id.type == 'lead':
+            try:
+                stage_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'stage_portal_lead_assigned')[1]
+            except ValueError:
+                pass
+
         for partner_id, partner_leads in partners_leads.items():
             local_context['partner_id'] = partner_leads['partner']
             local_context['partner_leads'] = partner_leads['leads']
             email_template_obj.send_mail(cr, uid, template_id, ids[0], context=local_context)
             lead_ids = [lead['lead_id'].id for lead in partner_leads['leads']]
-            lead_obj.write(cr, uid, lead_ids, {'partner_assigned_id': partner_id, 'user_id': partner_leads['partner'].user_id.id, 'stage_id': stage_id})
+            values = {'partner_assigned_id': partner_id, 'user_id': partner_leads['partner'].user_id.id}
+            if stage_id:
+                values['stage_id'] = stage_id
+            lead_obj.write(cr, uid, lead_ids, values)
             self.pool.get('crm.lead').message_subscribe(cr, uid, lead_ids, [partner_id], context=context)
         return True
 
-    def get_portal_url(self, cr, uid, lead_id, context=None):
+    def get_lead_portal_url(self, cr, uid, lead_id, type, context=None):
+        action = type == 'opportunity' and 'action_portal_opportunities' or 'action_portal_leads'
         try:
-            action_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'action_portal_leads')[1]
+            action_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', action)[1]
         except ValueError:
             action_id = False
         portal_link = "%s/?db=%s#id=%s&action=%s&view_type=form" % (self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url'), cr.dbname, lead_id, action_id)
         return portal_link
 
+    def get_portal_url(self, cr, uid, ids, context=None):
+        portal_link = "%s/?db=%s" % (self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url'), cr.dbname)
+        return portal_link
+
     _columns = {
         'forward_type': fields.selection([('single', 'a single partner: manual selection of partner'), ('assigned', "several partners: automatic assignation, using GPS coordinates and partner's grades"), ], 'Forward selected leads to'),
         'partner_id': fields.many2one('res.partner', 'Forward Leads To'),

From d144d320ecd34bc1941c0a4dc85829fd155d2ed8 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Jun 2013 17:20:07 +0200
Subject: [PATCH 66/94] [FIX]crm_channel: view and typo imp

bzr revid: dle@openerp.com-20130620152007-v8yt5kwdkgeh1w8i
---
 addons/crm/crm_lead.py                        |  1 -
 addons/crm/crm_lead_data.xml                  |  6 --
 addons/crm_channel/crm_data.xml               | 11 +---
 addons/crm_channel/crm_portal_view.xml        | 55 +++++++------------
 .../data/lead_mail_template_data.xml          |  2 +-
 5 files changed, 24 insertions(+), 51 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index b8673e73927..44ada2ffcc0 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -719,7 +719,6 @@ class crm_lead(base_stage, format_address, osv.osv):
                 continue
             vals = self._convert_opportunity_data(cr, uid, lead, customer, section_id, context=context)
             self.write(cr, uid, [lead.id], vals, context=context)
-        self.message_post(cr, uid, ids, body=_("Lead <b>converted into an Opportunity</b>"), subtype="crm.mt_lead_convert_to_opportunity", context=context)
 
         if user_ids or section_id:
             self.allocate_salesman(cr, uid, ids, user_ids, section_id, context=context)
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 0979a94eb3f..91644dcafac 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -163,12 +163,6 @@
             <field name="default" eval="False"/>
             <field name="description">Opportunity created</field>
         </record>
-        <record id="mt_lead_convert_to_opportunity" model="mail.message.subtype">
-            <field name="name">Lead to Opportunity</field>
-            <field name="res_model">crm.lead</field>
-            <field name="default" eval="False"/>
-            <field name="description">Lead converted into an opportunity</field>
-        </record>
         <record id="mt_lead_stage" model="mail.message.subtype">
             <field name="name">Stage Changed</field>
             <field name="res_model">crm.lead</field>
diff --git a/addons/crm_channel/crm_data.xml b/addons/crm_channel/crm_data.xml
index 31ad686e2d9..6cdb6e6999d 100644
--- a/addons/crm_channel/crm_data.xml
+++ b/addons/crm_channel/crm_data.xml
@@ -1,25 +1,20 @@
 <?xml version="1.0"?>
 <openerp>
-    <data noupdate="1">
-
+    <data>
         <!-- Crm stages -->
         <record model="crm.case.stage" id="stage_portal_lead_assigned">
             <field name="name">Assigned</field>
             <field eval="1" name="case_default"/>
             <field eval="0" name="probability"/>
             <field eval="4" name="sequence"/>
+            <field name="type">lead</field>
         </record>
         <record model="crm.case.stage" id="stage_portal_lead_recycle">
             <field name="name">To Recycle</field>
             <field eval="1" name="case_default"/>
             <field eval="0" name="probability"/>
             <field eval="6" name="sequence"/>
-        </record>
-        <record model="crm.case.stage" id="stage_portal_lead_interested">
-            <field name="name">Interested</field>
-            <field eval="1" name="case_default"/>
-            <field eval="10" name="probability"/>
-            <field eval="5" name="sequence"/>
+            <field name="type">lead</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/crm_channel/crm_portal_view.xml b/addons/crm_channel/crm_portal_view.xml
index d2fe7c4daa5..a8d342ebb94 100644
--- a/addons/crm_channel/crm_portal_view.xml
+++ b/addons/crm_channel/crm_portal_view.xml
@@ -38,42 +38,27 @@
                 </header>
                 <sheet>
                   <group>
-                    <field name="priority" readonly="1"/>
-                    <field name="type" invisible="1" readonly="1"/>
-                    <field name="partner_name" string="Partner Name" readonly="1"/>
-                    <field name="stage_id" string="Interest Status"/>
+                    <group>
+                      <field name="partner_name" string="Partner Name" readonly="1"/>
+                      <field name="title" widget="selection" readonly="1"/>
+                      <field name="contact_name" readonly="1"/>
+                      <field name="function" readonly="1"/>
+                      <field name="email_from" readonly="1"/>
+                      <field name="phone" readonly="1"/>
+                      <field name="fax" readonly="1"/>
+                      <field name="mobile" readonly="1"/>
+                    </group>
+                    <group>
+                      <field name="street" readonly="1"/>
+                      <field name="street2" readonly="1"/>
+                      <field name="zip" readonly="1"/>
+                      <field name="city" readonly="1"/>
+                      <field name="country_id" readonly="1"/>
+                      <field name="state_id" readonly="1"/>
+                    </group>
+                    <label for="description" colspan="2"/>
+                    <field name="description" nolabel="1" colspan="2"/>
                   </group>
-                  <notebook>
-                    <page string='Lead'>
-                      <group col="2">
-                        <separator string="Contact" colspan="2"/>
-                        <group col="2">
-                           <field name="contact_name" readonly="1"/>
-                           <field domain="[('domain', '=', 'contact')]" name="title" widget="selection" readonly="1"/>
-                           <field name="function" readonly="1"/>
-                           <field name="street" readonly="1"/>
-                           <field name="street2" readonly="1"/>
-                        </group>
-                        <group col="2">
-                           <field name="zip" readonly="1"/>
-                           <field name="city" readonly="1"/>
-                           <field name="country_id" readonly="1"/>
-                           <field name="state_id" readonly="1"/>
-                        </group>
-                      </group>
-                      <group col="2">
-                        <group col="2">
-                           <separator string="Communication" colspan="2"/>
-                           <field name="email_from" readonly="1"/>
-                           <field name="phone" readonly="1"/>
-                           <field name="fax" readonly="1"/>
-                           <field name="mobile" readonly="1"/>
-                        </group>
-                      </group>
-                      <separator string="Details" />
-                      <field name="description" nolabel="1" />
-                    </page>
-                  </notebook>
                 </sheet>
               </form>
             </field>
diff --git a/addons/crm_channel/data/lead_mail_template_data.xml b/addons/crm_channel/data/lead_mail_template_data.xml
index df9d63cbf43..7fb38fee3aa 100644
--- a/addons/crm_channel/data/lead_mail_template_data.xml
+++ b/addons/crm_channel/data/lead_mail_template_data.xml
@@ -23,7 +23,7 @@
 
 <p>Please connect to your <a href="${object.get_portal_url()}">Partner Portal</a> to get details. On each lead are two buttons on the top left corner that you should press after having contacted the lead: "I'm interested" & "I'm not interested".</p>
 
-<p>If you did not contact the lead after 4 weeks (20 days), the lead will be send to another partner.</p>
+<p>The lead will be send to another partner if you do not contact the lead before 20 days.</p>
 
 <p>Thanks,</p>
 

From 1b96cdd626d92ec4337ec95b5611e056e6ebb925 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Jun 2013 17:21:47 +0200
Subject: [PATCH 67/94] [FIX]crm_channel: missing files (bzr add forget) +
 sequence of stage + remove of useless data from crm

bzr revid: dle@openerp.com-20130620152147-uic86m8pbq3x471u
---
 addons/crm/crm_lead_data.xml                  |  7 --
 addons/crm_channel/crm_data.xml               |  4 +-
 .../wizard/crm_channel_interested.py          | 77 +++++++++++++++++++
 .../wizard/crm_channel_interested_view.xml    | 45 +++++++++++
 4 files changed, 124 insertions(+), 9 deletions(-)
 create mode 100644 addons/crm_channel/wizard/crm_channel_interested.py
 create mode 100644 addons/crm_channel/wizard/crm_channel_interested_view.xml

diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 91644dcafac..92914542d9d 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -189,13 +189,6 @@
             <field name="parent_id" eval="ref('mt_lead_create')"/>
             <field name="relation_field">section_id</field>
         </record>
-        <record id="mt_salesteam_lead_opportunity" model="mail.message.subtype">
-            <field name="name">Lead to Opportunity</field>
-            <field name="default" eval="False"/>
-            <field name="res_model">crm.case.section</field>
-            <field name="parent_id" eval="ref('mt_lead_convert_to_opportunity')"/>
-            <field name="relation_field">section_id</field>
-        </record>
         <record id="mt_salesteam_lead_stage" model="mail.message.subtype">
             <field name="name">Opportunity Stage Changed</field>
             <field name="res_model">crm.case.section</field>
diff --git a/addons/crm_channel/crm_data.xml b/addons/crm_channel/crm_data.xml
index 6cdb6e6999d..a3a8d140f96 100644
--- a/addons/crm_channel/crm_data.xml
+++ b/addons/crm_channel/crm_data.xml
@@ -6,14 +6,14 @@
             <field name="name">Assigned</field>
             <field eval="1" name="case_default"/>
             <field eval="0" name="probability"/>
-            <field eval="4" name="sequence"/>
+            <field eval="12" name="sequence"/>
             <field name="type">lead</field>
         </record>
         <record model="crm.case.stage" id="stage_portal_lead_recycle">
             <field name="name">To Recycle</field>
             <field eval="1" name="case_default"/>
             <field eval="0" name="probability"/>
-            <field eval="6" name="sequence"/>
+            <field eval="11" name="sequence"/>
             <field name="type">lead</field>
         </record>
     </data>
diff --git a/addons/crm_channel/wizard/crm_channel_interested.py b/addons/crm_channel/wizard/crm_channel_interested.py
new file mode 100644
index 00000000000..ab0e1d5d735
--- /dev/null
+++ b/addons/crm_channel/wizard/crm_channel_interested.py
@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp import SUPERUSER_ID
+
+
+class crm_lead_forward_to_partner(osv.TransientModel):
+    """ Forward info history to partners. """
+    _name = 'crm.lead.channel.interested'
+    _columns = {
+        'interested': fields.boolean('Interested by this lead'),
+        'contacted': fields.boolean('Did you contact the lead?', help="The lead has been contacted"),
+        'comment': fields.text('Comment', help="What are the elements that have led to this decision?", required=True),
+    }
+    _defaults = {
+        'interested': lambda self, cr, uid, c: c.get('interested', True),
+        'contacted': False,
+    }
+
+    def action_confirm(self, cr, uid, ids, context=None):
+        wizard = self.browse(cr, uid, ids[0], context=context)
+        if wizard.interested and not wizard.contacted:
+            raise osv.except_osv(_('Error!'), _("You must contact the lead before saying that you are interested"))
+        lead_obj = self.pool.get('crm.lead')
+        lead_obj.check_access_rights(cr, uid, 'write')
+        if wizard.interested:
+            message = _('<p>I am interested by this lead.</p>')
+            values = {}
+        else:
+            stage = 'stage_portal_lead_recycle'
+            message = _('<p>I am not interested by this lead. I %scontacted the lead.</p>') % (not wizard.contacted and 'have not ' or '')
+            values = {'partner_assigned_id': False}
+            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+            partner_id = user.parent_id.id or user.partner_id.id
+            partner_ids = self.pool.get('res.partner').search(cr, SUPERUSER_ID, ['|', ('id', '=', partner_id), ('parent_id', '=', partner_id)], context=context)
+            lead_obj.message_unsubscribe(cr, SUPERUSER_ID, context.get('active_ids'), partner_ids, context=None)
+            try:
+                stage_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', stage)[1]
+            except ValueError:
+                stage_id = False
+            if stage_id:
+                values.update({'stage_id': stage_id})
+        if wizard.comment:
+            message += '<p>%s</p>' % wizard.comment
+        lead_obj.message_post(cr, uid, context.get('active_ids'), body=message, context=context)
+        if values:
+            lead_obj.write(cr, SUPERUSER_ID, context.get('active_ids'), values)
+        if wizard.interested:
+            for lead in lead_obj.browse(cr, uid, context.get('active_ids'), context=context):
+                lead_obj.convert_opportunity(cr, SUPERUSER_ID, [lead.id], lead.partner_id and lead.partner_id.id or None, context=None)
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'next_or_list',
+            'params': {
+            },
+        }
diff --git a/addons/crm_channel/wizard/crm_channel_interested_view.xml b/addons/crm_channel/wizard/crm_channel_interested_view.xml
new file mode 100644
index 00000000000..400e02cd48a
--- /dev/null
+++ b/addons/crm_channel/wizard/crm_channel_interested_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+    	<record model="ir.ui.view" id="crm_lead_channel_interested_form">
+    		<field name="name">crm_lead_channel_interested</field>
+            <field name="model">crm.lead.channel.interested</field>
+            <field name="arch" type="xml">
+            	<form string="Send Mail" version="7.0">
+            		<group col="1">
+                        <field name="interested" nolabel="1" invisible="1"/>
+                        <div>
+                            <div invisible="context.get('interested', True)">
+                            	<label for="comment" string="Why aren't you interested by this lead?" />	
+                            </div>
+                            <div invisible="not context.get('interested', True)">
+                            	<label for="comment" string="What is the next action? When? What is the expected revenue?" />
+                            </div>
+                        </div>
+                        <field name="comment" nolabel="1"/>
+                        <div class="oe_inline">
+                            <field name="contacted" nolabel="1" string="Do you have contacted the customer?"/>
+                            <label for="contacted" />
+                        </div>
+                        <p class="oe_grey" invisible="not context.get('interested', True)">
+                            Once the lead is processed, it will be in your "Opportunities" menu.
+                        </p>
+                    </group>
+                    <footer>
+                        <button name="action_confirm" string="Confirm" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" special="cancel" class="oe_link"/>
+                    </footer>
+            	</form>
+            </field>
+    	</record>
+    	<record model="ir.actions.act_window" id="crm_lead_channel_interested_act">
+            <field name="name">Lead Feedback</field>
+            <field name="res_model">crm.lead.channel.interested</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="crm_lead_channel_interested_form"/>
+            <field name="target">new</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

From bfc0ad948c4e8097ea4e131567c24b5950d27fdd Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Jun 2013 17:22:31 +0200
Subject: [PATCH 68/94] [IMP]crm_channel: merge of similar files

bzr revid: dle@openerp.com-20130620152231-i0t1h4v4xo689rpl
---
 addons/crm_channel/__openerp__.py             |  1 -
 addons/crm_channel/crm_channel_data.xml       | 77 +++++++++++--------
 addons/crm_channel/crm_data.xml               | 20 -----
 .../data/lead_mail_template_data.xml          | 39 ----------
 4 files changed, 43 insertions(+), 94 deletions(-)
 delete mode 100644 addons/crm_channel/crm_data.xml
 delete mode 100644 addons/crm_channel/data/lead_mail_template_data.xml

diff --git a/addons/crm_channel/__openerp__.py b/addons/crm_channel/__openerp__.py
index 2d14e7caa22..35286572271 100644
--- a/addons/crm_channel/__openerp__.py
+++ b/addons/crm_channel/__openerp__.py
@@ -51,7 +51,6 @@ You can also use the geolocalization without using the GPS coordinates.
         'portal_data.xml',
         'report/crm_lead_report_view.xml',
         'report/crm_partner_report_view.xml',
-        'data/lead_mail_template_data.xml',
     ],
     'js': [
         'static/src/js/next.js',
diff --git a/addons/crm_channel/crm_channel_data.xml b/addons/crm_channel/crm_channel_data.xml
index 22d87293155..cac60d3a2ee 100644
--- a/addons/crm_channel/crm_channel_data.xml
+++ b/addons/crm_channel/crm_channel_data.xml
@@ -1,44 +1,53 @@
-<?xml version="1.0" encoding='UTF-8'?>
+<?xml version="1.0" ?>
 <openerp>
     <data>
-        <record id="crm_channel_email_template" model="email.template">
-            <field name="name">Lead forward</field>
-            <field name="email_from"></field>
-            <field name="subject">Fwd: Lead: ${object.name}</field>
-            <field name="email_to"></field>
-            <field name="lang"></field>
-            <field name="model_id" ref="crm.model_crm_lead"/>
+        <record model="crm.case.stage" id="stage_portal_lead_assigned">
+            <field name="name">Assigned</field>
+            <field eval="1" name="case_default"/>
+            <field eval="0" name="probability"/>
+            <field eval="12" name="sequence"/>
+            <field name="type">lead</field>
+        </record>
+        <record model="crm.case.stage" id="stage_portal_lead_recycle">
+            <field name="name">To Recycle</field>
+            <field eval="1" name="case_default"/>
+            <field eval="0" name="probability"/>
+            <field eval="11" name="sequence"/>
+            <field name="type">lead</field>
+        </record>
+        <record id="email_template_lead_forward_mail" model="email.template">
+            <field name="name">Lead Mass Mail</field>
+            <field name="model_id" model="ir.model" search="[('name', '=', 'crm.lead.forward.to.partner')]"></field>
             <field name="auto_delete" eval="True"/>
+            <field name="email_to">${ctx['partner_id'].email}</field>
+            <field name="email_from">${user.email or ''}</field>
+            <field name="subject">Fwd: Lead: ${ctx['partner_id'].name}</field>
             <field name="body_html"><![CDATA[
-Hello ${object.partner_assigned_id.name},
-<p>
-Here is a lead that might interest you.
-</p>
-<p>
-Please keep me informed about your actions about it so that I can keep an
-accurate follow-up of it and help you in the sale cycle.
-</p>
-<p>
-Your account manager,<br/>
-${object.user_id.name},<br/>
-${object.user_id.email}
-</p>
+            
+<p>Hello,</p>
 
-<p>
-${ctx["mail_body"].replace('\n','<br>') | safe}
-</p>
 
-% if ctx["history_mode"] in ('whole'):
-    % for message in object.message_ids:
-        ---- Original Message (${message.date or ''}) ----<br/>
-        ${message.body | safe}
-    % endfor
-% endif
-% if ctx['history_mode'] == 'latest':
-    ---- Original Message (${object.message_ids[0].date or ''}) ----<br/>
-    ${object.message_ids[0].body | safe}
+<p>We have been contacted by those prospects that are in your region. Thus, the following leads have been assigned to ${ctx['partner_id'].name}:</p>
+
+<ol>
+% for lead in ctx['partner_leads']:
+     <li><a href="${lead.lead_link}">${lead.lead_id.name or 'Subject Undefined'}</a>, ${lead.lead_id.contact_name or 'Contact Name Undefined'}, ${lead.lead_id.country_id and lead.lead_id.country_id.name or 'Country Undefined' }, ${lead.lead_id.email_from or 'Email Undefined'}, ${lead.lead_id.phone or ''} </li></br>
+% endfor
+</ol>
+
+<p>Please connect to your <a href="${object.get_portal_url()}">Partner Portal</a> to get details. On each lead are two buttons on the top left corner that you should press after having contacted the lead: "I'm interested" & "I'm not interested".</p>
+
+<p>The lead will be send to another partner if you do not contact the lead before 20 days.</p>
+
+<p>Thanks,</p>
+
+<pre>
+${ctx['partner_id'].user_id and ctx['partner_id'].user_id.signature or 'The OpenERP Team'}
+</pre>
+% if not ctx['partner_id'].user_id:
+PS: It looks like you do not have an account manager assigned to you, please contact us.
 % endif
             ]]></field>
         </record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/crm_channel/crm_data.xml b/addons/crm_channel/crm_data.xml
deleted file mode 100644
index a3a8d140f96..00000000000
--- a/addons/crm_channel/crm_data.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <!-- Crm stages -->
-        <record model="crm.case.stage" id="stage_portal_lead_assigned">
-            <field name="name">Assigned</field>
-            <field eval="1" name="case_default"/>
-            <field eval="0" name="probability"/>
-            <field eval="12" name="sequence"/>
-            <field name="type">lead</field>
-        </record>
-        <record model="crm.case.stage" id="stage_portal_lead_recycle">
-            <field name="name">To Recycle</field>
-            <field eval="1" name="case_default"/>
-            <field eval="0" name="probability"/>
-            <field eval="11" name="sequence"/>
-            <field name="type">lead</field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/crm_channel/data/lead_mail_template_data.xml b/addons/crm_channel/data/lead_mail_template_data.xml
deleted file mode 100644
index 7fb38fee3aa..00000000000
--- a/addons/crm_channel/data/lead_mail_template_data.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data noupdate="0">
-      <record id="email_template_lead_forward_mail" model="email.template">
-            <field name="name">Lead Mass Mail</field>
-            <field name="model_id" model="ir.model" search="[('name', '=', 'crm.lead.forward.to.partner')]"></field>
-            <field name="auto_delete" eval="True"/>
-            <field name="email_to">${ctx['partner_id'].email}</field>
-            <field name="email_from">${user.email or ''}</field>
-            <field name="subject">Fwd: Lead: ${ctx['partner_id'].name}</field>
-            <field name="body_html"><![CDATA[
-            
-<p>Hello,</p>
-
-
-<p>We have been contacted by those prospects that are in your region. Thus, the following leads have been assigned to ${ctx['partner_id'].name}:</p>
-
-<ol>
-% for lead in ctx['partner_leads']:
-     <li><a href="${lead.lead_link}">${lead.lead_id.name or 'Subject Undefined'}</a>, ${lead.lead_id.contact_name or 'Contact Name Undefined'}, ${lead.lead_id.country_id and lead.lead_id.country_id.name or 'Country Undefined' }, ${lead.lead_id.email_from or 'Email Undefined'}, ${lead.lead_id.phone or ''} </li></br>
-% endfor
-</ol>
-
-<p>Please connect to your <a href="${object.get_portal_url()}">Partner Portal</a> to get details. On each lead are two buttons on the top left corner that you should press after having contacted the lead: "I'm interested" & "I'm not interested".</p>
-
-<p>The lead will be send to another partner if you do not contact the lead before 20 days.</p>
-
-<p>Thanks,</p>
-
-<pre>
-${ctx['partner_id'].user_id and ctx['partner_id'].user_id.signature or 'The OpenERP Team'}
-</pre>
-% if not ctx['partner_id'].user_id:
-PS: It looks like you do not have an account manager assigned to you, please contact us.
-% endif
-            ]]></field>
-        </record>
-    </data>
-</openerp>

From 1a8fa4dcbeb7b0551e93f411b0bab7e732c7f55e Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Jun 2013 17:24:02 +0200
Subject: [PATCH 69/94] [FIX]crm_channel: remove removed files from
 __openerp__.py

bzr revid: dle@openerp.com-20130620152402-uza52w5xiyr6vpyt
---
 addons/crm_channel/__openerp__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/crm_channel/__openerp__.py b/addons/crm_channel/__openerp__.py
index 35286572271..0c3115ee0aa 100644
--- a/addons/crm_channel/__openerp__.py
+++ b/addons/crm_channel/__openerp__.py
@@ -46,7 +46,6 @@ You can also use the geolocalization without using the GPS coordinates.
         'wizard/crm_channel_interested_view.xml',
         'crm_lead_view.xml',
         'crm_channel_data.xml',
-        'crm_data.xml',
         'crm_portal_view.xml',
         'portal_data.xml',
         'report/crm_lead_report_view.xml',

From d6ce1e643f607cfc5e980302f6fbbab22dfef05c Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Jun 2013 17:24:29 +0200
Subject: [PATCH 70/94] [FIX]crm_channel: email inform when the user has no
 portal access

bzr revid: dle@openerp.com-20130620152429-stiad890f688df5o
---
 addons/crm_channel/crm_channel_data.xml             | 12 +++++++++---
 addons/crm_channel/wizard/crm_forward_to_partner.py | 12 ++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/addons/crm_channel/crm_channel_data.xml b/addons/crm_channel/crm_channel_data.xml
index cac60d3a2ee..3f374fd26d4 100644
--- a/addons/crm_channel/crm_channel_data.xml
+++ b/addons/crm_channel/crm_channel_data.xml
@@ -35,14 +35,20 @@
 % endfor
 </ol>
 
+% if ctx.get('partner_in_portal'):
 <p>Please connect to your <a href="${object.get_portal_url()}">Partner Portal</a> to get details. On each lead are two buttons on the top left corner that you should press after having contacted the lead: "I'm interested" & "I'm not interested".</p>
-
-<p>The lead will be send to another partner if you do not contact the lead before 20 days.</p>
+% else:
+<p>
+    You do not have yet a Portal access to our database. Please contact 
+    ${ctx['partner_id'].user_id and ctx['partner_id'].user_id.email and 'your account manager %s (%s)' % (ctx['partner_id'].user_id.name,ctx['partner_id'].user_id.email) or 'us'}.
+</p>
+% endif
+<p>The lead will be sent to another partner if you do not contact the lead before 20 days.</p>
 
 <p>Thanks,</p>
 
 <pre>
-${ctx['partner_id'].user_id and ctx['partner_id'].user_id.signature or 'The OpenERP Team'}
+${ctx['partner_id'].user_id and ctx['partner_id'].user_id.signature or ''}
 </pre>
 % if not ctx['partner_id'].user_id:
 PS: It looks like you do not have an account manager assigned to you, please contact us.
diff --git a/addons/crm_channel/wizard/crm_forward_to_partner.py b/addons/crm_channel/wizard/crm_forward_to_partner.py
index bf26d64d72f..6dd30e0a95a 100644
--- a/addons/crm_channel/wizard/crm_forward_to_partner.py
+++ b/addons/crm_channel/wizard/crm_forward_to_partner.py
@@ -86,6 +86,12 @@ class crm_lead_forward_to_partner(osv.TransientModel):
         except ValueError:
             raise osv.except_osv(_('Email Template Error'),
                                  _('The Forward Email Template is not in the database'))
+        try:
+            portal_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'portal', 'group_portal')[1]
+        except ValueError:
+            raise osv.except_osv(_('Portal Group Error'),
+                                 _('The Portal group cannot be found'))
+
         local_context = context.copy()
         if not (record.forward_type == 'single'):
             no_email = set()
@@ -120,8 +126,14 @@ class crm_lead_forward_to_partner(osv.TransientModel):
                 pass
 
         for partner_id, partner_leads in partners_leads.items():
+            in_portal = False
+            for contact in (partner.child_ids or [partner]):
+                if contact.user_ids:
+                    in_portal = portal_id in [g.id for g in contact.user_ids[0].groups_id]
+
             local_context['partner_id'] = partner_leads['partner']
             local_context['partner_leads'] = partner_leads['leads']
+            local_context['partner_in_portal'] = in_portal
             email_template_obj.send_mail(cr, uid, template_id, ids[0], context=local_context)
             lead_ids = [lead['lead_id'].id for lead in partner_leads['leads']]
             values = {'partner_assigned_id': partner_id, 'user_id': partner_leads['partner'].user_id.id}

From 00528bc4f91e99e07f89a21ee9c40460f23b9a43 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 20 Jun 2013 18:19:45 +0200
Subject: [PATCH 71/94] Re-created magic inheritance of controllers

bzr revid: nicolas.vanhoren@openerp.com-20130620161945-r8a93itijdrc3ut0
---
 addons/web/http.py | 71 ++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 37 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index de3fb1386e6..b42a7d7d0eb 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -549,20 +549,17 @@ class ControllerType(type):
         class_path = name_class[0].split(".")
         if not class_path[:2] == ["openerp", "addons"]:
             return
+        # we want to know all modules that have controllers
         module = class_path[2]
+        controllers_per_module.setdefault(module, [])
+        # but we only store controllers directly inheriting from Controller
+        if not "Controller" in globals() or not Controller in bases:
+            return
         controllers_per_module.setdefault(module, []).append(name_class)
 
 class Controller(object):
     __metaclass__ = ControllerType
 
-    """def __new__(cls, *args, **kwargs):
-        subclasses = [c for c in cls.__subclasses__() if getattr(c, "_cp_path", None) == getattr(cls, "_cp_path", None)]
-        if subclasses:
-            name = "%s (extended by %s)" % (cls.__name__, ', '.join(sub.__name__ for sub in subclasses))
-            cls = type(name, tuple(reversed(subclasses)), {})
-
-        return object.__new__(cls)"""
-
     def get_wrapped_method(self, name):
         if name in self.__class__._methods_wrapper:
             return functools.partial(self.__class__._methods_wrapper[name], self)
@@ -800,25 +797,36 @@ class Root(object):
     def _build_router(self, db):
         _logger.info("Generating routing configuration for database %s" % db)
         routing_map = routing.Map()
+
+        def gen(modules, nodb_only):
+            for module in modules:
+                for v in controllers_per_module[module]:
+                    cls = v[1]
+
+                    subclasses = cls.__subclasses__()
+                    subclasses = [c for c in subclasses if c.__module__.split(".")[:2] == ["openerp", "addons"] and \
+                        cls.__module__.split(".")[2] in modules]
+                    if subclasses:
+                        name = "%s (extended by %s)" % (cls.__name__, ', '.join(sub.__name__ for sub in subclasses))
+                        cls = type(name, tuple(reversed(subclasses)), {})
+
+                    o = cls()
+                    members = inspect.getmembers(o)
+                    for mk, mv in members:
+                        if inspect.ismethod(mv) and getattr(mv, 'exposed', False) and \
+                                nodb_only == (getattr(mv, 'auth', None) == "nodb"):
+                            function = (o.get_wrapped_method(mk), mv)
+                            for url in mv.routes:
+                                if getattr(mv, "combine", False):
+                                    url = os.path.join(o._cp_path, url)
+                                    if url.endswith("/") and len(url) > 1:
+                                        url = url[: -1]
+                                routing_map.add(routing.Rule(url, endpoint=function))
+
         modules_set = set(controllers_per_module.keys())
         modules_set -= set("web")
-
-        modules = ["web"] + sorted(modules_set)
         # building all nodb methods
-        for module in modules:
-            for v in controllers_per_module[module]:
-                members = inspect.getmembers(v[1]())
-                for mk, mv in members:
-                    if inspect.ismethod(mv) and getattr(mv, 'exposed', False) and getattr(mv, 'auth', None) == "nodb":
-                        o = v[1]()
-                        function = (o.get_wrapped_method(mk), mv)
-                        for url in mv.routes:
-                            if getattr(mv, "combine", False):
-                                url = os.path.join(o._cp_path, url)
-                                if url.endswith("/") and len(url) > 1:
-                                    url = url[: -1]
-                            routing_map.add(routing.Rule(url, endpoint=function))
-
+        gen(["web"] + sorted(modules_set), True)
         if not db:
             return routing_map
 
@@ -830,19 +838,8 @@ class Root(object):
             modules_set = modules_set.intersection(set(installed))
         modules = ["web"] + sorted(modules_set)
         # building all other methods
-        for module in modules:
-            for v in controllers_per_module[module]:
-                o = v[1]()
-                members = inspect.getmembers(o)
-                for mk, mv in members:
-                    if inspect.ismethod(mv) and getattr(mv, 'exposed', False) and getattr(mv, 'auth', None) != "nodb":
-                        function = (o.get_wrapped_method(mk), mv)
-                        for url in mv.routes:
-                            if getattr(mv, "combine", False):
-                                url = os.path.join(o._cp_path, url)
-                                if url.endswith("/") and len(url) > 1:
-                                    url = url[: -1]
-                            routing_map.add(routing.Rule(url, endpoint=function))
+        gen(["web"] + sorted(modules_set), False)
+
         return routing_map
 
     def get_db_router(self, db):

From 73c447f843e76f5499abee4f980b3422511244ba Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 20 Jun 2013 18:51:58 +0200
Subject: [PATCH 72/94] added doc and corrected existing one

bzr revid: nicolas.vanhoren@openerp.com-20130620165158-554jlc1cn7acgrua
---
 addons/web/doc/web_controllers.rst | 32 +++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/addons/web/doc/web_controllers.rst b/addons/web/doc/web_controllers.rst
index 34655b99674..c35bd66eef4 100644
--- a/addons/web/doc/web_controllers.rst
+++ b/addons/web/doc/web_controllers.rst
@@ -48,7 +48,7 @@ In your controllers file, you can now declare a controller this way:
 
     class MyController(http.Controller):
 
-        @http.route('/my_url/some_html', type="html")
+        @http.route('/my_url/some_html', type="http")
         def some_html(self):
             return "<h1>This is a test</h1>"
 
@@ -62,12 +62,12 @@ url to match. As example, the ``some_html()`` method will be called a client que
 Pure HTTP Requests
 ------------------
 
-You can define methods to get any normal http requests by passing ``'html'`` to the ``type`` argument of
+You can define methods to get any normal http requests by passing ``'http'`` to the ``type`` argument of
 ``http.route()``. When doing so, you get the HTTP parameters as named parameters of the method:
 
 ::
 
-    @http.route('/say_hello', type="html")
+    @http.route('/say_hello', type="http")
     def say_hello(self, name):
         return "<h1>Hello %s</h1>" % name
 
@@ -93,7 +93,7 @@ Any URL passed to ``http.route()`` can contain patterns. Example:
 
 ::
 
-    @http.route('/files/<path:file_path>', type="html")
+    @http.route('/files/<path:file_path>', type="http")
     def files(self, file_path):
         ... # return a file identified by the path store in the 'my_path' variable
 
@@ -106,7 +106,7 @@ Also note you can pass multiple urls to ``http.route()``:
 
 ::
 
-    @http.route(['/files/<path:file_path>', '/other_url/<path:file_path>'], type="html")
+    @http.route(['/files/<path:file_path>', '/other_url/<path:file_path>'], type="http")
     def files(self, file_path):
         ...
 
@@ -117,7 +117,7 @@ To use the database you must access the OpenERP models. The global ``request`` o
 
 ::
 
-    @http.route('/my_name', type="html")
+    @http.route('/my_name', type="http")
     def my_name(self):
         my_user_record = request.registry.get("res.users").browse(request.cr, request.uid, request.uid)
         return "<h1>Your name is %s</h1>" % my_user_record.name
@@ -140,9 +140,27 @@ value to the ``authentication`` parameter of ``http.route()``:
 
 ::
 
-    @http.route('/hello', type="html", authentication="noauth")
+    @http.route('/hello', type="http", authentication="noauth")
     def hello(self):
         return "<div>Hello unknown user!</div>"
 
 Please note the ``request.uid`` user id will be ``None`` inside this method call. This is due to the fact no user was
 authenticated.
+
+Overriding Controllers
+----------------------
+
+Existing routes can be overridden. To do so, create a controller that inherit the controller containing the route you
+want to override. Example that redefine the home page of your OpenERP application.
+
+::
+
+    import openerp.addons.web.controllers.main as main
+
+    class Home2(main.Home):
+        @http.route('/', type="http", authentication="noauth")
+        def index(self):
+            return "<div>This is my new home page.</div>"
+
+By re-defining the ``index()`` method, you change the behavior of the original ``Home`` class. Now the ``'/'`` route
+will match the new ``index()`` method in ``Home2``.

From 69c314c51d69c14c1872480a6efc1b79e8df9a95 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Jun 2013 19:53:26 +0200
Subject: [PATCH 73/94] [RENAME]RERENAME crm_channel => crm_partner_assign, for
 migration and translation issue

bzr revid: dle@openerp.com-20130620175326-0lgpbdxiusa65ss2
---
 addons/crm/crm_lead_view.xml                  |   5 +-
 .../wizard/crm_lead_to_opportunity_view.xml   |   4 +-
 .../wizard/crm_merge_opportunities_view.xml   |   4 +-
 .../__init__.py                               |   2 +-
 .../__openerp__.py                            |   2 +-
 .../crm_lead.py                               |   2 +-
 .../crm_lead_view.xml                         |   0
 .../crm_partner_assign.py}                    |   0
 .../crm_partner_assign_data.xml}              |   2 +-
 .../crm_portal_view.xml                       |   0
 .../i18n/ar.po                                | 382 ++++++++---------
 .../i18n/bg.po                                | 382 ++++++++---------
 .../i18n/ca.po                                | 382 ++++++++---------
 .../i18n/crm_partner_assign.pot               | 384 +++++++++---------
 .../i18n/cs.po                                | 382 ++++++++---------
 .../i18n/da.po                                | 382 ++++++++---------
 .../i18n/de.po                                | 382 ++++++++---------
 .../i18n/el.po                                | 382 ++++++++---------
 .../i18n/es.po                                | 382 ++++++++---------
 .../i18n/es_CR.po                             | 382 ++++++++---------
 .../i18n/es_MX.po                             | 288 ++++++-------
 .../i18n/es_PY.po                             | 382 ++++++++---------
 .../i18n/es_VE.po                             | 288 ++++++-------
 .../i18n/fi.po                                | 382 ++++++++---------
 .../i18n/fr.po                                | 382 ++++++++---------
 .../i18n/gl.po                                | 382 ++++++++---------
 .../i18n/hr.po                                | 382 ++++++++---------
 .../i18n/hu.po                                | 384 +++++++++---------
 .../i18n/it.po                                | 382 ++++++++---------
 .../i18n/ja.po                                | 382 ++++++++---------
 .../i18n/ko.po                                | 382 ++++++++---------
 .../i18n/lt.po                                | 382 ++++++++---------
 .../i18n/lv.po                                | 382 ++++++++---------
 .../i18n/mk.po                                | 382 ++++++++---------
 .../i18n/mn.po                                | 382 ++++++++---------
 .../i18n/nb.po                                | 382 ++++++++---------
 .../i18n/nl.po                                | 382 ++++++++---------
 .../i18n/pl.po                                | 382 ++++++++---------
 .../i18n/pt.po                                | 382 ++++++++---------
 .../i18n/pt_BR.po                             | 382 ++++++++---------
 .../i18n/ro.po                                | 382 ++++++++---------
 .../i18n/ru.po                                | 382 ++++++++---------
 .../i18n/sl.po                                | 382 ++++++++---------
 .../i18n/sq.po                                | 382 ++++++++---------
 .../i18n/sr@latin.po                          | 382 ++++++++---------
 .../i18n/sv.po                                | 382 ++++++++---------
 .../i18n/tr.po                                | 382 ++++++++---------
 .../i18n/zh_CN.po                             | 382 ++++++++---------
 .../i18n/zh_TW.po                             | 382 ++++++++---------
 .../portal_data.xml                           |   2 +-
 .../report/__init__.py                        |   0
 .../report/crm_lead_report.py                 |   0
 .../report/crm_lead_report_view.xml           |   0
 .../report/crm_partner_report.py              |   0
 .../report/crm_partner_report_view.xml        |  10 +-
 .../res_partner_demo.xml                      |   0
 .../res_partner_view.xml                      |   0
 .../security/ir.model.access.csv              |   0
 .../static/src/js/next.js                     |   8 +-
 .../test/partner_assign.yml                   |   0
 .../wizard/__init__.py                        |   0
 .../wizard/crm_channel_interested.py          |   2 +-
 .../wizard/crm_channel_interested_view.xml    |   0
 .../wizard/crm_forward_to_partner.py          |   8 +-
 .../wizard/crm_forward_to_partner_view.xml    |   0
 65 files changed, 7386 insertions(+), 7379 deletions(-)
 rename addons/{crm_channel => crm_partner_assign}/__init__.py (97%)
 rename addons/{crm_channel => crm_partner_assign}/__openerp__.py (98%)
 rename addons/{crm_channel => crm_partner_assign}/crm_lead.py (95%)
 rename addons/{crm_channel => crm_partner_assign}/crm_lead_view.xml (100%)
 rename addons/{crm_channel/crm_channel.py => crm_partner_assign/crm_partner_assign.py} (100%)
 rename addons/{crm_channel/crm_channel_data.xml => crm_partner_assign/crm_partner_assign_data.xml} (97%)
 rename addons/{crm_channel => crm_partner_assign}/crm_portal_view.xml (100%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/ar.po (77%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/bg.po (71%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/ca.po (73%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/crm_partner_assign.pot (68%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/cs.po (69%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/da.po (69%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/de.po (77%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/el.po (72%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/es.po (78%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/es_CR.po (76%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/es_MX.po (73%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/es_PY.po (73%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/es_VE.po (73%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/fi.po (72%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/fr.po (77%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/gl.po (73%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/hr.po (69%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/hu.po (75%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/it.po (74%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/ja.po (75%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/ko.po (73%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/lt.po (69%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/lv.po (73%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/mk.po (74%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/mn.po (72%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/nb.po (72%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/nl.po (77%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/pl.po (73%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/pt.po (76%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/pt_BR.po (78%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/ro.po (78%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/ru.po (80%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/sl.po (70%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/sq.po (69%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/sr@latin.po (69%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/sv.po (75%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/tr.po (77%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/zh_CN.po (75%)
 rename addons/{crm_channel => crm_partner_assign}/i18n/zh_TW.po (74%)
 rename addons/{crm_channel => crm_partner_assign}/portal_data.xml (96%)
 rename addons/{crm_channel => crm_partner_assign}/report/__init__.py (100%)
 rename addons/{crm_channel => crm_partner_assign}/report/crm_lead_report.py (100%)
 rename addons/{crm_channel => crm_partner_assign}/report/crm_lead_report_view.xml (100%)
 rename addons/{crm_channel => crm_partner_assign}/report/crm_partner_report.py (100%)
 rename addons/{crm_channel => crm_partner_assign}/report/crm_partner_report_view.xml (90%)
 rename addons/{crm_channel => crm_partner_assign}/res_partner_demo.xml (100%)
 rename addons/{crm_channel => crm_partner_assign}/res_partner_view.xml (100%)
 rename addons/{crm_channel => crm_partner_assign}/security/ir.model.access.csv (100%)
 rename addons/{crm_channel => crm_partner_assign}/static/src/js/next.js (50%)
 rename addons/{crm_channel => crm_partner_assign}/test/partner_assign.yml (100%)
 rename addons/{crm_channel => crm_partner_assign}/wizard/__init__.py (100%)
 rename addons/{crm_channel => crm_partner_assign}/wizard/crm_channel_interested.py (98%)
 rename addons/{crm_channel => crm_partner_assign}/wizard/crm_channel_interested_view.xml (100%)
 rename addons/{crm_channel => crm_partner_assign}/wizard/crm_forward_to_partner.py (97%)
 rename addons/{crm_channel => crm_partner_assign}/wizard/crm_forward_to_partner_view.xml (100%)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 6ddd06c1c90..df6a4a07a8e 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -601,7 +601,9 @@
                             'default_email_to':'{$object.email or \'\'}',
                             'default_use_template': True,
                             'default_template_id': ref('crm.email_template_opportunity_mail'),
-                        }"/>
+                        }"
+                groups="base.group_sale_salesman"
+                />
 
         <!--Update of email_template defined in crm_lead_data, to add ref_ir_act_window
             allowing to have a well formed email template (context action considered as set). -->
@@ -617,6 +619,7 @@
                 if context.get('active_model') == 'crm.lead' and context.get('active_ids'):
                     self.case_cancel(cr, uid, context['active_ids'], context=context)
             </field>
+            <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/>
         </record>
 
         <record id="ir_mark_as_lost" model="ir.values">
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 4093df910d0..9ddd1fc701f 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -102,7 +102,9 @@
             res_model="crm.lead2opportunity.partner.mass" src_model="crm.lead"
             view_mode="form" target="new" view_type="form"
             context="{'mass_convert' : True}"
-            view_id="view_crm_lead2opportunity_partner_mass"/>
+            view_id="view_crm_lead2opportunity_partner_mass"
+            groups="base.group_sale_salesman"
+        />
 
     </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index 919d83cb9a7..60693c13e19 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -45,7 +45,9 @@
             multi="True"
             key2="client_action_multi" name="Merge leads/opportunities"
             res_model="crm.merge.opportunity" src_model="crm.lead"
-            view_mode="form" target="new" view_type="form"/>
+            view_mode="form" target="new" view_type="form"
+            groups="base.group_sale_salesman"
+            />
 
     </data>
 </openerp>
diff --git a/addons/crm_channel/__init__.py b/addons/crm_partner_assign/__init__.py
similarity index 97%
rename from addons/crm_channel/__init__.py
rename to addons/crm_partner_assign/__init__.py
index 357fbf153ed..6b1315cef07 100644
--- a/addons/crm_channel/__init__.py
+++ b/addons/crm_partner_assign/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import crm_channel
+import crm_partner_assign
 import crm_lead
 import wizard
 import report
diff --git a/addons/crm_channel/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
similarity index 98%
rename from addons/crm_channel/__openerp__.py
rename to addons/crm_partner_assign/__openerp__.py
index 0c3115ee0aa..37a8c5a3d6b 100644
--- a/addons/crm_channel/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -45,7 +45,7 @@ You can also use the geolocalization without using the GPS coordinates.
         'wizard/crm_forward_to_partner_view.xml',
         'wizard/crm_channel_interested_view.xml',
         'crm_lead_view.xml',
-        'crm_channel_data.xml',
+        'crm_partner_assign_data.xml',
         'crm_portal_view.xml',
         'portal_data.xml',
         'report/crm_lead_report_view.xml',
diff --git a/addons/crm_channel/crm_lead.py b/addons/crm_partner_assign/crm_lead.py
similarity index 95%
rename from addons/crm_channel/crm_lead.py
rename to addons/crm_partner_assign/crm_lead.py
index 2639e92d60a..37f4b9aedff 100644
--- a/addons/crm_channel/crm_lead.py
+++ b/addons/crm_partner_assign/crm_lead.py
@@ -28,7 +28,7 @@ class crm_lead(osv.osv):
 
     def get_interested_action(self, cr, uid, interested, context=None):
         try:
-            model, action_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'crm_lead_channel_interested_act')
+            model, action_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', 'crm_lead_channel_interested_act')
         except ValueError:
             raise osv.except_osv(_('Error!'), _("The CRM Channel Interested Action is missing"))
         action = self.pool[model].read(cr, uid, action_id, context=context)
diff --git a/addons/crm_channel/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
similarity index 100%
rename from addons/crm_channel/crm_lead_view.xml
rename to addons/crm_partner_assign/crm_lead_view.xml
diff --git a/addons/crm_channel/crm_channel.py b/addons/crm_partner_assign/crm_partner_assign.py
similarity index 100%
rename from addons/crm_channel/crm_channel.py
rename to addons/crm_partner_assign/crm_partner_assign.py
diff --git a/addons/crm_channel/crm_channel_data.xml b/addons/crm_partner_assign/crm_partner_assign_data.xml
similarity index 97%
rename from addons/crm_channel/crm_channel_data.xml
rename to addons/crm_partner_assign/crm_partner_assign_data.xml
index 3f374fd26d4..b4347b1621b 100644
--- a/addons/crm_channel/crm_channel_data.xml
+++ b/addons/crm_partner_assign/crm_partner_assign_data.xml
@@ -39,7 +39,7 @@
 <p>Please connect to your <a href="${object.get_portal_url()}">Partner Portal</a> to get details. On each lead are two buttons on the top left corner that you should press after having contacted the lead: "I'm interested" & "I'm not interested".</p>
 % else:
 <p>
-    You do not have yet a Portal access to our database. Please contact 
+    You do not have yet a portal access to our database. Please contact 
     ${ctx['partner_id'].user_id and ctx['partner_id'].user_id.email and 'your account manager %s (%s)' % (ctx['partner_id'].user_id.name,ctx['partner_id'].user_id.email) or 'us'}.
 </p>
 % endif
diff --git a/addons/crm_channel/crm_portal_view.xml b/addons/crm_partner_assign/crm_portal_view.xml
similarity index 100%
rename from addons/crm_channel/crm_portal_view.xml
rename to addons/crm_partner_assign/crm_portal_view.xml
diff --git a/addons/crm_channel/i18n/ar.po b/addons/crm_partner_assign/i18n/ar.po
similarity index 77%
rename from addons/crm_channel/i18n/ar.po
rename to addons/crm_partner_assign/i18n/ar.po
index 8572efb06de..c038a2b0fac 100644
--- a/addons/crm_channel/i18n/ar.po
+++ b/addons/crm_partner_assign/i18n/ar.po
@@ -17,172 +17,172 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "تأخير الإغلاق"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "الكاتب"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "الأرباح المتوقعة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "الحالات"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "تجميع حسب..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "التالي"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "التمركز الجغرافي"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "النص"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "المصدر"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "تأخير الإغلاق"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "الموضوع كاملًا"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "شركة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "إشعارات"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "موعد الشريك"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "موظف مبيعات"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "أعلى"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "يوم"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "اخر بريد الكتروني"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "المدى الجغرافي"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "ملغي"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "التخصيص الجغرافي"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "معالج تكوين رسالة بريد الالكتروني"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "تاريخ الإغلاق"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -190,251 +190,251 @@ msgid ""
 msgstr ""
 "ويعطي احتمالية لتخصيص مصدر اساسي لذلك الشريك. (0 تعني لا يوجد تخصيص.)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "الاحتمالية المتوسطة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "السابق"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "خطأ شبكة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "من"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "مستوى الشريك"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "قسم"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "أرسل"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "التالي"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "أولوية"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "تخطي الموعد النهائي"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "نوع"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "بريد إلكتروني"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "تقديم شريك هذه الحالة/خصص لـ."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "أدنى"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "قالب"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "تحليل المصادر"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "تاريخ الإنشاء"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "المعرف المتعلق بالمستند"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "معلّق"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "تخصيص الشريك"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "أُستخدمت العلامة لفصل المصادر والفرص"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "يوليو"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "مرحلة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "الحالة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "للقراءة"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "تقديم"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "التمركز الجغرافي"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "تحليل الفرص المخصصة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "إلغاء"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "ارسل سجل"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "إغلاق"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "مارس"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "تحليل الفرص المخصصة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "عدد الأيام لغلق الحالة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "تعليق"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "وزن"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "أبريل"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -442,332 +442,332 @@ msgstr "أبريل"
 msgid "Grade"
 msgstr "مستوى"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "ديسمبر"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "المستخدمين الذين صوتوا لهذه الرسالة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "شهر"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "تاريخ الفتح"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "رسالة فرعية"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "آخر مراجعة للشريك"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "موضوع"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "أو"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "المحتويات"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "تصويتات"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "عدد الفرص"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "فريق"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "مسودة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "منخفض"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "مغلق"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "الفرص المخصصة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "تاريخ التخصيص"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "الاحتمالية القصوى"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "أغسطس"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "عادي"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "تصعيد"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "يونيو"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "عدد الإيام لفتح الحالة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "تأخر الفتح"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "مستخدِم"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "نشط"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "نوفمبر"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "مرشحات مفصلة..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "الحدود الجغرافية"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "عدد الفرص"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "تعيين المصدر"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "أكتوبر"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "تخصيص"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "يناير"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "إرسال بريد"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "التاريخ"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "الأرباح المخططة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "فترة الفاتورة"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "معرف - الرسالة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "مرفقات"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "مسلسل"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "سبتمبر"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "اسم المستوى"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "تم تقديم اخر موعد لهذه الحالة/تم تخصيصها للشريك"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "فتح"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "النوع الفرعي"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "تاريخ التمركز الجغرافي"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "الحالي"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "عرض/فرصة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "تقديم الى الشريك"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "فريق المبيعات"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "مايو"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "الربح المحتمل"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -776,49 +776,49 @@ msgstr "الربح المحتمل"
 msgid "Activation"
 msgstr "تنشيط"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "تخصيص شريك"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "فرصة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "عميل"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "فبراير"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "الاسم"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -826,108 +826,108 @@ msgstr ""
 msgid "Country"
 msgstr "دولة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "سنة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "تحويل إلي فرصة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "تخصيص جغرافي"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "تأخر الفتح"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "تحليل الشراكة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "تقرير مهام إدارة العلافات للعملاء"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "معلومات عن الحالة"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "مرتفع"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "إنشاء تاريخ"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "مرشحات الفرز"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "شريك"
 
diff --git a/addons/crm_channel/i18n/bg.po b/addons/crm_partner_assign/i18n/bg.po
similarity index 71%
rename from addons/crm_channel/i18n/bg.po
rename to addons/crm_partner_assign/i18n/bg.po
index 217bdf4438b..46a537a7563 100644
--- a/addons/crm_channel/i18n/bg.po
+++ b/addons/crm_partner_assign/i18n/bg.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Планирани приходи"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Групиране по..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Препращане"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Фирма"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Най-висок"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Ден"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Последен имейл"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Отказанa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Дата на затваряне"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Предишен"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Мрежова грешка"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "От"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Секция"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Следващ"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Приоритет"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Тип"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Най-нисък"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Дата на създаване"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Висящи"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Юли"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Етап"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Препащане"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Отказ"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Затваряне"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Март"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Тегло"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Април"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr "Април"
 msgid "Grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Декември"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Месец"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Дата на отваряне"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Относно"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#Възможности"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Чернова"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Нисък"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Приключено"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Август"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Нормален"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Ескалиране"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Юни"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Брой дни до отваряне на случай"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Потребител"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Активен"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Ноември"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Разширени филтри"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Октомври"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Януари"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Последователност"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Септември"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Отваряне"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Текущ"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Препращане до контрагент"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Търговски отдел"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Май"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr ""
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Възможности"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Клиент"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Февруари"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,108 +825,108 @@ msgstr ""
 msgid "Country"
 msgstr "Държава"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Година"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Висок"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Създаване на дата"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Контрагент"
 
diff --git a/addons/crm_channel/i18n/ca.po b/addons/crm_partner_assign/i18n/ca.po
similarity index 73%
rename from addons/crm_channel/i18n/ca.po
rename to addons/crm_partner_assign/i18n/ca.po
index 5c18cd58674..f63bc426e25 100644
--- a/addons/crm_channel/i18n/ca.po
+++ b/addons/crm_partner_assign/i18n/ca.po
@@ -17,172 +17,172 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Retard per tancar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Ingressos previstos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# de casos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Agrupa per..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Endavant"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo localitzar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Iniciativa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Retard per tancar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Històric complet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Companyia"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Data empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "El més alt"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Dia"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Últim email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo latitud"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Cancel·lada"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geo assignació"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Data de tancament"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -191,251 +191,251 @@ msgstr ""
 "Indica la probabilitat d'assignar una iniciativa a aquesta empresa. (0 "
 "significa cap assignació)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilitat mitjana"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Previ"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Error de la xarxa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Per"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Nivell de l'empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Secció"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Següent"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioritat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Data límit sobrepassada"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tipus"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Empresa a la qual aquest cas ha estat reexpedit/assignat."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Mínima"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Anàlisi d'iniciatives"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Data creació"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Pendent"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Assignació de l'empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "El tipus és utilitzat per separar iniciatives i oportunitats"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Juliol"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Etapa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Reenviament"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo localització"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Anàlisi d'assignació d'oportunitats"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Canceŀla"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Envia historial"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Tanca"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Març"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Anàlisi d'assignació d'oportunitat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Número de dies per tancar el cas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Pes"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Abril"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -443,333 +443,333 @@ msgstr "Abril"
 msgid "Grade"
 msgstr "Qualificació"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Desembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mes"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Data d'obertura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Assumpte"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "nº oportunitats"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Esborrany"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Baix"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Tancat"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Oportunitats assignades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Data d'assignació"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilitat màx."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Agost"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escalat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Juny"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Número de dies per obrir el cas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Retard d'obertura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Usuari"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Actiu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Novembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtres estesos..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Longitud Geo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Assignar iniciativa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Octubre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Asignació"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Gener"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Ingressos esperats"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.empresa.nivell"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Seqüència"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Setembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nom del nivell"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 "Última data en la qual aquest cas va ser reenviat/assignat a una empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Obre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Data geolocalització"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Actiu"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Reenvia a empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Equip de vendes"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Maig"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Ingrés previst"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -778,49 +778,49 @@ msgstr "Ingrés previst"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Empresa assignada"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Oportunitat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Client"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Febrer"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -828,108 +828,108 @@ msgstr ""
 msgid "Country"
 msgstr "País"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Any"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Converteix a oportunitat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Assignar geo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Retard d'obertura"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Informe d'iniciatives CRM"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Informació del cas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Alt"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Data de creació"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Empresa"
 
diff --git a/addons/crm_channel/i18n/crm_partner_assign.pot b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
similarity index 68%
rename from addons/crm_channel/i18n/crm_partner_assign.pot
rename to addons/crm_partner_assign/i18n/crm_partner_assign.pot
index d6616589610..3dc7f011bbf 100644
--- a/addons/crm_channel/i18n/crm_partner_assign.pot
+++ b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* crm_channel
+#	* crm_partner_assign
 #
 msgid ""
 msgstr ""
@@ -15,416 +15,416 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid "Message type: email for email message, notification for system message, comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid "Email address of the sender. This field is set when no matching partner is found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid "Gives the probability to assign a lead to this partner. (0 means no assignation.)"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:77
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:77
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:77
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:77
 #, python-format
 msgid "Fwd"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -432,330 +432,330 @@ msgstr ""
 msgid "Grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid "Cannot contact geolocation servers. Please make sure that your internet connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -764,49 +764,49 @@ msgstr ""
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -814,104 +814,104 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid "Technical field holding the message notifications. Use notified_partner_ids to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid "Author of the message. If not set, email_from may hold an email address that did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr ""
 
diff --git a/addons/crm_channel/i18n/cs.po b/addons/crm_partner_assign/i18n/cs.po
similarity index 69%
rename from addons/crm_channel/i18n/cs.po
rename to addons/crm_partner_assign/i18n/cs.po
index 9cb494897c1..12c03bf18eb 100644
--- a/addons/crm_channel/i18n/cs.po
+++ b/addons/crm_partner_assign/i18n/cs.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-31 05:27+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr ""
 msgid "Grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr ""
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,107 +825,107 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr ""
diff --git a/addons/crm_channel/i18n/da.po b/addons/crm_partner_assign/i18n/da.po
similarity index 69%
rename from addons/crm_channel/i18n/da.po
rename to addons/crm_partner_assign/i18n/da.po
index 8fb527d6582..93aa75ba0cb 100644
--- a/addons/crm_channel/i18n/da.po
+++ b/addons/crm_partner_assign/i18n/da.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr ""
 msgid "Grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr ""
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,107 +825,107 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr ""
diff --git a/addons/crm_channel/i18n/de.po b/addons/crm_partner_assign/i18n/de.po
similarity index 77%
rename from addons/crm_channel/i18n/de.po
rename to addons/crm_partner_assign/i18n/de.po
index 05dc1ff12ac..98625562638 100644
--- a/addons/crm_channel/i18n/de.po
+++ b/addons/crm_partner_assign/i18n/de.po
@@ -17,22 +17,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Zeit f. Beendigung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Urheber"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Geplanter Umsatz"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
@@ -41,43 +41,43 @@ msgstr ""
 "Nachrichtentyp: E-Mail für E-mailnachricht, Mitteilung für Systemnachricht, "
 "Kommentar für andere Mitteilungen wie Diskussionsbeiträgen von Benutzern."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "Fälle"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Gruppierung..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Automatisch bereinigter HTML Inhalt"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo-Lokalisierung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Markiert"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Nachricht"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -86,359 +86,359 @@ msgstr ""
 "E-Mail Adresse des Absenders. Dieses Feld wird ausgefüllt, wenn aufgrund "
 "eingehender E-Mails keine automatische Zuordnung eines Partners möglich ist."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr "Beginn Partnerschaft"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Lead"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Zeit f. Beendigung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Gesamte Historie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Unternehmen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Partner Daten"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Verkäufer"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Sehr Hoch"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Tag"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Eindeutige Identifikation der Nachricht"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr "Nächste Partnerbewertung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Letzte E-Mail"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo Längengrad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geogr. Zuweisung"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "E-Mail Assistent"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Umsatz"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Datum Beendigung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr "Ermöglicht automatische Zuweisung von Leads zu Partnern"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr "Aktivierung Partner"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "System Benachrichtigung"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr "Interessenten Übermittlung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Durch. Wahrscheinl."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Vorherige"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Netzwerk Fehler"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Von"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Partner Einstufung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Sektion"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Senden"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Weiter"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Priorität"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Überschrittene Frist"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Typ"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "E-Mail"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Partner zu dem der Fall zugewiesen wurde"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Sehr gering"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Datum Rechnung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Vorlage"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Datum festlegen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Statistik Verkaufskontakte"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Datum Erstellung"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Hauptnachricht"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "Dokumenten-ID"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Im Wartezustand"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Partner Zuweisung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Typ wird benutzt für die Trennung zwischen Leads und Verkaufschance"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Juli"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr "Bewertungsdatum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Stufe"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Status"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "ungelesen"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Weiterleiten"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo Lokalisierung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Statistik Kontaktzuweisung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Abbruch"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Sende Fallhistorie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Beenden"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "März"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Statistik Chancenzuweisung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Anzahl Tage f. Beendigung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 "Partner, die benachrichtigt wurden, dass diese E-Mail ihnen zugestellt wurde."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Kommentar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Gewicht"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "April"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -446,257 +446,257 @@ msgstr "April"
 msgid "Grade"
 msgstr "Einstufung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Dezember"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Benutzer die für diese Mitteilung gestimmt haben"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Monat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Datum Eröffnung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Kommentare"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "Letzte Partner Bewertung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Betreff"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "oder"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Inhalte"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Bewertungen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "# Verkaufschancen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr "Dieser Benutzer hat eine Markierung zu dieser Nachricht erstellt"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr "Beginn Partnerschaft"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Team"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Entwurf"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Gering"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Beendet"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Massenmail an Partner"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Zugewiesene Verkaufschancen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Zuweisungsdatum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Max. Wahrscheinl."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "August"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr "Bezeichnung kommt vom verbundenen Vorgang."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Eskalation"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Juni"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Anzahl Tage f. Eröffn."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Durch. Zeit b. Eröffn."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Benutzer"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Aktiv"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "November"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Erweiterter Filter..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Geo Längengrad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# der Verkaufschancen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Zuweisen Verkaufskontakt"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Oktober"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Zuweisung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Januar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "E-Mail senden"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Datum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Geplanter Umsatz"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "Partner Bewertung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Abrechnungsperiode"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Nachricht-ID"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Anhänge"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Mitteilung Bezeichnung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Sequenz"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
@@ -705,75 +705,75 @@ msgstr ""
 "Die Verbindung zum Geolokalisierung Server war nicht erfolgreich. Bitte "
 "stellen Sie sicher, daß Sie eine Internet Verbindung haben (%s)."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "September"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Einstufung Name"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "Letztmalige Zuweisung / Weitergabe des Leads"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Offen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Untertyp"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Geo Lokalisierung Daten"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Aktuell"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Interessent / Chance"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Benachrichtigter Partner"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Weiter zu Partner"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Verkauf Team"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Mai"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Geplanter Umsatz"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -782,49 +782,49 @@ msgstr "Geplanter Umsatz"
 msgid "Activation"
 msgstr "Aktivierung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Zugewiesener Partner"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "Partner Level"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr "Dieser Benutzer hat ungelesene Mitteilungen zu dieser Nachricht"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Verkaufschance"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Kunde"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Februar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Bezeichnung"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Partnerschaft Aktivierung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -832,34 +832,34 @@ msgstr "Partnerschaft Aktivierung"
 msgid "Country"
 msgstr "Land"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Jahr"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Konvertiere z. Verkaufschance"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Geogr. Zuweisung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "D. Dauer b. Eröff."
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "Partner Analyse"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
@@ -868,32 +868,32 @@ msgstr ""
 "Technisches Feld mit der Benachrichtigung. Zum Zugriff auf zu "
 "benachrichtigenden Partner verwenden Sie notified_partner_ids."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Partner Zuteilung Analyse"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Auswertung Leads"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Erstellungsmodus"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "verbundenes Datenmodell"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Fall Information"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -902,42 +902,42 @@ msgstr ""
 "Verfasser der Mitteilung. Wenn nicht gesetzt kann die E-Mail Absenderadresse "
 "keinem Partner zugeordnet werden."
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM Partner Report"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Hoch"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Weitere Kontakte"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "Anfangsmitteilung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Datum Erstellung"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filter"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Partner"
 
diff --git a/addons/crm_channel/i18n/el.po b/addons/crm_partner_assign/i18n/el.po
similarity index 72%
rename from addons/crm_channel/i18n/el.po
rename to addons/crm_partner_assign/i18n/el.po
index 7cc46357a53..9334b08f8fc 100644
--- a/addons/crm_channel/i18n/el.po
+++ b/addons/crm_partner_assign/i18n/el.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Καθυστέρηση για Κλείσιμο"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Προγραμματισμένα Έσοδα"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# από Υποθέσεις"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Ομαδοποίηση ανά..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Προώθηση"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Υποψήφιος Πελάτης"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Καθηστέρηση για κλείσιμο"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Εταιρία"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Ημερομηνία Συνεργάτη"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Υψηλότερο"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Ημέρα"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Ημερομηνία Ολοκλήρωσης"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Σφάλμα δικτύου"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Από"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Τομέας"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Επόμενο"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Προτεραιότητα"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Περασμένη Προθεσμία"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Τύπος"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Χαμηλότερο"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Ανάλυση Ευκαιριών"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Ημερομηνία Δημιουργίας"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Εκκρεμεί"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Ιούλιος"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Στάδιο"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Προοθ."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Αποστολή Ιστορικού"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Μάρτιος"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Αριθμός Ημερών για κλείσιμο της υπόθεσης"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Βάρος"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Απρίλιος"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr "Απρίλιος"
 msgid "Grade"
 msgstr "Βαθμίδα"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Δεκέμβριος"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Μήνας"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Μέρα Έναρξης"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Θέμα"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "# Ευκαιρίες"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Πρόχειρο"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Χαμηλό"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Έκλεισε"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Αύγουστος"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Κανονικό"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Διαβάθμιση"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Ιούνιος"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Αριθμός Ημερών για άνοιγμα υπόθεσης"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Χρήστης"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Ενεργό"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Νοέμβριος"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Εκτεταμένα Φίλτρα..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Οκτώβριος"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Προβλεπόμενα Έσοδα"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Σεπτέμβριος"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Ανοιχτό"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Τρέχων"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Μάιος"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Εκτιμώμενα Έσοδα"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr "Εκτιμώμενα Έσοδα"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Ευκαιρία"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Πελάτης"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Φεβρουάριος"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,108 +825,108 @@ msgstr ""
 msgid "Country"
 msgstr "Χώρα"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Μετατροπή σε Ευκαιρία"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Καθηστέρηση για άνοιγμα"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Αναφορά Υποψηφίων πελατών CRM"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Συνεργάτης"
 
diff --git a/addons/crm_channel/i18n/es.po b/addons/crm_partner_assign/i18n/es.po
similarity index 78%
rename from addons/crm_channel/i18n/es.po
rename to addons/crm_partner_assign/i18n/es.po
index 14bf571913d..42c5924a82c 100644
--- a/addons/crm_channel/i18n/es.po
+++ b/addons/crm_partner_assign/i18n/es.po
@@ -17,22 +17,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Tiempo restante para el cierre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Autor"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Ingreso previsto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
@@ -41,43 +41,43 @@ msgstr ""
 "Tipo de mensaje: email para mensajes de correo, notification para mensajes "
 "de sistema, comment para otros tipos de mensaje como respuestas de usuarios."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "nº de casos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Sanear automáticamente los contenidos HTML"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Reenviar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo localizar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Destacado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Cuerpo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -86,107 +86,107 @@ msgstr ""
 "Dirección de correo del remitente. Este campo se establece cuando no existe "
 "mail de empresa coincidente para correos entrantes."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr "Fecha de asociación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Iniciativa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Demora cierre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Historial completo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Fecha empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Comercial"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Más alta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Día"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Identificador único del mensaje"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr "Próxima revisiónd de la empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Último email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo latitud"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geo asignación"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Asistente de composición de e-mail"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Volumen de negocio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Fecha cierre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -195,230 +195,230 @@ msgstr ""
 "Indica la probabilidad de asignar una iniciativa a esta empresa. (0 "
 "significa ninguna asignación)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr "Activación de empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Notificación del sistema"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr "Reenviar iniciativa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilidad media"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Anterior"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Error de red"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "De"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Nivel empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Sección"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Enviar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Siguiente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioridad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Fecha límite excedida"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tipo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "Email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Empresa a la que este caso ha sido reenviado/asignado."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Más baja"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Fecha factura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Plantilla"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Fecha de asignación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Análisis de iniciativas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Fecha creación"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "Copy text \t res.partner.activation"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Mensaje padre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID del docuemtno relacionado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Pendiente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Asignación empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "El tipo es utilizado para separar iniciativas y oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Julio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr "Fecha revisión"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Etapa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Estado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "Para leer"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Reenvío"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo localización"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Análisis de asignación de oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Enviar historial"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Cerrar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Marzo"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Análisis de asignación de op."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Número de días para cerrar el caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
@@ -426,22 +426,22 @@ msgstr ""
 "Empresas que tienen una notificación poniendo este mensaje en sus bandejas "
 "de entrada"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Comentario"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Peso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Abril"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -449,258 +449,258 @@ msgstr "Abril"
 msgid "Grade"
 msgstr "Nivel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Diciembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Usuarios que votaron por este mensaje"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mes"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Fecha de apertura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Mensajes hijos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "Ultima revisión de la empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Asunto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "o"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Contenidos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Votos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "nº oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 "El usuario actual tiene una notificación destacada asociada a este mensaje"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr "Fecha de asociación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Equipo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Borrador"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Baja"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Cerrado"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Envío masivo a empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Oportunidades asignadas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Fecha de asignación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilidad max."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Agosto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr "Nombre cogido del documento relacionado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escalar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Junio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Número de días para abrir el caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Demora de apertura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Usuario"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Activo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Noviembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Longitud Geo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "Nº oportunidad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Asignar iniciativa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Octubre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Asignación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Enero"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Enviar correo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Fecha"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Beneficio previsto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "Revisión empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Periodo factura"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.empresa.nivel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Id del mensaje"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Nombre de registro del mensaje"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
@@ -709,76 +709,76 @@ msgstr ""
 "No es posible contactar servidores de geolocalización. Por favor, asegúrese "
 "que su conexión de internet esté arriba y funcionando (%s)."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Septiembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nombre de nivel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 "Última fecha en la que este caso fue reenviado/asignado a una empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Abierto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Subtipo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Fecha geolocalización"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Actual"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Iniciativa / Oportunbidad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Empresas notificadas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Reenviar a empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Equipo de ventas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Mayo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Ingreso estimado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -787,50 +787,50 @@ msgstr "Ingreso estimado"
 msgid "Activation"
 msgstr "Activación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Empresa asignada"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "Nivel partner"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 "El usuario actual tiene una notificación sin leer asociada a este mensaje"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Oportunidad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Febrero"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Nombre"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Activaciones de empresas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -838,34 +838,34 @@ msgstr "Activaciones de empresas"
 msgid "Country"
 msgstr "País"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Año"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Convertir en oportunidad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Asignar geo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Retraso de apertura"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "Análisis de la relación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
@@ -874,32 +874,32 @@ msgstr ""
 "Campo técnico que contiene notificaciones de mensaje. Use "
 "notified_partner_ids para acceder a las empresas notificadas."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Análisis de la empresa asignada"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Informe de iniciativas CRM"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Modo composición"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "Modelo de documento relacionado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Información de caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -908,42 +908,42 @@ msgstr ""
 "Autor del mensaje. Si no se establece, email_from puede contener una "
 "dirección de correo que no coincida con la de ningún cliente."
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "Informe de la empresa CRM"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Alta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Contactos adicionales"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "Mensaje inicial del hilo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Fecha de creación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filtros"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Empresa"
 
diff --git a/addons/crm_channel/i18n/es_CR.po b/addons/crm_partner_assign/i18n/es_CR.po
similarity index 76%
rename from addons/crm_channel/i18n/es_CR.po
rename to addons/crm_partner_assign/i18n/es_CR.po
index c1ac59b15a1..19f4a7e455e 100644
--- a/addons/crm_channel/i18n/es_CR.po
+++ b/addons/crm_partner_assign/i18n/es_CR.po
@@ -18,172 +18,172 @@ msgstr ""
 "X-Generator: Launchpad (build 16532)\n"
 "Language: es\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Retraso para cerrar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Ingreso previsto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "nº de casos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Reenviar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo localizar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Cuerpo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Iniciativa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Demora cierre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Historial completo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Fecha empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Más alta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Día"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Identificador único del mensaje"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Último email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo latitud"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geo asignación"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Fecha cierre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -192,251 +192,251 @@ msgstr ""
 "Indica la probabilidad de asignar una iniciativa a esta empresa. (0 "
 "significa ninguna asignación)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilidad media"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Anterior"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Error de red"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "De"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Nivel empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Sección"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Enviar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Siguiente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioridad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Fecha límite excedida"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tipo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Empresa a la que este caso ha sido reenviado/asignado."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Más baja"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Plantilla"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Asignar Fecha"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Análisis de iniciativas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Fecha creación"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID del docuemtno relacionado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Pendiente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Asignación empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "El tipo es utilizado para separar iniciativas y oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Julio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Etapa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Reenvío"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo localización"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Análisis de asignación de oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Enviar historial"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Cerrar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Marzo"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Análisis de asignación de op."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Número de días para cerrar el caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Peso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Abril"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -444,333 +444,333 @@ msgstr "Abril"
 msgid "Grade"
 msgstr "Nivel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Diciembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mes"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Fecha de apertura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Asunto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "nº oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Equipo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Borrador"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Baja"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Cerrado"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Mass Interes de socio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Oportunidades asignadas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Fecha de asignación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilidad max."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Agosto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escalar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Junio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Número de días para abrir el caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Demora de apertura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Usuario"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Activo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Noviembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Longitud Geo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# de Oportunidad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Asignar iniciativa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Octubre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Asignación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Enero"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Enviar correo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Fecha"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Beneficio previsto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.empresa.nivel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Id del mensaje"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Septiembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nombre de nivel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 "Última fecha en la que este caso fue reenviado/asignado a una empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Abierto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Fecha geolocalización"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Actual"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Reenviar a empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Equipo de ventas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Mayo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Ingreso estimado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -779,49 +779,49 @@ msgstr "Ingreso estimado"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Empresa asignada"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Oportunidad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Febrero"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Nombre"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -829,108 +829,108 @@ msgstr ""
 msgid "Country"
 msgstr "País"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Año"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Convertir en oportunidad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Asignar geo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Retraso de apertura"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "Asociación de Análisis"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Análisis de socio asignado"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Informe de iniciativas CRM"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Información de caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM Informe de Socio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Alta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Fecha de creación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filtros"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Empresa"
 
diff --git a/addons/crm_channel/i18n/es_MX.po b/addons/crm_partner_assign/i18n/es_MX.po
similarity index 73%
rename from addons/crm_channel/i18n/es_MX.po
rename to addons/crm_partner_assign/i18n/es_MX.po
index 30dadccab13..40dc0776df7 100644
--- a/addons/crm_channel/i18n/es_MX.po
+++ b/addons/crm_partner_assign/i18n/es_MX.po
@@ -17,75 +17,75 @@ msgstr ""
 "X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
 msgid "Send to"
 msgstr "Enviar a"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Retraso para cerrar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Ingreso previsto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "nº de casos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: view:crm.lead.forward.to.partner:0
 msgid "Forward"
 msgstr "Reenviar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply-to of the Sales team defined on this case"
 msgstr "\"Responder a\" del equipo de ventas definido en este caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo localizar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Marzo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Iniciativa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Demora cierre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Whole Story"
 msgstr "Historial completo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:41
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:41
 #, python-format
 msgid ""
 "Could not contact geolocation servers, please make sure you have a working "
@@ -94,51 +94,51 @@ msgstr ""
 "No se puede conectar con los servidores de geolocalización, por favor "
 "asegúrese de tener conexión a internet (%s)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_date:0
 msgid "Partner Date"
 msgstr "Fecha empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Más alta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Día"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Latest email"
 msgstr "Último email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo latitud"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geo asignación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Fecha cierre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -147,8 +147,8 @@ msgstr ""
 "Indica la probabilidad de asignar una iniciativa a esta empresa. (0 "
 "significa ninguna asignación)"
 
-#. module: crm_channel
-#: model:ir.module.module,description:crm_channel.module_meta_information
+#. module: crm_partner_assign
+#: model:ir.module.module,description:crm_partner_assign.module_meta_information
 msgid ""
 "\n"
 "This is the module used by OpenERP SA to redirect customers to his "
@@ -162,38 +162,38 @@ msgstr ""
 "basándose en geo-localización.\n"
 "    "
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Pendiente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,name:0
 #: field:crm.lead.forward.to.partner,partner_id:0
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilidad media"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Anterior"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:40
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:40
 #, python-format
 msgid "Network error"
 msgstr "Error de red"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_cc:0
 msgid ""
 "These addresses will receive a copy of this email. To modify the permanent "
@@ -202,520 +202,520 @@ msgstr ""
 "Estas direcciones recibirán una copia de este correo electrónico. Para "
 "modificar la lista CC permanente, edite el campo CC global de este caso."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "De"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: field:res.partner,grade_id:0
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Nivel empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Section"
 msgstr "Sección"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Siguiente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioridad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "State"
 msgstr "Estado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Fecha límite excedida"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,html:0
 msgid "HTML formatting?"
 msgstr "Formato HTML?"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tipo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Empresa a la que este caso ha sido reenviado/asignado."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Más baja"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Análisis de iniciativas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Fecha creación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,html:0
 msgid "Select this if you want to send email with HTML formatting."
 msgstr "Seleccione esta opción si desea enviar emails con formato HTML"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "7 Days"
 msgstr "7 días"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Asignación empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "El tipo es utilizado para separar iniciativas y oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Julio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Etapa"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:271
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:271
 #, python-format
 msgid "Fwd"
 msgstr "Reenvío"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo localización"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Análisis de asignación de oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history:0
 msgid "Send history"
 msgstr "Enviar historial"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Contact"
 msgstr "Contactar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Cerrar"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Análisis de asignación de op."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Número de días para cerrar el caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Peso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Retraso de apertura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 msgid "Grade"
 msgstr "Nivel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Diciembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mes"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Fecha de apertura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Asunto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Salesman"
 msgstr "Comercial"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply To"
 msgstr "Responder a"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,categ_id:0
 msgid "Category"
 msgstr "Categoría"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "nº oportunidades"
 
-#. module: crm_channel
-#: model:ir.module.module,shortdesc:crm_channel.module_meta_information
+#. module: crm_partner_assign
+#: model:ir.module.module,shortdesc:crm_partner_assign.module_meta_information
 msgid "Partner Geo-Localisation"
 msgstr "Geolocalización empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
 msgstr "¡Error! No puede crear miembros asociados recursivos."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Borrador"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Baja"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Cerrado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Oportunidades asignadas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Fecha de asignación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilidad max."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Agosto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escalar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "unknown"
 msgstr "desconocido"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Junio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Número de días para abrir el caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Demora de apertura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,name:0
 #: field:crm.lead.forward.to.partner,user_id:0
 #: field:crm.lead.report.assign,user_id:0
 msgid "User"
 msgstr "Usuario"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Activo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Noviembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Longitud Geo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Asignar iniciativa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Octubre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Asignación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_cc:0
 msgid "CC"
 msgstr "CC"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Enero"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Beneficio previsto"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.empresa.nivel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 msgid "Unchanged"
 msgstr "Sin cambios"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Septiembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Last 30 Days"
 msgstr "Últimos 30 días"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nombre de nivel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 "Última fecha en la que este caso fue reenviado/asignado a una empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Abierto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Fecha geolocalización"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Actual"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_to:0
 msgid "To"
 msgstr "Para"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Send new email"
 msgstr "Enviar nuevo email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Reenviar a empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Mayo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Ingreso estimado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Empresa asignada"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,address_id:0
 msgid "Address"
 msgstr "Dirección"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Oportunidad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Febrero"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,name:0
 msgid "Email Address"
 msgstr "Dirección de email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 msgid "Country"
 msgstr "País"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Convertir en oportunidad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Asignar geo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Abril"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "crm.lead"
 msgstr "crm.iniciativa"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Informe de iniciativas CRM"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Case Information"
 msgstr "Información de caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Message Body"
 msgstr "Cuerpo del mensaje"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Alta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Equipo de ventas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Fecha de creación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,state:0
 msgid "Set New State To"
 msgstr "Establecer nuevo estado a"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,name:0
 msgid "Year"
diff --git a/addons/crm_channel/i18n/es_PY.po b/addons/crm_partner_assign/i18n/es_PY.po
similarity index 73%
rename from addons/crm_channel/i18n/es_PY.po
rename to addons/crm_partner_assign/i18n/es_PY.po
index 19bd2838223..f930b8ed2c9 100644
--- a/addons/crm_channel/i18n/es_PY.po
+++ b/addons/crm_partner_assign/i18n/es_PY.po
@@ -17,172 +17,172 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Tiempo restante para el cierre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Ingresos previstos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "Nº de casos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Reenviar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo localizar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Iniciativa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Demora a cerrar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Historial completo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Fecha empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Muy alto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Día"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Último email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo latitud"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geo asignación"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Fecha cierre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -191,251 +191,251 @@ msgstr ""
 "Indica la probabilidad de asignar una iniciativa a esta empresa. (0 "
 "significa ninguna asignación)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilidad media"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Anterior"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Error de red"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "De"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Nivel empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Sección"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Siguiente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioridad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Fecha límite excedida"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tipo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Empresa a la que este caso ha sido reenviado/asignado."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Muy bajo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Análisis de iniciativas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Fecha creación"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Pendiente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Asignación a Socio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "El tipo es utilizado para separar iniciativas y oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Julio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Etapa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Reenvío"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo localización"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Análisis de asignación de oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Enviar historial"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Cerrado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Marzo"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Análisis de asignación de op."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Número de días para cerrar el caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Peso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Abril"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -443,333 +443,333 @@ msgstr "Abril"
 msgid "Grade"
 msgstr "Nivel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Diciembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mes"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Fecha de apertura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Asunto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "# Oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Borrador"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Bajo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Cerrado"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Oportunidades asignadas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Fecha de asignación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilidad max."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Agosto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escalar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Junio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Número de días para abrir el caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Retraso de apertura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Usuario"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Activo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Noviembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Longitud Geo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Asignar iniciativa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Octubre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Asignación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Enero"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Ingresos esperados"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.empresa.nivel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Septiembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nombre de nivel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 "Última fecha en la que este caso fue reenviado/asignado a una empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Abrir"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Fecha geolocalización"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Actual"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Reenviar a empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Equipo de ventas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "may"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Ingreso estimado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -778,49 +778,49 @@ msgstr "Ingreso estimado"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Empresa asignada"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Oportunidad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Febrero"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -828,108 +828,108 @@ msgstr ""
 msgid "Country"
 msgstr "País"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Año"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Convertir a oportunidad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Asignar geo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Retraso de apertura"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Informe de iniciativas CRM"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Información de caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Alto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Fecha de creación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Socio"
 
diff --git a/addons/crm_channel/i18n/es_VE.po b/addons/crm_partner_assign/i18n/es_VE.po
similarity index 73%
rename from addons/crm_channel/i18n/es_VE.po
rename to addons/crm_partner_assign/i18n/es_VE.po
index 30dadccab13..40dc0776df7 100644
--- a/addons/crm_channel/i18n/es_VE.po
+++ b/addons/crm_partner_assign/i18n/es_VE.po
@@ -17,75 +17,75 @@ msgstr ""
 "X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
 "X-Generator: Launchpad (build 13830)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,name:0
 msgid "Send to"
 msgstr "Enviar a"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Retraso para cerrar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Ingreso previsto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "nº de casos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: view:crm.lead.forward.to.partner:0
 msgid "Forward"
 msgstr "Reenviar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply-to of the Sales team defined on this case"
 msgstr "\"Responder a\" del equipo de ventas definido en este caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo localizar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Marzo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Iniciativa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Demora cierre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Whole Story"
 msgstr "Historial completo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:41
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:41
 #, python-format
 msgid ""
 "Could not contact geolocation servers, please make sure you have a working "
@@ -94,51 +94,51 @@ msgstr ""
 "No se puede conectar con los servidores de geolocalización, por favor "
 "asegúrese de tener conexión a internet (%s)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_date:0
 msgid "Partner Date"
 msgstr "Fecha empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Más alta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Día"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Latest email"
 msgstr "Último email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo latitud"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geo asignación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Fecha cierre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -147,8 +147,8 @@ msgstr ""
 "Indica la probabilidad de asignar una iniciativa a esta empresa. (0 "
 "significa ninguna asignación)"
 
-#. module: crm_channel
-#: model:ir.module.module,description:crm_channel.module_meta_information
+#. module: crm_partner_assign
+#: model:ir.module.module,description:crm_partner_assign.module_meta_information
 msgid ""
 "\n"
 "This is the module used by OpenERP SA to redirect customers to his "
@@ -162,38 +162,38 @@ msgstr ""
 "basándose en geo-localización.\n"
 "    "
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Pendiente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,name:0
 #: field:crm.lead.forward.to.partner,partner_id:0
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilidad media"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Anterior"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:40
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:40
 #, python-format
 msgid "Network error"
 msgstr "Error de red"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_cc:0
 msgid ""
 "These addresses will receive a copy of this email. To modify the permanent "
@@ -202,520 +202,520 @@ msgstr ""
 "Estas direcciones recibirán una copia de este correo electrónico. Para "
 "modificar la lista CC permanente, edite el campo CC global de este caso."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "De"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: field:res.partner,grade_id:0
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Nivel empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Section"
 msgstr "Sección"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Siguiente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioridad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "State"
 msgstr "Estado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Fecha límite excedida"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,html:0
 msgid "HTML formatting?"
 msgstr "Formato HTML?"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tipo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Empresa a la que este caso ha sido reenviado/asignado."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Más baja"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Análisis de iniciativas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Fecha creación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,html:0
 msgid "Select this if you want to send email with HTML formatting."
 msgstr "Seleccione esta opción si desea enviar emails con formato HTML"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "7 Days"
 msgstr "7 días"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Asignación empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "El tipo es utilizado para separar iniciativas y oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Julio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Etapa"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:271
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:271
 #, python-format
 msgid "Fwd"
 msgstr "Reenvío"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo localización"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Análisis de asignación de oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history:0
 msgid "Send history"
 msgstr "Enviar historial"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Contact"
 msgstr "Contactar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Cerrar"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Análisis de asignación de op."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Número de días para cerrar el caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Peso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Retraso de apertura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 msgid "Grade"
 msgstr "Nivel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Diciembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mes"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Fecha de apertura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Asunto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Salesman"
 msgstr "Comercial"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply To"
 msgstr "Responder a"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,categ_id:0
 msgid "Category"
 msgstr "Categoría"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "nº oportunidades"
 
-#. module: crm_channel
-#: model:ir.module.module,shortdesc:crm_channel.module_meta_information
+#. module: crm_partner_assign
+#: model:ir.module.module,shortdesc:crm_partner_assign.module_meta_information
 msgid "Partner Geo-Localisation"
 msgstr "Geolocalización empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
 msgstr "¡Error! No puede crear miembros asociados recursivos."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Borrador"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Baja"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Cerrado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Oportunidades asignadas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Fecha de asignación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilidad max."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Agosto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escalar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "unknown"
 msgstr "desconocido"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Junio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Número de días para abrir el caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Demora de apertura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,name:0
 #: field:crm.lead.forward.to.partner,user_id:0
 #: field:crm.lead.report.assign,user_id:0
 msgid "User"
 msgstr "Usuario"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Activo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Noviembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Longitud Geo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Asignar iniciativa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Octubre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Asignación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_cc:0
 msgid "CC"
 msgstr "CC"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Enero"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Beneficio previsto"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.empresa.nivel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 msgid "Unchanged"
 msgstr "Sin cambios"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Septiembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Last 30 Days"
 msgstr "Últimos 30 días"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nombre de nivel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 "Última fecha en la que este caso fue reenviado/asignado a una empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Abierto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Fecha geolocalización"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Actual"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_to:0
 msgid "To"
 msgstr "Para"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Send new email"
 msgstr "Enviar nuevo email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Reenviar a empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Mayo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Ingreso estimado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Empresa asignada"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,address_id:0
 msgid "Address"
 msgstr "Dirección"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Oportunidad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Febrero"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,name:0
 msgid "Email Address"
 msgstr "Dirección de email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 msgid "Country"
 msgstr "País"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Convertir en oportunidad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Asignar geo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Abril"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "crm.lead"
 msgstr "crm.iniciativa"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Informe de iniciativas CRM"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
 msgid "Case Information"
 msgstr "Información de caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Message Body"
 msgstr "Cuerpo del mensaje"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Alta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Equipo de ventas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Fecha de creación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,state:0
 msgid "Set New State To"
 msgstr "Establecer nuevo estado a"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,name:0
 msgid "Year"
diff --git a/addons/crm_channel/i18n/fi.po b/addons/crm_partner_assign/i18n/fi.po
similarity index 72%
rename from addons/crm_channel/i18n/fi.po
rename to addons/crm_partner_assign/i18n/fi.po
index 5ae6d8c547c..9022aa67567 100644
--- a/addons/crm_channel/i18n/fi.po
+++ b/addons/crm_partner_assign/i18n/fi.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Sulkemisen viive"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Suunniteltu liikevaihto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "Tapausten määrä"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Ryhmittele"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Eteenpäin"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Alueellista"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Mahdollisuus"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Viive sulkemiseen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Koko tarina"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Yritys"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Kumppanin päiväys"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Korkein"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Päivä"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Viimeisin sähköposti"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Päättymispäivä"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Keskimääräinen todennäköisyys"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Edellinen"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Verkkovirhe"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Lähettäjä"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Kumppanitaso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Osa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Seuraava"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioriteetti"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Ylitetty aikaraja"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tyyppi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Kumppani jolle tämä tapaus on välitetty/siirretty."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Alin"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Mahdollisuuksien analyysi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Luontipäivämäärä"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Odottava"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Kumppanin määrittely"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tyyppiä käytetään erottamaan mahdollisuudet ja myyntimahdollisuudet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Heinäkuu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Vaihe"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Välitä"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Peruuta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Lähetyshistoria"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Sulje"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Maaliskuu"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Päivien määrä tapauksen sulkemiseen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Paino"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Huhtikuu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr "Huhtikuu"
 msgid "Grade"
 msgstr "Luokitus"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Joulukuu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Kuukausi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Avauspäivä"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Aihe"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "Mahdollisuuksien määrä"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Luonnos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Matala"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Suljettu"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Määritellyt mahdollisuudet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Määrittelypäivä"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Korkein todennäköisyys"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Elokuu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Tavallinen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Kohota"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Kesäkuu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Päivien määrä tapauksen avaamiseen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Viive avaamiseen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Käyttäjä"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Aktiivinen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Marraskuu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Laajennetut Suotimet..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Mahdollisuuden määrittely"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Lokakuu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Määrittely"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Tammikuu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Suunniteltu liikevaihto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Sekvenssi"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Syyskuu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Luokan nimi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Avaa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Nykyinen"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Välitä kumppanille"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Myyntitiimi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Toukokuu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Todennäköinen liikevaihto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr "Todennäköinen liikevaihto"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Mahdollisuus"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Asiakas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Helmikuu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,108 +825,108 @@ msgstr ""
 msgid "Country"
 msgstr "Maa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Vuosi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Muunna mahdollisuudeksi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Viive avaamiseen"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Tapauksen tiedot"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Korkea"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Luontipäivä"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Kumppani"
 
diff --git a/addons/crm_channel/i18n/fr.po b/addons/crm_partner_assign/i18n/fr.po
similarity index 77%
rename from addons/crm_channel/i18n/fr.po
rename to addons/crm_partner_assign/i18n/fr.po
index dd01aa4e0fe..ca2e8d0af9e 100644
--- a/addons/crm_channel/i18n/fr.po
+++ b/addons/crm_partner_assign/i18n/fr.po
@@ -18,172 +18,172 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Délai pour fermer"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Chiffre d'affaires prévu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "Nb. de cas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Regrouper par..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Transférer"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Géolocalisation"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Corps"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Piste"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Délai pour fermer"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Historique complet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Société"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Date du partenaire"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "La Plus haute"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Jour"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Identifiant unique de message"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Dernier courriel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Géo-latitude"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Annulé"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Assignation géographique"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Date de fermeture"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -192,251 +192,251 @@ msgstr ""
 "Donne la probabilité d'affecter une piste à ce partenaire (0 signifie pas "
 "d'affectation)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilité moyenne"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Précedent"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Erreur de réseau"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "De"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Note du partenaire"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Équipe de vente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Envoyer"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Suivant"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Priorité"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Échéance dépassée"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Type"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Le partenaire auquel ce cas a été transmis / affecté."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "La plus basse"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Modèle"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Attribuer une date"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Analyse des pistes"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Date de création"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID du document associé"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "En attente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Assignation de partenaire"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Le type est utilisé pour différencier les pistes des opportunités"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Juillet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Étape"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Transférer"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Géolocalisation"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Analyse de l'affectation des opportunités"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Annuler"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Envoyer l'historique"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Fermer"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Mars"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Analyse de l'affectation des opportunités"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Nombre de jours pour clôturer le cas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Poids"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Avril"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -444,333 +444,333 @@ msgstr "Avril"
 msgid "Grade"
 msgstr "Niveau"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Décembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mois"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Date d'ouverture"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Sujet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "Nb. d'opportunités"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Équipe"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Brouillon"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Basse"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Fermé"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Réexpédition en masse au partenaire"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Opportunités affectées"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Date d'affectation"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilité maximale"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Août"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normale"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escalader"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Juin"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Nombre de jours pour ouvrir le cas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Délai pour ouvrir"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Utilisateur"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Actif"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Novembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtres étendus"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Longitude"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "Nb d'opportunités"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Assignation de la piste"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Octobre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Affectation"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Janvier"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Envoyer le courriel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Date"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Revenus planifiés"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "ID du message"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Pièces jointes"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Séquence"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Septembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nom du niveau"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 "Dernière date à laquelle ce cas a été transmis / affecté à un partenaire"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Ouvert"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Date de la géolocalisation"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Actuel"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Transférer au partenaire"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Équipe commerciale"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Mai"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Revenu probable"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -779,49 +779,49 @@ msgstr "Revenu probable"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Partenaire affecté"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Opportunité"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Client"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Février"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Nom"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -829,108 +829,108 @@ msgstr ""
 msgid "Country"
 msgstr "Pays"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Année"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Convertir en opportunité"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Géo-affectation"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Délai pour ouvrir"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "Analyse du partenariat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Analyse du partenaire attribué"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Rapport sur les pistes du CRM"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Information sur l'incident"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "Rapport CRM du partenaire"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Élevée"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Date de création"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filtres"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Partenaire"
 
diff --git a/addons/crm_channel/i18n/gl.po b/addons/crm_partner_assign/i18n/gl.po
similarity index 73%
rename from addons/crm_channel/i18n/gl.po
rename to addons/crm_partner_assign/i18n/gl.po
index 8edf547b162..46037a78b8b 100644
--- a/addons/crm_channel/i18n/gl.po
+++ b/addons/crm_partner_assign/i18n/gl.po
@@ -17,172 +17,172 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Atraso para pechar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Ingresos previstos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "Nº de casos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Reenviar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Xeolocalizar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Posible cliente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Demora peche"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Historial completo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Compañía"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Data empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "A máis alta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Día"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Último email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Xeolatitude"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Anulado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Xeoasignación"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Data de peche"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -191,251 +191,251 @@ msgstr ""
 "Indica a probabilidade de asignar unha iniciativa a esta empresa. (0 "
 "significa ningunha asignación)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilidade media"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Previo"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Erro de rede"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Desde"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Nivel empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Sección"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Seguinte"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioridade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Data límite excedida"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tipo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Empresa á que se reenviou/asignou este caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Análise de posibles clientes"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Data de creación"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Pendente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Asignación empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Utilízase Tipo para separar iniciativas e oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Xullo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Fase"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Reenvío"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Xeolocalización"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Análise de asignación de oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Anular"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Enviar historial"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Pechar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Marzo"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Análise de asignación de op."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Número de días para pechar o caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Peso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Abril"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -443,332 +443,332 @@ msgstr "Abril"
 msgid "Grade"
 msgstr "Grao"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Decembro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mes"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Data de apertura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Asunto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "Nº oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Proxecto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Baixo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Pechado"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Oportunidades asignadas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Data de asignación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilidade máx."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Agosto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escalar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Xuño"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Número de días para abrir o caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Atraso de apertura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Usuario"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Activo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Novembro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Lonxitude Xeo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Asignar posible cliente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Outubro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Asignación"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Xaneiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Beneficio previsto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.empresa.nivel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Setembro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nome de nivel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "Última data na que este caso foi reenviado/asignado a unha empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Abrir"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Data xeolocalización"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Actual"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Reenviar a empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Equipo de vendas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Maio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Ingreso estimado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -777,49 +777,49 @@ msgstr "Ingreso estimado"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Empresa asignada"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Oportunidade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Febreiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -827,108 +827,108 @@ msgstr ""
 msgid "Country"
 msgstr "País"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Ano"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Convertir en oportunidade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Xeo asignar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Atraso de apertura"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Informe de iniciativas CRM"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Información do caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Alto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Crear data"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Socio"
 
diff --git a/addons/crm_channel/i18n/hr.po b/addons/crm_partner_assign/i18n/hr.po
similarity index 69%
rename from addons/crm_channel/i18n/hr.po
rename to addons/crm_partner_assign/i18n/hr.po
index 82924ae92f4..408163d9d03 100644
--- a/addons/crm_channel/i18n/hr.po
+++ b/addons/crm_partner_assign/i18n/hr.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Planirani prihod"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# Slučaja"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Grupiraj po..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Proslijedi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Cijela priča"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Organizacija"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Najviši"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Dan"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Datum zatvaranja"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Prethodni"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Greška mreže"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Na čekanju"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Ožujak"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr ""
 msgid "Grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Prodajni tim"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr ""
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,108 +825,108 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Partner"
 
diff --git a/addons/crm_channel/i18n/hu.po b/addons/crm_partner_assign/i18n/hu.po
similarity index 75%
rename from addons/crm_channel/i18n/hu.po
rename to addons/crm_partner_assign/i18n/hu.po
index 219cd1881c0..e8353308eb5 100644
--- a/addons/crm_channel/i18n/hu.po
+++ b/addons/crm_partner_assign/i18n/hu.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#    * crm_channel
+#    * crm_partner_assign
 #
 msgid ""
 msgstr ""
@@ -16,22 +16,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Késleltetés a zárásig"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Szerző"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Tervezett jövedelem"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
@@ -40,43 +40,43 @@ msgstr ""
 "Üzenet típus: email az email üzenetre, figyelmeztetés egy rendszer üzenetre, "
 "hozzászólás egy másik üzenetre mint felhasználói válaszok"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "Esetek száma"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Csoportosítás..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Automatikusan letisztított HTML tartalom"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Előre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Földrajzi fekvés meghatározása"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Kedvenc"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Törzs"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -85,107 +85,107 @@ msgstr ""
 "A küldő e-mail címei. Ez a mező lesz beállítva, ha nem talált egyező "
 "partnert a bejövő levelekhez."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr "Partnerség dátuma"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Érdeklődő"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Késleltetés a zárásig"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Teljes történet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Vállalat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Értesítések"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Partner dátum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Értékesítő"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Legmagasabb"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Nap"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Üzenet egyedi azonosító"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr "Következő partner felülvizsgálata"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Utolsó e-mail"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Földrajzi szélesség"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Törölt"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geo hozzárendelés"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Email összeállító varázsló"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Tényleges árbevétel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Zárás dátuma"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -194,231 +194,231 @@ msgstr ""
 "A partnerhez kiadható érdeklődés valószínűségét adja meg. (A nincs kiadást a "
 "0 jelenti)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr "Partner aktiválás"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Rendszerüzenet"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr "Továbblépés érdeklődésről"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Átlagos valószínűség"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Előző"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Hálózati hiba"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Kezdő dátum"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Partner minősítése"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Szakasz"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Küldés"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Következő"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioritás"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Túllépett határidő"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Típus"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "E-mail"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 "A partenr ebben az esetben ezzel együtt el lesz küldve/hozzá lesz rendelve."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Legalacsonyabb"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Számla dátuma"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Sablon"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Dátum hozzárendelés"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Érdeklődők elemzése"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Létrehozás dátuma"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "res.partner.activation"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Partner üzenet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "Kapcsolódó dokumentum azonosító ID"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Függőben lévő"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Partner hozzárendelés"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "A típust az érdeklődők és a lehetőségek szétválasztására használja"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Július"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr "Felülvizsgálat dátuma"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Szakasz"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Állapot"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "Elolvas"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Továbbítandó"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Földrajzi fekvés"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Esély lehetőség hozzárendelés elemzések"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Mégsem"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Történet elküldése"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Zárás"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Március"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Esély hozzárendelés elemzések"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Napok száma az eset lezárásáig"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
@@ -426,22 +426,22 @@ msgstr ""
 "Partnerek akiknek van egy értesítésük ennek az üzenetnek a levelező "
 "ládájukba való mozgatására"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Súly"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Április"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -449,259 +449,259 @@ msgstr "Április"
 msgid "Grade"
 msgstr "Fokozat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "December"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Felhasználók akik szavaztak erre az üzenetre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Hónap"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Nyitó dátum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Alcsoportba rakott üzenetek"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "Legutóbbi partner felülvizsgálat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Tárgy"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "vagy"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Tartalmak"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Szavazatok"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "Esélyek száma"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 "A jelenlegi felhasználónak van egy kicsillagozott, kedvenc értesítése mely "
 "hozzá van rendelve az üzenethez."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr "Partnerkapcsolat dátuma"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Csapat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Tervezet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Alacsony"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Lezárt"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Tömeges továbbküldés partnereknek"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Hozzárendelt esélyek"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Hozzárendelés dátuma"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Max. valószínűség"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Augusztus"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr "A név az ide vonatkozó dokumentumról levéve."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normál"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Fokozat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Június"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Napok száma az eset megnyitásáig"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Nyitás késleltetése"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Felhasználó"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Aktív"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "November"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Kiterjesztett szűrők…"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Földrajzi hosszúság"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# esélyek száma"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Lehetőség hozzárendelés"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Október"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Hozzárendelések"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Január"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Levél küldése"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Dátum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Tervezett bevételek"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "Partner felülvizsgálata"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Számlázási időszak"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Üzenet-ID azonosító"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Mellékletek"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Üzenet rekord név"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Sorszám"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
@@ -710,77 +710,77 @@ msgstr ""
 "Nem tud a geo szerverhez kapcsolódni. Győződjön meg róla, hogy az internet "
 "kapcsolat csatlakoztatva van és működik (%s)."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Szeptember"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Fokozat neve"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 "Ebben az esetben az utolsó dátum a partnerhez el lesz küldve/hozzá lesz "
 "rendelve"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Nyitott"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Altípus"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Földrajzi helymeghatározás dátuma"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Jelenleg"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Érdeklődő/Lehetőség"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Értesített partnerek"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "A partnernek továbbküldve"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Értékesítési csapat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Május"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Várható bevétel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -789,51 +789,51 @@ msgstr "Várható bevétel"
 msgid "Activation"
 msgstr "Aktiválás"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Hozzárendelt partner"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "Partner szint"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 "A jelenlegi felhasználónak van egy olvasatlan értesítése ehhez az üzenethez "
 "csatolva"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Lehetőség"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Vevő"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Február"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Név"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Partner aktiválások"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -841,34 +841,34 @@ msgstr "Partner aktiválások"
 msgid "Country"
 msgstr "Ország"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Év"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Átalakítás lehetőséggé"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Geo hozzárend."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Késleltetés a nyitáshoz"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "Partnerkapcsolat elemzések"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
@@ -877,32 +877,32 @@ msgstr ""
 "Technikai mező a értesítés üzenetek tárolásához. Használja a "
 "notified_partner_ids az értesített partnerek eléréséhez."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Partner hozzárendelés elemzés"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "CRM Érdeklődők jelentése"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Összeállítási mód"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "Ide vonatkozó dokumentum modell"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Eset információ"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -911,42 +911,42 @@ msgstr ""
 "Az üzenet szerzője. Ha nincs beállítva,  az e-mail ettől, egy címet "
 "tartalmaz ami nem mutat egyik partnerre sem."
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM Partner jelentés"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Magas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "További kapcsolatok"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "Elsődleges összefűzött üzenet."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Létrehozás dátuma"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Szűrők"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Partner"
 
diff --git a/addons/crm_channel/i18n/it.po b/addons/crm_partner_assign/i18n/it.po
similarity index 74%
rename from addons/crm_channel/i18n/it.po
rename to addons/crm_partner_assign/i18n/it.po
index a344a40b2ad..1f5a95ed07f 100644
--- a/addons/crm_channel/i18n/it.po
+++ b/addons/crm_partner_assign/i18n/it.po
@@ -17,65 +17,65 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Ritardo chiusura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Autore"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Entrate pianificate"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# di Casi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Raggruppa per..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Pulisci automaticamente il contenuto HTML"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Inoltra"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo localizzazione"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Corpo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -84,107 +84,107 @@ msgstr ""
 "Indirizzo email del mittente. Questo campo è impostato quando non viene "
 "trovato nessun partner corrispondente per le email in arrivo."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr "Data della partnership"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Iniziativa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Ritardo chiusura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Storia intera"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Azienda"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Notifiche"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Data Partner"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Commerciale"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Maggiore"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Giorno"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Identificativo univoco messaggio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr "Prossuma revisione partner"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Ultima email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo Latitudine"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Annullato"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geo assegnazione"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Wizard composizione email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Ricambio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Data chiusura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -193,251 +193,251 @@ msgstr ""
 "Fornisce la probabilità di assegnare una iniziativa a questo Partner. (0 "
 "significa nessun assegnamento)."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr "Attivazione partner"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Notifica di sistema"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilità media"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Precedente"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Errore di rete"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Da"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Qualità del Partner"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Sezione"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Invia"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Prossimo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Priorità"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Scadenza superata"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tipo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "Email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Il partner di questo caso è stato inoltrato/assegnato a"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Minore"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Data fattura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Modello"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Data assegnamento"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Analisi iniziative"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Data creazione"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "res.partner.activation"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Messaggio padre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID documento collegato"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "In sospeso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Assegnazione Partner"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tipo è utilizzato per separare Iniziative e Opportunità"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Luglio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr "Data revisione"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Stadio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Stato"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "Da leggere"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Inoltra"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo Localizzazione"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Analisi assegnamento opportunità"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Annulla"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Invia storico"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Chiudi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Marzo"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Analisi assegnamento opportunità"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Numero di giorni per chiudere il caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Commento"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Peso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Aprile"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -445,332 +445,332 @@ msgstr "Aprile"
 msgid "Grade"
 msgstr "Qualità"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Dicembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mese"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Data apertura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Messaggi Figli"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "Ultima revisione partner"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Oggetto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "o"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Contenuti"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Voti"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "# Opportunità"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr "Data partnership"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Team"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Bozza"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Basso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Chiuso"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Inoltro massivo a partner"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Opportunità assegnate"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Data assegnazione"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilità massima"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Agosto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normale"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Intensificare"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Giugno"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Numero di giorni per aprire il caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Ritardo di apertura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Utente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Attivo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Novembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtri estesi..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Geo Longitudine"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# di opportunità"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Ottobre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Assegnamento"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Gennaio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Invia email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Data"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Entrate pianificate"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "Revisione partner"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Periodo fatturazione"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "ID Messaggio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Allegati"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Sequenza"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Settembre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nome grado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Apri"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Sottotipo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Data geo localizzazione"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Attuale"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Lead/Opportunità"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Partners notificati"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Inoltra a Partner"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Team di vendita"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Maggio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Entrate probabili"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -779,49 +779,49 @@ msgstr "Entrate probabili"
 msgid "Activation"
 msgstr "Attivazione"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Partner assegnato"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "Livello partner"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Opportunità"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Febbraio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Nome"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Attivazione partner"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -829,108 +829,108 @@ msgstr "Attivazione partner"
 msgid "Country"
 msgstr "Paese"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Anno"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Converti in Opportunità"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Geo assegnamento"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Ritardo apertura"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "Analisi partnership"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "CRM Report iniziative"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Data creazione"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Partner"
 
diff --git a/addons/crm_channel/i18n/ja.po b/addons/crm_partner_assign/i18n/ja.po
similarity index 75%
rename from addons/crm_channel/i18n/ja.po
rename to addons/crm_partner_assign/i18n/ja.po
index 6f2ba678cca..3fb3fb15764 100644
--- a/addons/crm_channel/i18n/ja.po
+++ b/addons/crm_partner_assign/i18n/ja.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "締めを延期する"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "売上予定"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "事例の数"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "グループ化…"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "転送"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "ジオロカライゼーション"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "本文"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "リード"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "締めを延期する"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "全ストーリー"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "会社"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "パートナ日付"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "最高"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "日"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "メッセージ識別番号"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "前回のEメール"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "ジオ緯度"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "キャンセルされました"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "ジオ割当て"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "締切り日"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr "リードをこのパートナに割当てる確率を指定します（0 は割当て無しを意味します）"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "平均確率"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "前へ"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "ネットワークエラー"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "差出人"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "パートナー等級"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "セクション"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "送信する"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "次へ"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "優先度"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "締切日を経過"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "タイプ"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "当件を転送 / 割当てたパートナ"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "最低"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "テンプレート"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "割当て日"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "リード分析"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "作成日"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "関連する文書ID"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "保留"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "パートナの割当て"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "リードと商談を区別するためにタイプを使います。"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "7月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "段階"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "転送"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "ジオロケーション"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "商談割当分析"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "キャンセル"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "履歴を送る"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "締める"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "3月"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "好機割当て分析"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "当件を締めるまでの日数"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "重量"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "4月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr "4月"
 msgid "Grade"
 msgstr "等級"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "12月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "開始日"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "件名"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "商談の数"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "チーム"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "予定"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "低い"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "終了"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "パートナに大量に転送"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "割当済商談"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "割当て日"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "最大確率"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "8月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "正常"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "エスカレート"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "6月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "案件を開くまでの日数"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "開始を延期する"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "ユーザ"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "仕掛り中"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "11月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "拡張フィルタ…"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "ジオ緯度"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "商談の数"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "リードの割当て"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "10月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "割当て"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "1月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Eメールを送信"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "日付"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "予定売上"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "メッセージID"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "添付"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "順序"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "9月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "等級名"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "当件がパートナに転送/割当てられて最後の日付"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "未割当て"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "ジオローカル化の日付"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "現在"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "パートナへ転送する"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "営業チーム"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "5月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "見込み売上"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr "見込み売上"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "割当てたパートナ"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "商談"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "顧客"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "2月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "氏名"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,108 +825,108 @@ msgstr ""
 msgid "Country"
 msgstr "国"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "年"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "商談に変換"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "ジオ割当て"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "開始を延期する"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "パートナ分析"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "割当てパートナの分析"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "CRMリード報告書"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "事象情報"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRMパートナ報告書"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "高"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "作成日"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "フィルタ"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "パートナ"
 
diff --git a/addons/crm_channel/i18n/ko.po b/addons/crm_partner_assign/i18n/ko.po
similarity index 73%
rename from addons/crm_channel/i18n/ko.po
rename to addons/crm_partner_assign/i18n/ko.po
index cb8970bc8a9..f5b394c4634 100644
--- a/addons/crm_channel/i18n/ko.po
+++ b/addons/crm_partner_assign/i18n/ko.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-30 05:27+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "마감까지의 지연"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "작성자"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "계획된 수익"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr "메시지 유형: 이메일 메시지를 위한 이메일, 시스템 메시지를 위한 알림, 사용자 댓글과 같은 기타 메시지에 대한 의견"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "사례 #"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "분류 기준..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "HTML 내용 중 불건전한 내용을 자동으로 제거함"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "전달"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "지리적 지역화"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "별표 추가됨"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "본문"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr "보내는 사람의 이메일 주소. 이 필드는 수신 메일에서 일치하는 협력업체를 찾을 수 없을 때 설정됩니다."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr "협력관계 합의일"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "리드"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "마감까지의 지연"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "전체 이야기"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "업체"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "알림"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "협력업체 날짜"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "영업사원"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "가장 높음"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "일"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "메시지 유일 식별자"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr "다음 협력업체 검토"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "최근 이메일"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "지리적 위도"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "취소됨"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "지리적 할당"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "이메일 작성 마법사"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "회전율"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "마감일"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr "이 협력업체에 리드를 할당할 확률을 제공함. (0은 할당 없음을 의미,)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr "협력업체 활성화"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "시스템 알림"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr "리드 전달"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "평균 확률"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "이전"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "네트워크 오류"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "보낸 사람"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "협력업체 등급"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "부서"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "보내기"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "다음"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "우선 순위"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "과거 기한"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "유형"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "이메일"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "이 사례가 전달/할당된 협력업체"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "가장 낮음"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "송장 발행일"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "서식"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "날짜 할당"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "리드 분석"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "생성일"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "res.partner.activation"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "상위 메시지"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "관련 문서 ID"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "보류 중"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "협력업체 할당"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "유형은 리드와 기회를 구분하기 위해 사용됩니다"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "7월"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr "검토 날짜"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "단계"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "상태"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "읽기 대상"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "전달"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "지리적 지역화"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "기회 할당 분석"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "취소"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "전송 기록"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "닫기"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "3월"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Opp. Assignment Analysis"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "사례를 마감하기까지의 잔여일수"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr "편지함에 이 메시지를 푸시하는 알림이 있는 협력업체"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "의견"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "가중"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "4월"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr "4월"
 msgid "Grade"
 msgstr "등급"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "12월"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "이 메시지에 투표한 사용자"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "월"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "개시일"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "하위 메시지"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "최근 협력업체 검토"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "제목"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "또는"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "내용"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "투표수"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "기회#"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr "현재 사용자에게 이 메시지와 연결된 별표 표시된 알림이 있습니다."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr "협력관계 협약일"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "팀"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "초안"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "낮음"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "마감됨"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "협력업체에게 대량 전달"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "할당된 기회"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "할당일"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "최대 확률"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "8월"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "보통"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "승급"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "6월"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "사례 개시까지의 소요일수"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "개시까지의 지연"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "사용자"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "활성"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "11월"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "확장 필터..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "지리적 경도"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "기회 #"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "리드 할당"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "10월"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "할당"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "1월"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "메일 보내기"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "날짜"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "계획된 수익"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "협력업체 검토"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "송장 발행 주기"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Message-Id"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "첨부 파일"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "메시지 기록명"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "순서"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr "지리위치서버를 연결할 수 없음. 인터넷 연결이 존재하고 실행 중인지 확인하십시오 (%s)."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "9월"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "등급명"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "이 사례가 협력업체로 전달/할당된 최근 날짜"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "열기"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "하위형식"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "지리위치일"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "현재"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "리드/기회"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "통보한 협력업체"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "협력업체에 전달"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "영업팀"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "5월"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "예상 수익"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr "예상 수익"
 msgid "Activation"
 msgstr "활성화"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "할당된 협력업체"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "협력업체 수준"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr "현재 사용자에게 이 메시지와 연결된 읽지 않은 알림이 있습니다."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "기회"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "고객"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "2월"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "이름"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "협력업체 활성화"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,66 +825,66 @@ msgstr "협력업체 활성화"
 msgid "Country"
 msgstr "국가"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "연도"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "기회로 전환"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "지역적 할당"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "개시까지의 지연"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "협력관계 분석"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr "메시지 알림을 포함한 기술적 필드. notified_partner_id를 이용하여 통보된 협력업체에 접근하십시오."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "할당된 협력업체 분석"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "CRM 리드 보고서"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "작성 모드"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "관련된 문서 모델"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "사례 정보"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -892,41 +892,41 @@ msgid ""
 msgstr ""
 "메시지의 작성자. 설정되지 않았을 경우, email_from에 모든 협력업체와 일치하지 않은 이메일 주소를 포함할 수 있습니다."
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM 협력업체 보고서"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "높음"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "추가적인 연락처"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "초기 스레드 메시지"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "생성일"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "필터"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "협력업체"
diff --git a/addons/crm_channel/i18n/lt.po b/addons/crm_partner_assign/i18n/lt.po
similarity index 69%
rename from addons/crm_channel/i18n/lt.po
rename to addons/crm_partner_assign/i18n/lt.po
index 83c41b07562..ffeb7e9a9a6 100644
--- a/addons/crm_channel/i18n/lt.po
+++ b/addons/crm_partner_assign/i18n/lt.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr ""
 msgid "Grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr ""
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,107 +825,107 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr ""
diff --git a/addons/crm_channel/i18n/lv.po b/addons/crm_partner_assign/i18n/lv.po
similarity index 73%
rename from addons/crm_channel/i18n/lv.po
rename to addons/crm_partner_assign/i18n/lv.po
index 77176fd057e..48f66608aa9 100644
--- a/addons/crm_channel/i18n/lv.po
+++ b/addons/crm_partner_assign/i18n/lv.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Aizkave līdz slēgšanai"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Plānotie ieņēmumi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "Lietu skaits"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Grupēt pēc..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Pārsūtīt"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Ģeo. lokalizācija"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Pavediens"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Aizkave pirms slēgšanas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Viss stāsts"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Uzņēmums"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Partnera datums"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Augstākā"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Diena"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Pēdējais e-pasts"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Ģeo. platums"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Atcelts"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Ģeo. noteikšana"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Slēgšanas datums"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Vidējā iespējamība"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Iepriekšējais"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Tīkla kļūda"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "No"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Partnera novērtējums"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Sadaļa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Nākamais"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioritāte"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Noilgušais termiņš"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tips"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Partneris, kuram šī lieta tika nodota/uzticēta."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Zemākā"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Pavedienu analīze"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Izveidošanas datums"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Neizlemts"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Partnera uzticēšana"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tips tiek lietots, lai atdalītu pavedienus no izdevībām"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Jūlijs"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Posms"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Pārs."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo. lokalizācoja"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Izdevību uzticēšanas analīze"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Atcelt"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Sūtīt vēsturi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Aizvērt"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Marts"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Izdevību uzticēšanas analīze"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Dienu skaits līdz lietas slēgšanai"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Svars"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Aprīlis"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr "Aprīlis"
 msgid "Grade"
 msgstr "Novērtējums"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Decembris"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mēnesis"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Atvēršanas datums"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Temats"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "Izdevību skaits"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Melnraksts"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Zema"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Slēgts"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Uzticētas izdevības"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Uzticēšanas datums"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Maks. iespējamība"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Augusts"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normāla"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Eskalēt"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Jūnijs"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Dienu skaits līdz lietas atvēršanai"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Aizkave līdz atvēršanai"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Lietotājs"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Aktīvs"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Novembris"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Paplašinātie filtri..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Geo. garums"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Oktobris"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Uzticēšana"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Janvāris"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Plānotie ieņēmumi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Secība"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Septembris"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Novērtējuma nosaukums"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "Pēdējais datums, kad šī lieta tika pārsūtīta/uzticēta partnerim"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Atvērts"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Ģeo. lokalizācijas datums"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Pašreizējs"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Pārsūtīt partnerim"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Pārdošanas komanda"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Maijs"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Iespējamie ieņēmumi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr "Iespējamie ieņēmumi"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Partneris, kam uzticēts"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Izdevība"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Klients"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Februāris"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,108 +825,108 @@ msgstr ""
 msgid "Country"
 msgstr "Valsts"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Gads"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Pārveidot par izdevību"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Ģeo. uzt."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Aizkave līdz atvēršanai"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "CRM pavedienu atskaite"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Lietas informācija"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Augsta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Izveidošanas datums"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Partneris"
 
diff --git a/addons/crm_channel/i18n/mk.po b/addons/crm_partner_assign/i18n/mk.po
similarity index 74%
rename from addons/crm_channel/i18n/mk.po
rename to addons/crm_partner_assign/i18n/mk.po
index 4c72d48d3f2..cb1d49c8580 100644
--- a/addons/crm_channel/i18n/mk.po
+++ b/addons/crm_partner_assign/i18n/mk.po
@@ -17,22 +17,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Одолжување до затварање"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Автор"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Планиран приход"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
@@ -41,43 +41,43 @@ msgstr ""
 "Тип на порака: e-mail за e-mail порака, известување за системски пораки, "
 "коментар за други пораки како кориснички одговори"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# од случаи"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Групирај по..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Автоматски санирани HTML содржини"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Напред"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Набљудувани"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Тело"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -86,337 +86,337 @@ msgstr ""
 "E-mail адреса на испраќачот. Ова поле се поставува кога нема партнер што се "
 "совпаѓа за дојдовните e-mail пораки."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Водечко"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Одолжување до затварање"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Цела сторија"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Компанија"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Известувања"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Продавач"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Највисоко"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Ден"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Единствен идентификатор на порака"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Откажано"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Волшебник за креирање на Е-пошта"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Промет"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Системско известување"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Претходно"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Грешка во мрежата"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Од"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Секција"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Испрати"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Следно"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Приоритет"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Пречекорен краен рок"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tип"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "Е-пошта"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Партнер кому овој предмет му е препратен/доделен."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Најниско"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Урнек"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Датум на креирање"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Изворна порака"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID на поврзан документ"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Чекам"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Типот се користи за да се разделат Траги и Можности"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Јули"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Етапа"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Статус"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "За читање"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Откажи"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Затвори"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Март"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Број на денови за затварање на случај"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
@@ -424,22 +424,22 @@ msgstr ""
 "Партнери што имаат известувања што ја проследуваат пораката до нивните "
 "сандачиња"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Коментар"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Тежина"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Април"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -447,332 +447,332 @@ msgstr "Април"
 msgid "Grade"
 msgstr "Степен"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Декември"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Корисници што гласале за оваа порака"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Месец"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Датум на отварање"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Порака (дете)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Тема"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "или"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Содржина"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Гласови"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#Можности"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr "Моменталниот корисник има известување поврзано со оваа порака"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Тим"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Нацрт"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Ниско"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Затворено"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Назначени можности"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Датум на назначување"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Максимална веројатност"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Август"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Нормално"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Јуни"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Одолжување до отварање"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Корисник"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Активно"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Ноември"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Проширени филтри..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Октомври"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Јануари"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Испрати маил"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Датум"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Планирани приходи"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Идентификатор на порака"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Прилози"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Име на записот на пораката"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Секвенца"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Септември"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "Последниот датум овој предмет беше препратен/доделен на партнер"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Отвори"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Подтип"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Тековно"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Известени партнери"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Препрати до партнер"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Продажен тим"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Мај"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Веројатен приход"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -781,49 +781,49 @@ msgstr "Веројатен приход"
 msgid "Activation"
 msgstr "Активација"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Назначен партнер"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr "Овој корисник има непрочитано известување поврзано со оваа порака"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Можност"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Купувач"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Февруари"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Име"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -831,34 +831,34 @@ msgstr ""
 msgid "Country"
 msgstr "Земја"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Година"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Претвори во можност"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Одложување до отварање"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "Анализа на партнерство"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
@@ -867,32 +867,32 @@ msgstr ""
 "Техничко поле што ги содржи пораките за известувања. Користете "
 "notified_partner_ids за пристап до известените партнери."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Режим на составување"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "Поврзан модел на документ"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Информација за случај"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -901,41 +901,41 @@ msgstr ""
 "Автор на пораката. Доколку не е подесено, email_from може да содржи e-mail "
 "адреса што не се совпаѓа со никој партнер."
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Висок"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Додатни контакти"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "Почетна тема на пораката"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Креирај датум"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Филтри"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Партнер"
diff --git a/addons/crm_channel/i18n/mn.po b/addons/crm_partner_assign/i18n/mn.po
similarity index 72%
rename from addons/crm_channel/i18n/mn.po
rename to addons/crm_partner_assign/i18n/mn.po
index 9fa10322664..a42c612f6e1 100644
--- a/addons/crm_channel/i18n/mn.po
+++ b/addons/crm_partner_assign/i18n/mn.po
@@ -17,22 +17,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Хаахыг Азнах"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Зохиогч"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Төлөвлөсөн орлого"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
@@ -41,43 +41,43 @@ msgstr ""
 "Зурвасын төрөл: имэйл зурваст зориулсан имэйл, системийн зурвасын мэдэгдэл, "
 "бусад зурвас дахь сэтгэгдэл буюу хариулт гэх мэт"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Бүлэглэх..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Автомат янзлагдсан HTML агуулга"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Урагш"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Одоор тэмдэглэсэн"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -86,358 +86,358 @@ msgstr ""
 "Илгээгчийн имэйл хаяг. Ирсэн имэйлд тохирох харилцагч олдоогүй тохиолдолд "
 "энэ талбар нь тохируулагдана."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Хаахыг азнах"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Компани"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Мэдэгдлүүд"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Хамтрагч огноо"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Худалдагч"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Хамгийн Өндөр"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Өдөр"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Хамгийн сүүлийн Имэйл"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Цуцлагдсан"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Имэйл үүсгэх харилцах цонх"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Хаах огноо"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Системийн мэдэгдэл"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Өмнөх"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Сүлжээний алдаа"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Хамтрагч түвшин"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Хэсэг"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Илгээх"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Дараагийх"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Чухалчлал"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Хугацаа хэтэрсэн тов"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Төрөл"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "Имэйл"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Хамгийн Бага"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Үлгэр"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Үүсгэсэн огноо"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "res.partner.activation"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Эцэг зурвас"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "Холбогдох Баримтын ID"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Хүлээгдэж буй"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Сэжим болон Борлуулалтыг тусгаарлахад хэрэглэхэд төрөл"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "7-р сар"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Шат"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Төлөв"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Цуцлах"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Түүх илгээх"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Хаах"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "3-р сар"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Сэтгэгдэл"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Жин"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "4-р сар"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -445,332 +445,332 @@ msgstr "4-р сар"
 msgid "Grade"
 msgstr "Түвшин"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "12-р сар"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Энэ зурвасд санал өгсөн хэрэглэгчид"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Сар"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Нээх огноо"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Дэд зурвасууд"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Гарчиг"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "эсвэл"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Агуулга"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Саналууд"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#Боломжууд"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Баг"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Ноорог"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Хаагдсан"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "8-р сар"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Энгийн"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Томруулах"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "6-р сар"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Хэрэгийг нээх өдрийн тоо"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Нээхийг Азнах"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Хэрэглэгч"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Идэвхтэй"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "11-р сар"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Өргөтгөсөн Шүүлтүүр..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "10-р сар"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "1-р сар"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Имэйл илгээх"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Огноо"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Төлөвлөсөн орлого"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Хавсралт"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Зурвасын Бичлэгийн Нэр"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Дараалал"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "9-р сар"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Дэд төрөл"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Идэвхтэй"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Сэжим/Боломж"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Мэдэгдэл хүрсэн харилцагчид"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Борлуулалтын баг"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "5-р сар"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Магадлалт орлого"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -779,49 +779,49 @@ msgstr "Магадлалт орлого"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Боломж"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Үйлчлүүлэгч"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "2-р сар"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Нэр"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Хамтрагч идэвхжүүлэлт"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -829,34 +829,34 @@ msgstr "Хамтрагч идэвхжүүлэлт"
 msgid "Country"
 msgstr "Улс"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Жил"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Боломж руу хөрвүүлэх"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Нээхээ азнах"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
@@ -865,73 +865,73 @@ msgstr ""
 "Зурвас мэдэгдлийг хадгалах талбарын техник нэр. notified_partner_ids-г "
 "мэдэгдэл очсон харилцагчид руу хандахдаа хэрэглэ."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "CRM Судалгааны Тайлан"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "Холбогдох Баримтын Модель"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Өндөр"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Нэмэлт холбогчид"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "Мөчирийн эхлэлийн зурвас."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Үүсгэх огноо"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Шүүлтүүд"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Харилцагч"
diff --git a/addons/crm_channel/i18n/nb.po b/addons/crm_partner_assign/i18n/nb.po
similarity index 72%
rename from addons/crm_channel/i18n/nb.po
rename to addons/crm_partner_assign/i18n/nb.po
index ce9a6a1cdce..c47ef3d732c 100644
--- a/addons/crm_channel/i18n/nb.po
+++ b/addons/crm_partner_assign/i18n/nb.po
@@ -17,65 +17,65 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Forsinkelse til lukking."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Forfatter."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Planlagt omsetning."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# av Saker."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Grupper etter ..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Fremover."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo lokalisert."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Kropp."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -84,359 +84,359 @@ msgstr ""
 "E-postadressen til avsenderen. Dette feltet er satt når ingen samsvarende "
 "partner er funnet for innkommende e-post."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr "Dato Partnerskap."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Fører."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Forsinket til lukking."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Hele historien."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Firma."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Varsling."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Partner dato."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Salgsman."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Høyest."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Dag."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Unik melding identifikator."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr "Neste partner anmeldelse."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Siste e-posten."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Kansellert."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Epost komposisjon veiviseren."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Omsetning."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Lukkingsdato."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr "Partner Aktivisering."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "System varsling."
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr "Fører framover."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Forrige."
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Nettverks feil."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Fra."
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Partner grad."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Seksjon."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Send."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Neste."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioritet."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Passert frist."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Type."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "E-post."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Partner, denne saken har blitt videresendt / tildelt."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Laveste."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Faktura dato."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Mal."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Tildel dato."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Fører analyse."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Opprettelses dato."
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "Res.partner.aktivering."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Partner melding."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "Relatert dokument ID."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Venter."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Typen brukes til å skille fører og muligheter."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Juli."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr "Anmeldelse dato."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Fase."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Status."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "Å lese."
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Fwd."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo lokalisering."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Tilordnet muligheter analyse."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Avbryt."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Send historie."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Lukk."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Mars."
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Antall dager til sak lukkes."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 "Partnere som har et varsel om skyve denne meldingen i sine postkasser."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Kommentar."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Vekt."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "April."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -444,332 +444,332 @@ msgstr "April."
 msgid "Grade"
 msgstr "Nivå."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Desember."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Brukere som stemte på denne beskjeden."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Måned."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Åpningsdato."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Barne meldinger."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "Siste partner anmeldelse."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Emne."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "Eller."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Innhold."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Stemmer."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#Muligheter."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr "Partnerskap dato."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Lag."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Kladd."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Lav."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Lukket."
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Massen frem til partner."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Tilordnede muligheter."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Maksimalt sannsynlighet."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "August."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr "Navngi få av relaterte dokument."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Juni."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Antall dager til åpningen av saken."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Forsinkelse før åpning."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Bruker."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Aktiv."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "November."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Utvidet Filtere ..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "#Av muligheter."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Oktober."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Januar."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Send e-post."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Dato."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Planlagt omsetning"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "Partner anmeldelse."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Faktura periode."
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "Res.partner.nivå."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Melding - ID."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Vedlegg."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Melding rekord navn."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Sekvens."
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "September."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nivå navn."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Åpen."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Nåværende."
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Fører/Mulighet."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Fram til partner."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Salgslag."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Mai."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -778,49 +778,49 @@ msgstr ""
 msgid "Activation"
 msgstr "Aktivering."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Tilordnet partner."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "Partner nivå."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Muligheter."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Kunde."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Februar."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Navn."
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Partner aktiveringer."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -828,66 +828,66 @@ msgstr "Partner aktiveringer."
 msgid "Country"
 msgstr "Land."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "År."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Konverter til mulighet."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Forsinket til åpning."
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "Partnerskap analyse."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Partner tilordnet analyse."
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "CRM fører rapport."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "Relatert dokument modell."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Sakinformasjon."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -896,41 +896,41 @@ msgstr ""
 "Forfatter av meldingen. Hvis det ikke er angitt, kan email_fra Mai holde en "
 "e-postadresse som ikke samsvarer med noen partner."
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM partner rapport."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Høy."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Flere kontakter."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Opprettet dato."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filtere."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Partner."
diff --git a/addons/crm_channel/i18n/nl.po b/addons/crm_partner_assign/i18n/nl.po
similarity index 77%
rename from addons/crm_channel/i18n/nl.po
rename to addons/crm_partner_assign/i18n/nl.po
index c841ed4c345..d72aa0d55ab 100644
--- a/addons/crm_channel/i18n/nl.po
+++ b/addons/crm_partner_assign/i18n/nl.po
@@ -17,22 +17,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Vertraging tot sluiten"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Auteur"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Geplande omzet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
@@ -41,43 +41,43 @@ msgstr ""
 "Berichttype: e-mail voor e-mailbericht, notificatie voor systeembericht, "
 "commentaar voor andere berichten zoals gebruiker beantwoord"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# Dossiers"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Groepeer op..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Automatisch opgeschoonde HTML-inhoud"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Doorsturen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo lokaliseren"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Met ster"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Inhoud"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -86,107 +86,107 @@ msgstr ""
 "E-mail adres van zender. Dit veld wordt ingesteld wanneer geen relatie wordt "
 "gevonden voor binnenkomende e-mails."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr "Datum partnerovereenkomst"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Lead"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Vertraging tot sluiting"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Hele verhaal"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Bedrijf"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Meldingen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Relatie datum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Verkoper"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Hoogste"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Dag"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Bericht unieke identifier"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr "Volgende relatie beoordeling"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Laatste email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo breedtegraad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geo toekenning"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "E-mail samenstellen wizard"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Omzet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Sluitdatum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -195,230 +195,230 @@ msgstr ""
 "Geeft de waarschijnlijkheid om de lead aan deze relatie toe te kennen (0 "
 "betekent geen toekenning)."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr "Relatie activatie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Systeem melding"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr "Lead doorsturen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Gem Waarschijnlijkheid"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Vorige"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Netwerkprobleem"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Van"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Relatie klasse"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Afdeling"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Verzend"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Volgende"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioriteit"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Overschreden einddatum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Soort"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "E-mail"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Relatie waaraan dit dossier is toegewezen."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Laagste"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Factuur datum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Sjabloon"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Wijs datum toe"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Leads analyse"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Datum gemaakt"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "res.partner.activation"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Bovenliggend bericht"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "Gerelateerde document ID"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "In afwachting"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Relatie toekenning"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Soort wordt gebruikt om leads en prospects te scheiden"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Juli"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr "Datum review"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Stadium"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Status"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "Te lezen"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Doorsturen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo lokalisatie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Prospect toekenning analyse"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Annuleren"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Verstuur geschiedenis"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Sluiten"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Maart"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Prospect toekenning analyse"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Aantal dagen om dossier af te sluiten"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
@@ -426,22 +426,22 @@ msgstr ""
 "Relaties die een notificatie hebben, die dit bericht doorgestuurd hebben "
 "naar hun e-mailbox"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Opmerking"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Gewicht"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "April"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -449,258 +449,258 @@ msgstr "April"
 msgid "Grade"
 msgstr "Klasse"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "December"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Gebruikers die op dit bericht hebben gestemd."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Maand"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Openingsdatum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Onderliggende berichten"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "Laatste partner review"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Onderwerp"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "of"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Inhoud"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Stemmen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#Prospects"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 "De huidige gebruiker heeft een ster notificatie gekoppeld aan dit bericht."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr "Datum partnerovereenkomst"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Team"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Concept"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Laag"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Gesloten"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Als bulk doorsturen naar relatie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Toegewezen prospects"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Datum toewijzing"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Max waarschijnlijkheid"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Augustus"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr "Verkrijg naam van het gerelateerde document"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normaal"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escaleren"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Juni"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Aantal dagen tot openen dossier"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Vertraging tot openen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Gebruiker"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Actief"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "November"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Uitgebreide filters..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Geo lengtegraad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# of prospect"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Lead toewijzen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Oktober"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Toewijzing"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Januari"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Verstuur bericht"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Datum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Geplande omzet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "Partner review"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Factuur periode"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Bericht-Id"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Bijlagen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Bericht veldnaam"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Volgnummer"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
@@ -709,76 +709,76 @@ msgstr ""
 "Kan geen contact maken met geolocatie servers. Controleer a.u.b. of uw "
 "internet verbinding werkt (%s)."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "September"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Klassenaam"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 "Laatste datum dat dit dossier was doorgestuurd/toegewezen aan een relatie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Openen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Subtype"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Geo lokalisatie datum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Actueel"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Lead/Prospect"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Op de hoogte gebrachte relaties"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Doorsturen aan relatie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Verkoopteam"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Mei"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Verwachte omzet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -787,51 +787,51 @@ msgstr "Verwachte omzet"
 msgid "Activation"
 msgstr "Activatie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Toegewezen relatie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "Relatie nivo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 "De huidige gebruiker heeft een ongelezen notificatie gekoppeld aan dit "
 "bericht."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Prospect"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Klant"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Februari"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Naam"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Partner activaties"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -839,34 +839,34 @@ msgstr "Partner activaties"
 msgid "Country"
 msgstr "Land"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Jaar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Converteren naar prospect"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Geo toewijzing"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Vertraging tot openen"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "Relatieanalyses"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
@@ -875,32 +875,32 @@ msgstr ""
 "Technisch veld bevat de berichtnotificaties. Gebruik notified_partner_ids "
 "voor toegang tot geïnformeerde partners."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Relatie toewijzinganalyses"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "CRM Lead overzicht"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Bewerkmodus"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "Gerelateerde document model"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Dossier informatie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -909,42 +909,42 @@ msgstr ""
 "Schrijver van het bericht. Als deze niet ingesteld is, kan email_from een e-"
 "mailadres bevatten wat niet overeenkomt met een relatie."
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM relatierapport"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Hoog"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Extra contactpersonen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "Initiële bericht thread"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Datum gemaakt"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filters"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Relatie"
 
diff --git a/addons/crm_channel/i18n/pl.po b/addons/crm_partner_assign/i18n/pl.po
similarity index 73%
rename from addons/crm_channel/i18n/pl.po
rename to addons/crm_partner_assign/i18n/pl.po
index d5fd5bbb455..6a260ee1738 100644
--- a/addons/crm_channel/i18n/pl.po
+++ b/addons/crm_partner_assign/i18n/pl.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Opóźnienie do zamknięcia"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Autor"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Planowany dochód"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# spraw"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Grupuj wg..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Przekaż"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Lokalizacja geograficzna"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Treść"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Sygnał"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Opóźnienie do zamknięcia"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Cała historia"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Firma"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Powiadomienia"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Data partnera"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Sprzedawca"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Najwyższy"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Dzień"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Unikalny identyfikator wiadomości"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Ostatnia wiadomość"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Szerokość geograficzna"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Anulowano"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Położenie geograficzne"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Kreator email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Obrót"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Data zamknięcia"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Poprzedni"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Błąd sieciowy"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Od"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Sekcja"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Wyślij"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Następny"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Priorytet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Przekroczony termin"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Typ"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Najniższy"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Data faktury"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Szablon"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Przypisz datę"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Analiza sygnałów"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Data utworzenia"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Wiadomość nadrzędna"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID dokumentu związanego"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Oczekiwanie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Typ jest stosowany do rozróżnienia sygnałów od szans"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Lipiec"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Etap"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Stan"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "Do przeczytania"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Przek."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Lokalizacja geograficzna"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Analiza przypisań szans"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Anuluj"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Wyślij historię"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Zamknij"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Marzec"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Liczba dni do zamknięcia sprawy"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Komentarz"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Waga"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Kwiecień"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr "Kwiecień"
 msgid "Grade"
 msgstr "Ocena"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Grudzień"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Użytkownicy głosujący za tą wiadomością"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Miesiąc"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Data otwarcia"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Wiadomości podrzędne"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Temat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Zawartość"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Głosy"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#Szans"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Zespół"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Projekt"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Niski"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Zamknięte"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Data przypisania"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Maks. prawdop."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Sierpień"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normalny"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Przekaż"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Czerwiec"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Liczba dni do otwarcia sprawy"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Opóźnienie do otwarcia"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Użytkownik"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Aktywne"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Listopad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Rozszerzone filtry..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Długość geograficzna"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# Szans"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Przypisz sygnał"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Październik"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Przypisanie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Styczeń"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Wyślij wiadomość"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Data"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Planowany dochód"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "Przegląd partnera"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Okres faktury"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Załączniki"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Nazwa rekordu wiadomości"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Numeracja"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Wrzesień"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nazwa poziomu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "Ostatnia data przekazania/przypisania sprawy do partnera"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Otwórz"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Podtyp"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Data lokalizacji geograficznej"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Bieżące"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Sygnały/Szanse"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Powiadomieni partnerzy"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Przekaż partnerowi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Zespół sprzedaży"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Maj"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Prawdopodobny dochód"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr "Prawdopodobny dochód"
 msgid "Activation"
 msgstr "Aktywacja"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Przypisany partner"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "Poziom partnera"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Szansa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Klient"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Luty"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Nazwa"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Aktywacja partnera"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,108 +825,108 @@ msgstr "Aktywacja partnera"
 msgid "Country"
 msgstr "Kraj"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Rok"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Konwertuj do szansy"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Opóźnienie do otwarcia"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "Analiza partnerstwa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Analiza przypisanego partnera"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Raport sygnałów CRM"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Tryb pisania"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "Model dokumentu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Informacja o sprawie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "Raport partnera CRM"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Wysoki"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Dodatkowe kontakty"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "Wiadomość inicjująca wątek"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Data utworzenia"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filtry"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr ""
 
diff --git a/addons/crm_channel/i18n/pt.po b/addons/crm_partner_assign/i18n/pt.po
similarity index 76%
rename from addons/crm_channel/i18n/pt.po
rename to addons/crm_partner_assign/i18n/pt.po
index e88fd7e456a..a319c146039 100644
--- a/addons/crm_channel/i18n/pt.po
+++ b/addons/crm_partner_assign/i18n/pt.po
@@ -17,172 +17,172 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Demora para fechar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Receita planeada"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "Número de casos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Avançar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Localizar Geograficamente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Corpo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Lead"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Atraso para encerrar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Toda a história"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Notificações"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Data do parceiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Vendedor"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Maior"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Dia"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Identificador de mensagem exclusivo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Último email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Latitude Geográfica"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Localização Geográfica"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Assistente de criação de mensagem eletrónica"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Data de fecho"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -191,251 +191,251 @@ msgstr ""
 "Dá a possibilidade de associar a oportunidade a este parceiro. (0 significa "
 "que não se associou.)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Notificação do sistema"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilidade média"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Anterior"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Erro de rede"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "De"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Nível do parceiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Secção"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Enviar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Próximo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioridade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Prazo ultrapassado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tipo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "E-mail"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Parceiro deste caso foi encaminhado / atribuído."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Menor"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Template"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Atribuir Data"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Análise de lead"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Data de criação"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "res.partner.activation"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID Documentos Relacionados"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Pendente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Atribuição parceiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tipo é usado para separar leads e oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Julho"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Fase"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Estado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Redirecionar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Localização Geográfica"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Oportunidades de Análise de Atribuição"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Enviar histórico"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Fechar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Março"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Análise do Encaminhamento de Oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Número de dias para fechar o caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Peso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Abril"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -443,332 +443,332 @@ msgstr "Abril"
 msgid "Grade"
 msgstr "Grau"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Dezembro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Utilizadores que votaram nesta mensagem"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mês"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Data de abertura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Assunto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Votos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#Oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Equipa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Rascunho"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Baixo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Encerrado"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Envio em massa para um parceiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Oportunidades atribuídas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Data de atribuição"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilidade máxima"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Agosto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escalate"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Junho"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Número de dias para abrir o caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Demora para abrir"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Utilizador"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Ativo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Novembro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtros avançados"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Longitude Geográfica"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# da Oportunidade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Lead atríbuir"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Outubro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Atribuição"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Janeiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Enviar e-mail"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Data"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Rendimentos planeados"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Id mensagem"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Anexos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Sequência"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Setembro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nome grau"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "Última data neste caso foi encaminhada / atribuída a um parceiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Abrir"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Data da Localização Geográfica"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Atual"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Reencaminhar para o parceiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Equipa de vendas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Maio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Retorno provável"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -777,49 +777,49 @@ msgstr "Retorno provável"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Parceiro Atribuído"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Oportunidade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Fevereiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Nome"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -827,108 +827,108 @@ msgstr ""
 msgid "Country"
 msgstr "País"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Ano"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Converter em oportunidade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Localização Geográfica"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Tempo para abrir"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "Análise de Parceria"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Parceiro atribuído Análise"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Relatório de Dicas de CRM"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Modo de composição"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Informações sobre o caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "Relatório Parceiro CRM"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Alto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Contactos adicionais"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Data de criação"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filtros"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Parceiro"
 
diff --git a/addons/crm_channel/i18n/pt_BR.po b/addons/crm_partner_assign/i18n/pt_BR.po
similarity index 78%
rename from addons/crm_channel/i18n/pt_BR.po
rename to addons/crm_partner_assign/i18n/pt_BR.po
index e2e09e2d636..aba69c91977 100644
--- a/addons/crm_channel/i18n/pt_BR.po
+++ b/addons/crm_partner_assign/i18n/pt_BR.po
@@ -18,22 +18,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Adiar Fechamento"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Autor"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Receita Planejada"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
@@ -43,43 +43,43 @@ msgstr ""
 "mensagens do sistema e comentário para outros tipos como respostas de "
 "usuário."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "Nº de Casos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Agrupar Por..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Conteúdos HTML limpos automaticamente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Encaminhar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Localização Geográfica"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Favoritos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Conteúdo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -88,107 +88,107 @@ msgstr ""
 "Endereço de email do remetente. Este campo é preenchido quando não é "
 "encontrado um parceiro cadastrado para o email recebido."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr "Data da parceria"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Prospecto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Adiar o fechamento"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Histórico Completo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Empresa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Notificações"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Data do Parceiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Vendedor"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Mais Alta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Dia"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Identificador da mensagem"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr "Próxima Revisão de Parceiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Último email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Latitude Geográfica"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Atribuição Geográfica"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Assistente de composição de Email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Volume de Negócios"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Data de Fechamento"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -197,252 +197,252 @@ msgstr ""
 "Fornece a probabilidade para se atribuir o prospecto para este parceiro. (0 "
 "significa sem atribuição.)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr "Ativação do Parceiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Notificação do sistema"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr "Encaminhamento de prospecto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilidade Média"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Anterior"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Erro na rede"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "De"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Grade do Parceiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Seção"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Enviar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Próximo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioridade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Prazo Ultrapassado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tipo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "E-mail"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Parceiro para que este caso foi enviado/atribuído"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Mínima"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Data da Fatura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Modelo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Data Associada"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Analisar Prospecções"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Data de Criação"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "res.partner.activation"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Mensagem Principal"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID do Documento Relacionado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Pendente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Atribuição do Parceiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tipo é utilizado para separar Prospectos e Oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Julho"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr "Data de Revisão"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Estágio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Situação"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "Não lidas"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Enc"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Localização Geográfica"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Análise de Atribuição de Oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Enviar Histórico"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Fechar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Março"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Análise de Atribuição de Oport."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Número de Dias para concluir o Caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 "Parceiros que tiveram uma notificação enviada para sua caixa de entrada."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Comentário"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Peso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Abril"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -450,257 +450,257 @@ msgstr "Abril"
 msgid "Grade"
 msgstr "Nota (graduação)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Dezembro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Usuários que votaram para esta mensagem"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mês"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Data de Abertura"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Mensagens Relacionadas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "Última revisão do parceiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Assunto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "ou"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Conteúdos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Votos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "Nº de Oportunidades"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr "Usuário atual marcou uma notificação ligada a esta mensagem"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr "Data de Parceria"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Equipe"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Provisório"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Baixo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Fechado"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Encaminhar em massa para o parceiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Oportunidades Atribuidas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Data da Atribuição"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilidade Máxima"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Agosto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr "Nome obtido do documento relacionado."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Escalar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Junho"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Número de Dias para abrir o caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Espera para Abrir"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Usuário"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Ativo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Novembro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtros Extendidos..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Longitude Geográfica"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# da Oportunidade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Atribuir Prospecto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Outubro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Atribuição"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Janeiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Enviar Email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Data"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Receitas Programadas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "Revisão do Parceiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Período de Fatura"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Cód da Mensagem"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Anexos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Nome do Registro da Mensagem"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Sequência"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
@@ -709,75 +709,75 @@ msgstr ""
 "Não foi possível conectar a um servidor de geolocalização. Por favor, "
 "certifique-se que sua internet está funcionando (%s)."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Setembro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nome da Grade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "Última data que este caso foi enviado/atribuído a um parceiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Aberto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Sub-tipo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Data da Loc. Geográfica"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Atual"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Prospecção/Oportunidade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Parceiros Notificados"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Encaminhar para o Parceiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Equipe de Vendas"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Maio"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Receita Provável"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -786,49 +786,49 @@ msgstr "Receita Provável"
 msgid "Activation"
 msgstr "Ativação"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Parceiro Atribuído"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "Categoria do Parceiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr "Usuário atual tem uma notificação não lida ligada a esta mensagem"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Oportunidade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Cliente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Fevereiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Nome"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Ativação do Parceiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -836,34 +836,34 @@ msgstr "Ativação do Parceiro"
 msgid "Country"
 msgstr "País"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Ano"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Converter para Oportunidade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Atribuição Geográfica"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Espera para abrir"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "Análise de Parceria"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
@@ -872,32 +872,32 @@ msgstr ""
 "Campo técnico que armazena as notificações de mensagem. Utilize "
 "notified_partner_ids para acessar os parceiros notificados."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Análise do Parceiro"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Relatório de Prospecto CRM"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Modo de composição"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "Modelo de Documento Relacionado"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Informação do Caso"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -906,42 +906,42 @@ msgstr ""
 "Autor da mensagem. Se não definido, o campo email_from pode conter um "
 "endereço de e-mail que não corresponde a nenhum parceiro."
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM Relatório de Parceiro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Alta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Contatos adicionais"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "Mensagem inicial do tópico."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Data de Criação"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filtros"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Parceiro"
 
diff --git a/addons/crm_channel/i18n/ro.po b/addons/crm_partner_assign/i18n/ro.po
similarity index 78%
rename from addons/crm_channel/i18n/ro.po
rename to addons/crm_partner_assign/i18n/ro.po
index dca991fc7f1..d53a0e2282c 100644
--- a/addons/crm_channel/i18n/ro.po
+++ b/addons/crm_partner_assign/i18n/ro.po
@@ -17,22 +17,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Intarziere la inchidere"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Autor"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Venitul planificat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
@@ -41,43 +41,43 @@ msgstr ""
 "Tipul de mesaj: email pentru mesaj email, notificare pentru mesajul sistem, "
 "comentariu pentru alte mesaje, cum ar fi raspunsurile utilizatorului"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# de Cazuri"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Grupeaza dupa..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Continuturi HTML cenzurate automat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Redirectionare"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Localizare Geo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Marcat cu asterisc"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Continut"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -86,107 +86,107 @@ msgstr ""
 "Adresa de email a expeditorului. Acest camp este setat atunci cand nu este "
 "gasit nici un partener care sa se potriveasca email-urilor primite."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr "Data Parteneriatului"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Pista"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Intarziere la inchidere"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Intreaga poveste"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Companie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Notificari"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Data partener"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Agent de vanzari"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Cel mai ridicat (cea mai ridicata)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Zi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Identificator unic mesaj"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr "Urmatoarea Verificare a Partenerului"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Ultimul email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Latitudine Geo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Anulat(a)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Alocare Geo"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Wizardul de compunere email-uri"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Cifra de afaceri"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Data inchiderii"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -195,251 +195,251 @@ msgstr ""
 "Da probabilitatea alocarii unei piste acestui partener. (0 inseamna nici o "
 "alocare.)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr "Activare Partener"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Notificare sistem"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr "Redirectioneaza"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Probabilitatea medie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Precedent(a)"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Eroare de retea"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "De la"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Grad partener"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Sectiune"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Trimite"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Urmatorul (urmatoarea)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioritate"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Termen limita depasit"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tip"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "Email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Partenerul caruia i-a fost redirectionat/atribuit cazul."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Cel mai scazut (cea mai scazuta)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Data Facturii"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Sablon"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Data atribuirii"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Analiza pistelor"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Data crearii"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "res.activare.partener"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Mesaj Principal"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID Document Asociat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "In asteptare"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Atribuire partener"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tip folosit pentru a separa Clientii potentiali si Oportunitatile"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Iulie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr "Verificarea Datei"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Etapa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Stare"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "De citit"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Fwd (redirectionare)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Localizare geo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Analiza Atribuirii Oportunitatilor"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Anuleaza"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Trimite istoric"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Inchideti"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Martie"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Analiza Alocarii Oportunitatilor"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Numarul de zile pana la inchiderea cazului"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr "Partenerii care au o notificare ce a dus la primirea acestui mesaj"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Comentariu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Greutate"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Aprilie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -447,259 +447,259 @@ msgstr "Aprilie"
 msgid "Grade"
 msgstr "Grad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Decembrie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Utilizatorii care au votat pentru acest mesaj"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Luna"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Data deschiderii"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Mesaje secundare"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "Verificarea cea mai Recenta a Partenerului"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Subiect"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "sau"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Cuprins"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Voturi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#Oportunitati"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 "Utilizatorul actual are o notificare marcata cu asterisc atasata acestui "
 "mesaj"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr "Data Parteneriatului"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Echipa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Ciorna"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Scazut(a)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Inchis(a)"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Redirectionare in masa catre partener"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Oportunitati alocate"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Data alocarii"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Probabilitate maxima"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "August"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr "Obtine numele documentului asociat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Promoveaza"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Iunie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Numarul de zile pana la deschiderea cazului"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Intarziere la Deschidere"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Utilizator"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Activ(a)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Noiembrie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Filtre Extinse..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Geo Longitudine"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# Oportunitate"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Alocare pista"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Octombrie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Alocare"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Ianuarie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Trimite email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Data"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Veniturile planificate"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "Verificare Partener"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Perioada de facturare"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.grad.partener"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Id-Mesaj"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Atasamente"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Numele Inregistrarii Mesajului"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Secventa"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
@@ -708,76 +708,76 @@ msgstr ""
 "Serverele geolocalizare nu pot fi contactate. Va rugam sa va asigurati ca "
 "aveti conexiune la internet (%s)."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Septembrie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Nume grad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 "Ultima data cand acest caz a fost redirectionat/atribuit unui partener"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Deschideti"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Subtip"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Data Geo Localizare"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Actual(a)"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Pista/Oportunitate"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Parteneri instiintati"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Redirectioneaza catre partener"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Echipa de vanzari"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Mai"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Venituri probabile"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -786,49 +786,49 @@ msgstr "Venituri probabile"
 msgid "Activation"
 msgstr "Activare"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Partener alocat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "Nivel Partener"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr "Utilizatorul actual are o notificare necitita atasata acestui mesaj"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Oportunitate"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Client"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Februarie"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Nume"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Activari Partener"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -836,34 +836,34 @@ msgstr "Activari Partener"
 msgid "Country"
 msgstr "Tara"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "An"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Transforma in Oportunitate"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Alocare Geo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Intarziere la deschidere"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "Analiza Parteneriatului"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
@@ -872,32 +872,32 @@ msgstr ""
 "Camp tehnic ce contine mesajele de notificare. Folositi notifice_partner_ids "
 "(id-uri_partener_instiintat) pentru a accesa partenerii instiintati."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Analiza Partener alocat"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "Raport pista MRC"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Modul de compunere"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "Model Document Asociat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Informatii caz"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -906,42 +906,42 @@ msgstr ""
 "Autorul mesajului. Daca nu este selectat, email_from (expeditor_email) poate "
 "sa contina o adresa de email care nu s-a potrivit cu nici un partener."
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "Raport Partener MRC"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Ridicat(a)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Persoane de contact suplimentare"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "Continutul mesajului initial."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Data Crearii"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filtre"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Partener"
 
diff --git a/addons/crm_channel/i18n/ru.po b/addons/crm_partner_assign/i18n/ru.po
similarity index 80%
rename from addons/crm_channel/i18n/ru.po
rename to addons/crm_partner_assign/i18n/ru.po
index b6a94b97be2..fa995c8e7a1 100644
--- a/addons/crm_channel/i18n/ru.po
+++ b/addons/crm_partner_assign/i18n/ru.po
@@ -17,22 +17,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-06-07 05:48+0000\n"
 "X-Generator: Launchpad (build 16667)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Задержка закрытия"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Автор"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Планируемая выручка"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
@@ -42,43 +42,43 @@ msgstr ""
 "сообщений, комментарий - для остальных сообщений таких как сообщения "
 "пользователя"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "кол-во вопросов"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Группировать по ..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Автоматически обработанное HTML содержимое"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Вперед"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Геолоцировать"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Отмеченные"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Содержимое"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
@@ -87,107 +87,107 @@ msgstr ""
 "Адрес эл. почты отправителя. Это поле устанавливается когда партнер не "
 "определен для входящих писем."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Кандидат"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Задержка закрытия"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Вся история"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Компания"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Уведомления"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Дата партнера"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Продавец"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Высший"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "День"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Уникальный идентификатор сообщения"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Последнее эл. письмо"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Географическая широта"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Отменено"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Географическое назначение"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Мастер составления эл. почты"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Оборот"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Дата закрытия"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -196,251 +196,251 @@ msgstr ""
 "Дает вероятность назначения кандидата этому партнёру. 0 обозначает "
 "отсутствие назначения."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Системное уведомление"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Средн. вероятность"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Предыдущий"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Ошибка сети"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "От"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Статус партнёра"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Раздел"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Отправить"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Следующий"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Приоритет"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Просрочено"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Тип"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "Эл. почта"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Партнер которому был назначен этот вопрос."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Низший"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Дата счета"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Шаблон"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Дата назначения"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Анализ  кандидатов"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Дата создания"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "res.partner.activation"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Родительское сообщение"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID связанного документа"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "В ожидании"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Назначение партнера"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Тип используется для разделения кандидатов и предложений"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Июль"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Этап"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Статус"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "Прочитать"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Прд"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Геолокация"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Анализ назначений предложений"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Отмена"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Послать историю"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Закрыть"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Март"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Анализ назначений предложений"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Количество дней, для закрытия вопроса"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr "Партнеры которые имеют уведомление доставляемое в их почтовые ящики"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Комментарий"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Вес"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Апрель"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -448,259 +448,259 @@ msgstr "Апрель"
 msgid "Grade"
 msgstr "Класс"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Декабрь"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Пользователи, которые проголосовали за это сообщение"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Месяц"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Дата открытия"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Связанные сообщения"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Тема"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "или"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Содержимое"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Голоса"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "# Предложений"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 "Текущий пользователь имеет отмеченное уведомление, связанное с этим "
 "сообщением"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Команда"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Черновик"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Низкий"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Закрыто"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Массовая отправка партнёру"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Назначенные предложения"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Дата назначения"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Макс. вероятность"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Август"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr "Название связанного документа."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Обычный"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Обострить"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Июнь"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Количество дней на открытие вопроса"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Задержка открытия"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Пользователь"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Активно"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Ноябрь"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Расширенные фильтры..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Географическая долгота"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# предложений"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Кандидат распределен"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Октябрь"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Назначение"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Январь"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Отправить письмо"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Дата"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Планируемая выручка"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Период счета"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "ID сообщения"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Вложения"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Название записи сообщения"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Нумерация"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
@@ -709,75 +709,75 @@ msgstr ""
 "Не удается связаться с сервером геолокации. Пожалуйста, убедитесь, что ваше "
 "подключение к интернету работает (%s)."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Сентябрь"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Наименование уровня"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "Последняя дата, когда этот вопрос был назначен партнёру"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Открыто"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Подтип"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Дата геолокации"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Текущий"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Кандидат/Предложение"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Уведомленные партнеры"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Переслать партнёру"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Отдел продаж"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Май"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Вероятная выручка"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -786,51 +786,51 @@ msgstr "Вероятная выручка"
 msgid "Activation"
 msgstr "Активация"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Назначенный партнер"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 "Текущий пользователь имеет непрочитанные уведомления, связанные с этим "
 "сообщением"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Предложение"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Заказчик"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Февраль"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Названия"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -838,34 +838,34 @@ msgstr ""
 msgid "Country"
 msgstr "Страна"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Год"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Преобразовать в предложение"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Гео-назначение"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Задержка открытия"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "Анализ сотрудничества"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
@@ -874,32 +874,32 @@ msgstr ""
 "Техническое поле, содержащее уведомления. Используйте notified_partner_ids "
 "для доступа к оповещаемым партнерам."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Анализ назначений партнеру"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "CRM - отчет по кандидатам"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Режим составления"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "Модель связанного документа"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Информация о вопросе"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -908,42 +908,42 @@ msgstr ""
 "Автор сообщения. Если не установлен, email_from может содержать адрес почты, "
 "который не соответствует ни одному партнеру."
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM - отчет по партнерам"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Высокий"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Дополнительные контакты"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "Первое сообщение цепочки."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Дата создания"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Фильтры"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Партнер"
 
diff --git a/addons/crm_channel/i18n/sl.po b/addons/crm_partner_assign/i18n/sl.po
similarity index 70%
rename from addons/crm_channel/i18n/sl.po
rename to addons/crm_partner_assign/i18n/sl.po
index 3a5159cfd92..e119a38ad42 100644
--- a/addons/crm_channel/i18n/sl.po
+++ b/addons/crm_partner_assign/i18n/sl.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Avtor"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Načrtovani prihodki"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# primerov"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Združeno po..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Posreduj"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Začeto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Vsebina"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Podjetje"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Obvestila"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "Prodajalec"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Dan"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Zadnja E-pošta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Preklicano"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "Čarovnik za sestavljanje e-pošte"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Predhodni"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Napaka v omrežju"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Od"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Pošlji"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Naprej"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioriteta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Vrsta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "E-pošta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Predloga"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Ustvarjeno dne"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Nadrejeno sporočilo"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Na čakanju"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Julij"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Stopnja"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Status"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Prekliči"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Zapri"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Marec"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Opomba"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Teža"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "April"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr "April"
 msgid "Grade"
 msgstr "Stopnja"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "December"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Mesec"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Datum odprtja"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Zadeva"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "ali"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Vsebina"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Glasovi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Tím"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Osnutek"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Zaprto"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Avgust"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Običajno"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Junij"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Uporabnik"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Aktivno"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "November"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Razširjeni filtri..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Oktober"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Januar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Datum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Priponke"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Zaporedje"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "September"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Odprto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Podvrsta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Trenutno"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Prodajna ekipa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Maj"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr ""
 msgid "Activation"
 msgstr "Aktivacija"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Priložnost"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Kupec"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Februar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Ime"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,107 +825,107 @@ msgstr ""
 msgid "Country"
 msgstr "Država"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Leto"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Spremeni v priložnost"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Datum nastanka"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filtri"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Partner"
diff --git a/addons/crm_channel/i18n/sq.po b/addons/crm_partner_assign/i18n/sq.po
similarity index 69%
rename from addons/crm_channel/i18n/sq.po
rename to addons/crm_partner_assign/i18n/sq.po
index 23d73f59123..369e306aeb2 100644
--- a/addons/crm_channel/i18n/sq.po
+++ b/addons/crm_partner_assign/i18n/sq.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr ""
 msgid "Grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr ""
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,107 +825,107 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr ""
diff --git a/addons/crm_channel/i18n/sr@latin.po b/addons/crm_partner_assign/i18n/sr@latin.po
similarity index 69%
rename from addons/crm_channel/i18n/sr@latin.po
rename to addons/crm_partner_assign/i18n/sr@latin.po
index 2f851cb5bf9..e147c04764e 100644
--- a/addons/crm_channel/i18n/sr@latin.po
+++ b/addons/crm_partner_assign/i18n/sr@latin.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr ""
 msgid "Grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr ""
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,108 +825,108 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr ""
 
diff --git a/addons/crm_channel/i18n/sv.po b/addons/crm_partner_assign/i18n/sv.po
similarity index 75%
rename from addons/crm_channel/i18n/sv.po
rename to addons/crm_partner_assign/i18n/sv.po
index 950b439b6c1..2f204719115 100644
--- a/addons/crm_channel/i18n/sv.po
+++ b/addons/crm_partner_assign/i18n/sv.po
@@ -17,172 +17,172 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Ledtid till avslut"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Plannerade intäkter"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# Ärenden"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Gruppera på..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "Framåt"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geoplacering"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Brödtext"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Lead"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Stängledtid"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Hela historien"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Företag"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Företagsdatum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "Högsta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Dag"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Meddelandets unika identifierare"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "Senaste email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo-latitud"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geografisk tilldelning"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Avslutsdatum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -191,251 +191,251 @@ msgstr ""
 "Ger sannolikheten för att tilldela ett kundämne till detta företag. (0 "
 "betyder ingen tilldelning)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Genomsnittlig sannorlikhet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Föregående"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Nätverksfel"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Från"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Företagsgrad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Sektion"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Skicka"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "Nästa"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Prioritet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "Passerad tidsfrist"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Typ"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Företag detta ärende har flyttats till."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "Lägsta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Mall"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Tilldelningsdatum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "Kundämnesanalys"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Skapad datum"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "ID relaterat dokument"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Vilande"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Företagstilldelning"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Typ är använd för att skilja kundämnen från affärsmöjligheter"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Juli"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Läge"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "Vb"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geografisk placering"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Affärsmöjlighetstilldelningsanalys"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "Avbryt"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Skicka historik"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Stäng"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Mars"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Aff.möjlighetstilldelningsanalys"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Antal dagar att behandla ärendet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Vikt"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "april"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -443,332 +443,332 @@ msgstr "april"
 msgid "Grade"
 msgstr "Betyg"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "December"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Månad"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Öppningsdatum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Ämne"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "# Affärsmöjligheter"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Lag"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Utkast"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Låg"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Stängd"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Massöverföring till företag"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Tilldela affärdmöjligheter"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Tilldelningsdatum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Största sannorlikhet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Augusti"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Eskalera"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "juni"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Antal dagar för att öppna ärendet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Öppningsledtid"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Användare"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Aktiv"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "november"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Utökade filter..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Geo-longitud"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# affärsmöjligheter"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Tilldela kundämne"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "oktober"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Tilldelning"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "januari"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "Skicka e-post"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Datum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Planerade intäkter"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Meddelande-id"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Bilagor"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Nummerserie"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "september"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Gradnamn"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "Sista dag det här ärendet överlämnades / tilldelats ett företag"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Öppen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Geo platsdatum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Aktuellt"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Vidarebefordra till företag"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Säljlag"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "maj"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Förväntad intäkt"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -777,49 +777,49 @@ msgstr "Förväntad intäkt"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Tilldelat företag"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Affärsmöjlighet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Kund"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "februari"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Namn"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -827,108 +827,108 @@ msgstr ""
 msgid "Country"
 msgstr "Land"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "År"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Konvertera till affärsmöjlighet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Geo tilldelning"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Öppningsledtid"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "Partnerskapsanalys"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Företagstilldeningsanalys"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "CRM kundämnesrapport"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Ärendeinformation"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM företagsrapport"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Hög"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Registreringsdatum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filter"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Partner"
 
diff --git a/addons/crm_channel/i18n/tr.po b/addons/crm_partner_assign/i18n/tr.po
similarity index 77%
rename from addons/crm_channel/i18n/tr.po
rename to addons/crm_partner_assign/i18n/tr.po
index 8f6bcf7dbfc..a7ea1c787d1 100644
--- a/addons/crm_channel/i18n/tr.po
+++ b/addons/crm_partner_assign/i18n/tr.po
@@ -17,22 +17,22 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "Kapanmada gecikme"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "Yazan"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "Planlanan Gelir"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
@@ -41,150 +41,150 @@ msgstr ""
 "Mesaj türü: eposta mesajı için eposta, sistem mesajı için bildirim, diğer "
 "mesajlara verilen kullanıcı yanıtları gibilere yorum"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "Vak'aların sayısı"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "Grupla İle..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr "Otomatik olarak ayıklanmış HTML içeriği"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "İlet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Coğrafi konumlama"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr "Yıldızlı"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "Gövde"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr "Göndericinin eposta adresi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr "Ortaklık Tarihi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "Aday"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "Kapanmada gecikme"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "Bütün Hikaye"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "Firma"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr "Bildirimler"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "Partner Tarihi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr "SatışElemanı"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "En yüksek"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "Gün"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "Benzersiz mesaj tanımlayıcısı"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr "Sonraki İş Ortağı İncelemesi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "En son gelen e-posta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Coğrafi enlem"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "İptalEdildi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Coğrafi Saptama"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "E-posta kompozisyonu sihirbazı"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "Ciro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "Kapanış Tarihi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
@@ -192,251 +192,251 @@ msgid ""
 msgstr ""
 "Bu iş ortağına iş atama olasılığını verir. (0 hiç atama yapılmamış demektir.)"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr "İş Ortağı Etkinleştirmesi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "Sistem bildirimi"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr "Aday ilet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "Ortalama Olasılık"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "Önceki"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "Ağ hatası"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "Gönderen"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "Partner Derecesi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "Bölüm"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "Gönder"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "İleri"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "Öncelik"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "ZamanSınırını Aşan"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "Tür"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "Eposta"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "Bu vak'anın iletildiği/ atandığı İş Ortağı"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "En düşük"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr "Fatura Tarihi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "Şablon"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "Tarih Atama"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "aday Analizi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "Oluşturulma Tarihi"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr "res.partner.activation"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "Üst Mesaj"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "İlgili Döküman ID"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "Bekleyen"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "Partner Atama"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "Tür, talepler ve fırsatları ayırdetmek için kullanılır"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "Temmuz"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr "Görüşme Tarihi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "Aşama"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr "Durumu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr "Okumak için"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "İlet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Coğ Yerelleştirme"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "Fırsat Atamaları Analizi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "İptal"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "Geçmişi Gönder"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "Kapat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "Mart"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "Fır. Atamaları Analizi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "Şikayeti sonuçlandırmak için kalan günler"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr "Bu mesajı posta kutularına iteleyen bildirimi olan iş ortakları"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr "Yorumlar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "Ağırlık"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "Nisan"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -444,257 +444,257 @@ msgstr "Nisan"
 msgid "Grade"
 msgstr "Derece"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "Aralık"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr "Kullanıcıları bu mesaj için oylandı"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "Ay"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "Açılış Tarihi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr "Alt Mesajlar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr "Son Partner Görüşmesi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "Konu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr "veya"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr "Yorumlar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr "Oylar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#Fırsatlar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr "Geçerli kullanıcı bu mesajı bağlı Yıldızlı bir bildirim var"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr "Ortaklık Tarihi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "Takım"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "Taslak"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "Düşük"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "Kapandı"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "Partner toplu iletme"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "Atanmış Fırsatlar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "Atama Tarihi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "Maksimum Olasılık"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "Ağustos"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr "İlgili belgenin aldığı ad."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "Artırma"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "Haziran"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "Durumu açmak için gerekli Gün Sayısı"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "Açmada Gecikme"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "Kullanıcı"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "Etkin"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "Kasım"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "Genişletilmiş Filtreler..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Coğ Boylam"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "# nın Fırsat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "Aday Ataması"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "Ekim"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "Atama"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "Ocak"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "İleti Gönder"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "Tarih"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "Planlanan Ciro"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr "Partner Görüşmesi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr "Fatura Dönemi"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Mesaj-Id"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "Ekler"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr "Mesaj Kayıt Adı"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "Sıralama"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
@@ -703,75 +703,75 @@ msgstr ""
 "Coğrafi konumlandıma sunucusuna bağlanılamıyor. Lütfen internet bağlantınızı "
 "açık ve çalışmakta olduğundan emin olun (%s)."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "Eylül"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "Derece Adı"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "Bu durumun bir paydaşa iletildiği/atandığı son tarihtir."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "Açık"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr "Alttürü"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Coğ Konum Tarihi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "Geçerli"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr "Aday/Fırsat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr "Haberdar partnerler"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "Partnere İlet"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "Satış Takımı"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "Mayıs"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "Olası Gelir"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -780,49 +780,49 @@ msgstr "Olası Gelir"
 msgid "Activation"
 msgstr "Aktivisyon"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "Atanmış Partner"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr "Partner Düzeyi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr "Geçerli kullanıcı bu mesajı bağlantılı okunmadı bildirim var"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "Fırsat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "Müşteri"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "Şubat"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "Adı"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr "Partner Aktivasyonları"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -830,34 +830,34 @@ msgstr "Partner Aktivasyonları"
 msgid "Country"
 msgstr "Ülke"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "Yıl"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "Fırsata Dönüştür"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "Coğ Atama"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "Açmada gecikme"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "Paydaşlık İncelemesi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
@@ -866,32 +866,32 @@ msgstr ""
 "Mesaj bildirimlerini tutan teknik alan. Bildirim yapılan iş ortaklarına "
 "erişim için notified_partner_ids kullanın."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "Partner Analiz Atanan"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "MİY Aday Raporu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr "Yazma modu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr "İlgili Belge Modeli"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "Vakka Bilgisi"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
@@ -900,42 +900,42 @@ msgstr ""
 "Mesajı yazan. Ayarlı değilse email_from hiç bir iş ortağı ile eşleşmeyen nir "
 "eposta adresini tutabilir."
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM Partner Raporu"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "Yüksek"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr "Ek kontaklar"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr "İlk mesaj konusu."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "Tarih Oluştur"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "Filtreler"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "Partner"
 
diff --git a/addons/crm_channel/i18n/zh_CN.po b/addons/crm_partner_assign/i18n/zh_CN.po
similarity index 75%
rename from addons/crm_channel/i18n/zh_CN.po
rename to addons/crm_partner_assign/i18n/zh_CN.po
index 336bed832a5..af764d72747 100644
--- a/addons/crm_channel/i18n/zh_CN.po
+++ b/addons/crm_partner_assign/i18n/zh_CN.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "延迟关闭"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr "作者"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "计划收入"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# 业务"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "分组..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "跟进"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "geolocalization定位"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "正文"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "线索"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "延迟关闭"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "完整的情况"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "公司"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "业务伙伴日期"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "最高"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "日"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "消息唯一编号"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "最近的邮件"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "geolocalization纬度"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "已取消"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "指派的geolocalization"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr "营业额"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "结束日期"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr "为线索指定一个业务伙伴的概率（0表示没指派）"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr "系统通知"
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "平均概率"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "前一个"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "网络错误"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "来自"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "业务伙伴级别"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "划分"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "发送"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "下一个"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "优先级"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "超过截止日期"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "类型"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr "Email"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "这业务的业务伙伴已跟进/已指定"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "最低"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "模版"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "分配日期"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "线索分析"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "创建日期"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr "父消息"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "相关单据编号"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "待处理"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "指定业务伙伴"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "类型用于区分线索和商机"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "7月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "阶段"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "转发"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "geolocalization定位"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "商机指定分析"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "取消"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "发送日志"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "结束"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "3月"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "商机指定分析"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "到期天数"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "重要性"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "4月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr "4月"
 msgid "Grade"
 msgstr "级别"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "12月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "开启日期"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "主题"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#商机"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "团队"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "草稿"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "低"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "已结束"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "批量转发给业务伙伴"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "转为商机"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "指定日期"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "最大可能"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "8月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "普通"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "提升"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "6月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "业务开启的天数"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "延迟开启"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "用户"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "生效"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "11月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "增加筛选条件"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "geolocalization经度"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "商机编号"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "线索指定"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "10月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "指定"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "1月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "发送邮件"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "日期"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "计划收入"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "Message-Id"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "附件"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "序列"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "9月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "级别名称"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "这业务指定/跟进的业务伙伴的最后期限"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "开启"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "geolocalization定位的日期"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "当前的"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "跟进的业务伙伴"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "销售团队"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "5月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "可能收入"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr "可能收入"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "指定的业务伙伴"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "商机"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "客户"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "2月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "名称"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,108 +825,108 @@ msgstr ""
 msgid "Country"
 msgstr "国家"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "年"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "转换为商机"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "指定geolocalization"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "延迟开启"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "业务伙伴分析"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "业务伙伴分配分析"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "客户关系管理 线索报表"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "业务信息"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM业务伙伴报表"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "高"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "创建日期"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "过滤器"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "业务伙伴"
 
diff --git a/addons/crm_channel/i18n/zh_TW.po b/addons/crm_partner_assign/i18n/zh_TW.po
similarity index 74%
rename from addons/crm_channel/i18n/zh_TW.po
rename to addons/crm_partner_assign/i18n/zh_TW.po
index 22d609edb75..7e5b64cf468 100644
--- a/addons/crm_channel/i18n/zh_TW.po
+++ b/addons/crm_partner_assign/i18n/zh_TW.po
@@ -17,423 +17,423 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
 msgstr "延遲關閉"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
 msgid "Planned Revenue"
 msgstr "計劃收入"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,type:0
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
 msgid "# of Cases"
 msgstr "# 業務量"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
 msgstr "分組..."
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Forward"
 msgstr "轉寄"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localize"
 msgstr "Geo 定位"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
 msgstr "內文"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_from:0
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Partnership"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
 msgstr "潛在客戶"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
 msgstr "延遲關閉"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Whole Story"
 msgstr "完整的情況"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,company_id:0
 msgid "Company"
 msgstr "公司"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
 msgid "Partner Date"
 msgstr "業務夥伴日期"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Highest"
 msgstr "最高"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,day:0
 msgid "Day"
 msgstr "日"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
 msgstr "訊息唯一編號"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_review_next:0
 msgid "Next Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Latest email"
 msgstr "最近的郵件"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_latitude:0
 #: field:res.partner,partner_latitude:0
 msgid "Geo Latitude"
 msgstr "Geo 緯度"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Cancelled"
 msgstr "已取消"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assignation"
 msgstr "Geo 指派的"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_forward_to_partner
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
 msgstr "電子郵件成分嚮導"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
 msgid "Close Date"
 msgstr "結束日期"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:res.partner,partner_weight:0
 msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr "為潛在客戶指定一個業務夥伴的概率（表示沒指派）"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
 msgid "Avg Probability"
 msgstr "平均概率"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Previous"
 msgstr "前一個"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:36
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
 msgstr "網絡錯誤"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
 msgid "From"
 msgstr "來自"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_channel.menu_res_partner_grade_action
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
 #: view:res.partner.grade:0
 msgid "Partner Grade"
 msgstr "業務夥伴級別"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Section"
 msgstr "劃分"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
 msgstr "發送"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Next"
 msgstr "下一個"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,priority:0
 msgid "Priority"
 msgstr "優先級"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
 msgstr "超過截止日期"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,type:0
 #: field:crm.lead.report.assign,type:0
 msgid "Type"
 msgstr "類型"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
 msgstr "這業務的業務夥伴已提出/已指定"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Lowest"
 msgstr "最低"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
 msgstr "範本"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
 msgstr "分配日期"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Leads Analysis"
 msgstr "潛在客戶分析"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
 msgstr "建立日期"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_activation
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
 msgstr "相關單據編號"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Pending"
 msgstr "待處理"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Partner Assignation"
 msgstr "指定業務夥伴"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
 msgstr "類型用於區分線索和商機"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "July"
 msgstr "7月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,stage_id:0
 msgid "Stage"
 msgstr "階段"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
 msgstr ""
 
-#. module: crm_channel
-#: code:addons/crm_channel/wizard/crm_forward_to_partner.py:74
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Fwd"
 msgstr "轉發"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Geo Localization"
 msgstr "Geo 定位"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
 msgstr "商機指定分析"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: view:res.partner:0
 msgid "Cancel"
 msgstr "取消"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,history_mode:0
 msgid "Send history"
 msgstr "發送日誌"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Close"
 msgstr "結束"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "March"
 msgstr "3月"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_opportunities_assign_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
 msgstr "商機指定分析"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
 msgid "Number of Days to close the case"
 msgstr "到期天數"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
 msgid "Weight"
 msgstr "重要性"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "April"
 msgstr "4月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,grade_id:0
 #: view:crm.partner.report.assign:0
@@ -441,332 +441,332 @@ msgstr "4月"
 msgid "Grade"
 msgstr "級別"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "December"
 msgstr "12月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,month:0
 msgid "Month"
 msgstr "月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,opening_date:0
 msgid "Opening Date"
 msgstr "開啟日期"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
 msgid "Subject"
 msgstr "主題"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
 msgstr "#商機"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
 msgstr "團隊"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 msgid "Draft"
 msgstr "草稿"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Low"
 msgstr "低"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: selection:crm.lead.report.assign,state:0
 msgid "Closed"
 msgstr "已結束"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_crm_send_mass_forward
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
 msgstr "批量轉發給業務夥伴"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
 msgstr "轉為商機"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
 msgid "Assignation Date"
 msgstr "指定日期"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability_max:0
 msgid "Max Probability"
 msgstr "最大可能"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "August"
 msgstr "8月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "Normal"
 msgstr "普通"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Escalate"
 msgstr "提升"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "June"
 msgstr "6月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_open:0
 msgid "Number of Days to open the case"
 msgstr "業務開啟的天數"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_open:0
 msgid "Delay to Open"
 msgstr "延遲開啟"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,user_id:0
 #: field:crm.partner.report.assign,user_id:0
 msgid "User"
 msgstr "使用者"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,active:0
 msgid "Active"
 msgstr "生效"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "November"
 msgstr "11月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Extended Filters..."
 msgstr "增加篩選條件"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead,partner_longitude:0
 #: field:res.partner,partner_longitude:0
 msgid "Geo Longitude"
 msgstr "Geo 經度"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
 msgstr "商機編號"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
 msgstr "潛在客戶指定"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "October"
 msgstr "10月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Assignation"
 msgstr "指定"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "January"
 msgstr "1月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
 msgstr "發送郵件"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
 msgstr "日期"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Planned Revenues"
 msgstr "已計劃收入"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_res_partner_grade
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
 msgid "res.partner.grade"
 msgstr "res.partner.grade"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
 msgstr "訊息-Id"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
 msgstr "附件"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
 msgstr "順序"
 
-#. module: crm_channel
-#: code:addons/crm_channel/partner_geo_assign.py:37
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "September"
 msgstr "9月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.grade,name:0
 msgid "Grade Name"
 msgstr "級別名稱"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
 msgstr "這業務指定/轉發的業務夥伴的最後期限"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
 #: view:res.partner:0
 msgid "Open"
 msgstr "開啟"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,date_localization:0
 msgid "Geo Localization Date"
 msgstr "Geo 定位的日期"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Current"
 msgstr "當前的"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
-#: model:ir.actions.act_window,name:crm_channel.crm_lead_forward_to_partner_act
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
 msgid "Forward to Partner"
 msgstr "轉發給業務夥伴"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,section_id:0
 #: field:crm.partner.report.assign,section_id:0
 msgid "Sales Team"
 msgstr "銷售團隊"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "May"
 msgstr "5月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,probable_revenue:0
 msgid "Probable Revenue"
 msgstr "預計收入"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,activation:0
 #: view:res.partner:0
@@ -775,49 +775,49 @@ msgstr "預計收入"
 msgid "Activation"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 #: field:crm.lead,partner_assigned_id:0
 msgid "Assigned Partner"
 msgstr "指定的業務夥伴"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
 msgstr "商機"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
 msgid "Customer"
 msgstr "客戶"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
 msgid "February"
 msgstr "2月"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:res.partner.activation,name:0
 msgid "Name"
 msgstr "名稱"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_channel.res_partner_activation_config_mi
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,country_id:0
 #: view:crm.partner.report.assign:0
@@ -825,108 +825,108 @@ msgstr ""
 msgid "Country"
 msgstr "國家"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,year:0
 msgid "Year"
 msgstr "年"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
 msgstr "轉換為商機"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Geo Assign"
 msgstr "指定geolocalization"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to open"
 msgstr "延遲開啟"
 
-#. module: crm_channel
-#: model:ir.actions.act_window,name:crm_channel.action_report_crm_channel
-#: model:ir.ui.menu,name:crm_channel.menu_report_crm_channel_tree
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
 msgstr "業務夥伴分析"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,notification_ids:0
 msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
 msgstr "業務夥伴分配分析"
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_lead_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
 msgstr "客戶關係管理 線索報表"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
 msgid "Case Information"
 msgstr "業務資訊"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,author_id:0
 msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
 
-#. module: crm_channel
-#: model:ir.model,name:crm_channel.model_crm_partner_report_assign
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
 msgstr "CRM業務夥伴報表"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
 msgid "High"
 msgstr "高"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
 msgstr ""
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
 msgid "Create Date"
 msgstr "建立日期"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
 msgstr "篩選"
 
-#. module: crm_channel
+#. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,partner_assigned_id:0
 #: view:crm.partner.report.assign:0
 #: field:crm.partner.report.assign,partner_id:0
-#: model:ir.model,name:crm_channel.model_res_partner
+#: model:ir.model,name:crm_partner_assign.model_res_partner
 msgid "Partner"
 msgstr "業務夥伴"
 
diff --git a/addons/crm_channel/portal_data.xml b/addons/crm_partner_assign/portal_data.xml
similarity index 96%
rename from addons/crm_channel/portal_data.xml
rename to addons/crm_partner_assign/portal_data.xml
index 394b469dc5b..23daa729c17 100644
--- a/addons/crm_channel/portal_data.xml
+++ b/addons/crm_partner_assign/portal_data.xml
@@ -28,7 +28,7 @@
         </record>
         <record id="res_partner_grade_access" model="ir.model.access">
             <field name="name">openerp.portal.res.partner.grade</field>
-            <field name="model_id" ref="crm_channel.model_res_partner_grade"/>
+            <field name="model_id" ref="crm_partner_assign.model_res_partner_grade"/>
             <field name="group_id" ref="portal.group_portal"/>
             <field name="perm_read" eval="1"/>
             <field name="perm_create" eval="0"/>
diff --git a/addons/crm_channel/report/__init__.py b/addons/crm_partner_assign/report/__init__.py
similarity index 100%
rename from addons/crm_channel/report/__init__.py
rename to addons/crm_partner_assign/report/__init__.py
diff --git a/addons/crm_channel/report/crm_lead_report.py b/addons/crm_partner_assign/report/crm_lead_report.py
similarity index 100%
rename from addons/crm_channel/report/crm_lead_report.py
rename to addons/crm_partner_assign/report/crm_lead_report.py
diff --git a/addons/crm_channel/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
similarity index 100%
rename from addons/crm_channel/report/crm_lead_report_view.xml
rename to addons/crm_partner_assign/report/crm_lead_report_view.xml
diff --git a/addons/crm_channel/report/crm_partner_report.py b/addons/crm_partner_assign/report/crm_partner_report.py
similarity index 100%
rename from addons/crm_channel/report/crm_partner_report.py
rename to addons/crm_partner_assign/report/crm_partner_report.py
diff --git a/addons/crm_channel/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml
similarity index 90%
rename from addons/crm_channel/report/crm_partner_report_view.xml
rename to addons/crm_partner_assign/report/crm_partner_report_view.xml
index 60ccbb1c2ad..4e7e13afb15 100644
--- a/addons/crm_channel/report/crm_partner_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <!--     Opportunity tree view  -->
-        <record id="view_report_crm_channel_filter" model="ir.ui.view">
+        <record id="view_report_crm_partner_assign_filter" model="ir.ui.view">
             <field name="name">crm.partner.report.assign.select</field>
             <field name="model">crm.partner.report.assign</field>
             <field name="arch" type="xml">
@@ -37,7 +37,7 @@
 
 <!-- Crm Lead Assign report Graph View -->
 
-       <record id="view_report_crm_channel_tree" model="ir.ui.view">
+       <record id="view_report_crm_partner_assign_tree" model="ir.ui.view">
             <field name="name">crm.partner.assign.report.tree</field>
             <field name="model">crm.partner.report.assign</field>
             <field name="arch" type="xml">
@@ -59,7 +59,7 @@
 
        <!-- Leads by user and section Action -->
 
-       <record id="action_report_crm_channel" model="ir.actions.act_window">
+       <record id="action_report_crm_partner_assign" model="ir.actions.act_window">
             <field name="name">Partnership Analysis</field>
             <field name="res_model">crm.partner.report.assign</field>
             <field name="context">{'search_default_group_grade': 1, 'group_by_no_leaf':1,'group_by':[]}</field>
@@ -67,8 +67,8 @@
             <field name="domain">[('grade_id', '!=', False)]</field>
         </record>
 
-       <menuitem id="menu_report_crm_channel_tree"
-           parent="base.next_id_64" action="action_report_crm_channel" sequence="25"/>
+       <menuitem id="menu_report_crm_partner_assign_tree"
+           parent="base.next_id_64" action="action_report_crm_partner_assign" sequence="25"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_channel/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml
similarity index 100%
rename from addons/crm_channel/res_partner_demo.xml
rename to addons/crm_partner_assign/res_partner_demo.xml
diff --git a/addons/crm_channel/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
similarity index 100%
rename from addons/crm_channel/res_partner_view.xml
rename to addons/crm_partner_assign/res_partner_view.xml
diff --git a/addons/crm_channel/security/ir.model.access.csv b/addons/crm_partner_assign/security/ir.model.access.csv
similarity index 100%
rename from addons/crm_channel/security/ir.model.access.csv
rename to addons/crm_partner_assign/security/ir.model.access.csv
diff --git a/addons/crm_channel/static/src/js/next.js b/addons/crm_partner_assign/static/src/js/next.js
similarity index 50%
rename from addons/crm_channel/static/src/js/next.js
rename to addons/crm_partner_assign/static/src/js/next.js
index 53614c0ee64..c40f104d6c6 100644
--- a/addons/crm_channel/static/src/js/next.js
+++ b/addons/crm_partner_assign/static/src/js/next.js
@@ -1,6 +1,6 @@
-openerp.crm_channel = function (instance) {
-	instance.crm_channel = instance.crm_channel || {};
-	instance.crm_channel.next_or_list = function(parent) {
+openerp.crm_partner_assign = function (instance) {
+	instance.crm_partner_assign = instance.crm_partner_assign || {};
+	instance.crm_partner_assign.next_or_list = function(parent) {
 		var form = parent.inner_widget.views.form.controller;
 		form.dataset.remove_ids([form.dataset.ids[form.dataset.index]]);
 		form.reload();
@@ -9,5 +9,5 @@ openerp.crm_channel = function (instance) {
 		}
 		parent.do_action({ type: 'ir.actions.act_window_close' });
 	};
-	instance.web.client_actions.add("next_or_list", "instance.crm_channel.next_or_list");
+	instance.web.client_actions.add("next_or_list", "instance.crm_partner_assign.next_or_list");
 }
\ No newline at end of file
diff --git a/addons/crm_channel/test/partner_assign.yml b/addons/crm_partner_assign/test/partner_assign.yml
similarity index 100%
rename from addons/crm_channel/test/partner_assign.yml
rename to addons/crm_partner_assign/test/partner_assign.yml
diff --git a/addons/crm_channel/wizard/__init__.py b/addons/crm_partner_assign/wizard/__init__.py
similarity index 100%
rename from addons/crm_channel/wizard/__init__.py
rename to addons/crm_partner_assign/wizard/__init__.py
diff --git a/addons/crm_channel/wizard/crm_channel_interested.py b/addons/crm_partner_assign/wizard/crm_channel_interested.py
similarity index 98%
rename from addons/crm_channel/wizard/crm_channel_interested.py
rename to addons/crm_partner_assign/wizard/crm_channel_interested.py
index ab0e1d5d735..e63b8e07b30 100644
--- a/addons/crm_channel/wizard/crm_channel_interested.py
+++ b/addons/crm_partner_assign/wizard/crm_channel_interested.py
@@ -56,7 +56,7 @@ class crm_lead_forward_to_partner(osv.TransientModel):
             partner_ids = self.pool.get('res.partner').search(cr, SUPERUSER_ID, ['|', ('id', '=', partner_id), ('parent_id', '=', partner_id)], context=context)
             lead_obj.message_unsubscribe(cr, SUPERUSER_ID, context.get('active_ids'), partner_ids, context=None)
             try:
-                stage_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', stage)[1]
+                stage_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', stage)[1]
             except ValueError:
                 stage_id = False
             if stage_id:
diff --git a/addons/crm_channel/wizard/crm_channel_interested_view.xml b/addons/crm_partner_assign/wizard/crm_channel_interested_view.xml
similarity index 100%
rename from addons/crm_channel/wizard/crm_channel_interested_view.xml
rename to addons/crm_partner_assign/wizard/crm_channel_interested_view.xml
diff --git a/addons/crm_channel/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
similarity index 97%
rename from addons/crm_channel/wizard/crm_forward_to_partner.py
rename to addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 6dd30e0a95a..80fa2f28b04 100644
--- a/addons/crm_channel/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -53,7 +53,7 @@ class crm_lead_forward_to_partner(osv.TransientModel):
         lead_obj = self.pool.get('crm.lead')
         email_template_obj = self.pool.get('email.template')
         try:
-            template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'email_template_lead_forward_mail')[1]
+            template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', 'email_template_lead_forward_mail')[1]
         except ValueError:
             template_id = False
         res = super(crm_lead_forward_to_partner, self).default_get(cr, uid, fields, context=context)
@@ -82,7 +82,7 @@ class crm_lead_forward_to_partner(osv.TransientModel):
         record = self.browse(cr, uid, ids[0], context=context)
         email_template_obj = self.pool.get('email.template')
         try:
-            template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'email_template_lead_forward_mail')[1]
+            template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', 'email_template_lead_forward_mail')[1]
         except ValueError:
             raise osv.except_osv(_('Email Template Error'),
                                  _('The Forward Email Template is not in the database'))
@@ -121,7 +121,7 @@ class crm_lead_forward_to_partner(osv.TransientModel):
         stage_id = False
         if record.assignation_lines and record.assignation_lines[0].lead_id.type == 'lead':
             try:
-                stage_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', 'stage_portal_lead_assigned')[1]
+                stage_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', 'stage_portal_lead_assigned')[1]
             except ValueError:
                 pass
 
@@ -146,7 +146,7 @@ class crm_lead_forward_to_partner(osv.TransientModel):
     def get_lead_portal_url(self, cr, uid, lead_id, type, context=None):
         action = type == 'opportunity' and 'action_portal_opportunities' or 'action_portal_leads'
         try:
-            action_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_channel', action)[1]
+            action_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', action)[1]
         except ValueError:
             action_id = False
         portal_link = "%s/?db=%s#id=%s&action=%s&view_type=form" % (self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url'), cr.dbname, lead_id, action_id)
diff --git a/addons/crm_channel/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
similarity index 100%
rename from addons/crm_channel/wizard/crm_forward_to_partner_view.xml
rename to addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml

From eac496bb64f27b3dab43f321825e846d0a094be0 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 21 Jun 2013 09:44:28 +0200
Subject: [PATCH 74/94] [IMP] doc: add changelog for changes in addons revision
 8753

bzr revid: mat@openerp.com-20130621074428-tljs9v8rxd891quf
---
 doc/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.rst b/doc/changelog.rst
index 59c4a6bced5..70d959941ad 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -21,3 +21,5 @@ Changelog
   ``openerp.exceptions.RedirectWarning``.
 - Give a pair of new methods to ``res.config.settings`` and a helper to make
   them easier to use: ``get_config_warning()``.
+- Path to webkit report files (field ``report_file``) must be writen with the
+  Unix way (with ``/`` and not ``\``)
\ No newline at end of file

From 8f75b731202163b854bc817d0f9db463bc4fbb5a Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 21 Jun 2013 11:13:22 +0200
Subject: [PATCH 75/94] [DEL]crm_partner_assign: remove of useless action

bzr revid: dle@openerp.com-20130621091322-nwmsrwidy4ycp24h
---
 addons/crm_partner_assign/portal_data.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/addons/crm_partner_assign/portal_data.xml b/addons/crm_partner_assign/portal_data.xml
index 23daa729c17..0d4a5b30abd 100644
--- a/addons/crm_partner_assign/portal_data.xml
+++ b/addons/crm_partner_assign/portal_data.xml
@@ -2,14 +2,6 @@
 <openerp>
     <data>
 
-        <!-- menu Administration/Portals/Partners Portal -->
-
-        <record model="ir.actions.client" id="openerp_contact_us">
-          <field name="name">Portal Contact Us</field>
-          <field name="tag">contact_us_page</field>
-          <field name="params_store">{}</field>
-        </record>
-
         <!-- Partner and address -->
         <record id="res_partner_access" model="ir.model.access">
             <field name="name">openerp.portal.res.partner</field>

From 782266542939531d5c1b3be724955dd86c6394ee Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 21 Jun 2013 11:13:32 +0200
Subject: [PATCH 76/94] added search_read

bzr revid: nicolas.vanhoren@openerp.com-20130621091332-s37ma5gbg88999xv
---
 openerp/osv/orm.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index f1c421af5c9..0dad128dfad 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -5288,6 +5288,34 @@ class BaseModel(object):
     # for backward compatibility
     resolve_o2m_commands_to_record_dicts = resolve_2many_commands
 
+    def search_read(self, cr, uid, domain=None, fields=None, offset=0, limit=None, order=None, context=None):
+        """
+        Performs a ``search()`` followed by a ``read()``.
+
+        :param cr: database cursor
+        :param user: current user id
+        :param domain: Search domain, see ``args`` parameter in ``search()``. Defaults to an empty domain that will match all records.
+        :param fields: List of fields to read, see ``fields`` parameter in ``read()``. Defaults to all fields.
+        :param offset: Number of records to skip, see ``offset`` parameter in ``search()``. Defaults to 0.
+        :param limit: Maximum number of records to return, see ``limit`` parameter in ``search()``. Defaults to no limit.
+        :param order: Columns to sort result, see ``order`` parameter in ``search()``. Defaults to no sort.
+        :param context: context arguments.
+        :return: List of dictionaries containing the asked fields.
+        :rtype: List of dictionaries.
+
+        """
+        record_ids = self.search(cr, uid, domain or [], offset, limit or False, order or False, context or {})
+        if not record_ids:
+            return []
+        result = self.read(cr, uid, record_ids, fields or [], context or {})
+        # reorder read
+        if len(result) >= 1:
+            index = {}
+            for r in result:
+                index[r['id']] = r
+            result = [index[x] for x in record_ids if x in index]
+        return result
+
     def _register_hook(self, cr):
         """ stuff to do right after the registry is built """
         pass

From efca91362a0e7ce4a830644ac4ec92a09c1387d5 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 21 Jun 2013 11:43:47 +0200
Subject: [PATCH 77/94] [IMP]crm_partner_assign: using child of to find all
 partner from a company

bzr revid: dle@openerp.com-20130621094347-lmjd6tna1gffjxel
---
 addons/crm_partner_assign/wizard/crm_channel_interested.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm_partner_assign/wizard/crm_channel_interested.py b/addons/crm_partner_assign/wizard/crm_channel_interested.py
index e63b8e07b30..57db36cb51f 100644
--- a/addons/crm_partner_assign/wizard/crm_channel_interested.py
+++ b/addons/crm_partner_assign/wizard/crm_channel_interested.py
@@ -52,8 +52,7 @@ class crm_lead_forward_to_partner(osv.TransientModel):
             message = _('<p>I am not interested by this lead. I %scontacted the lead.</p>') % (not wizard.contacted and 'have not ' or '')
             values = {'partner_assigned_id': False}
             user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-            partner_id = user.parent_id.id or user.partner_id.id
-            partner_ids = self.pool.get('res.partner').search(cr, SUPERUSER_ID, ['|', ('id', '=', partner_id), ('parent_id', '=', partner_id)], context=context)
+            partner_ids = self.pool.get('res.partner').search(cr, SUPERUSER_ID, [('id', 'child_of', user.partner_id.commercial_partner_id.id)], context=context)
             lead_obj.message_unsubscribe(cr, SUPERUSER_ID, context.get('active_ids'), partner_ids, context=None)
             try:
                 stage_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', stage)[1]

From 2bc965ba9eec5eb769df6852d4b842e7b0488153 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 21 Jun 2013 11:55:04 +0200
Subject: [PATCH 78/94] Added tests for search_read

bzr revid: nicolas.vanhoren@openerp.com-20130621095504-cwwbr716apnh7680
---
 openerp/tests/test_orm.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/openerp/tests/test_orm.py b/openerp/tests/test_orm.py
index d2ec96846df..91b2cb0f278 100644
--- a/openerp/tests/test_orm.py
+++ b/openerp/tests/test_orm.py
@@ -76,6 +76,30 @@ class TestORM(common.TransactionCase):
         with self.assertRaises(Exception):
             self.partner.unlink(cr, uid2, [p1,p2])
 
+    @mute_logger('openerp.osv.orm')
+    def test_search_read(self):
+        # simple search_read
+        self.partner.create(self.cr, UID, {'name': 'MyPartner1'})
+        found = self.partner.search_read(self.cr, UID, [['name', '=', 'MyPartner1']], ['name'])
+        self.assertEqual(len(found), 1)
+        self.assertEqual(found[0]['name'], 'MyPartner1')
+        self.assertTrue('id' in found[0])
+
+        # search_read correct order
+        self.partner.create(self.cr, UID, {'name': 'MyPartner2'})
+        found = self.partner.search_read(self.cr, UID, [['name', 'like', 'MyPartner']], ['name'], order="name")
+        self.assertEqual(len(found), 2)
+        self.assertEqual(found[0]['name'], 'MyPartner1')
+        self.assertEqual(found[1]['name'], 'MyPartner2')
+        found = self.partner.search_read(self.cr, UID, [['name', 'like', 'MyPartner']], ['name'], order="name desc")
+        self.assertEqual(len(found), 2)
+        self.assertEqual(found[0]['name'], 'MyPartner2')
+        self.assertEqual(found[1]['name'], 'MyPartner1')
+
+        # search_read that finds nothing
+        found = self.partner.search_read(self.cr, UID, [['name', '=', 'Does not exists']], ['name'])
+        self.assertEqual(len(found), 0)
+
 
 class TestInherits(common.TransactionCase):
     """ test the behavior of the orm for models that use _inherits;

From 275b103855b92f831cec2d9ffa19c3941bddca3b Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 21 Jun 2013 12:15:26 +0200
Subject: [PATCH 79/94] changed some doc

bzr revid: nicolas.vanhoren@openerp.com-20130621101526-pf85k7iikv0eh8dz
---
 addons/web/session.py | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/addons/web/session.py b/addons/web/session.py
index aaa712fdedd..948cd4c4ad0 100644
--- a/addons/web/session.py
+++ b/addons/web/session.py
@@ -23,7 +23,8 @@ class SessionExpiredException(Exception):
 
 class Service(object):
     """
-        Deprecated. Use ``openerp.netsvc.dispatch_rpc()`` instead.
+        .. deprecated:: 8.0
+        Use ``openerp.netsvc.dispatch_rpc()`` instead.
     """
     def __init__(self, session, service_name):
         self.session = session
@@ -37,7 +38,8 @@ class Service(object):
 
 class Model(object):
     """
-        Deprecated. Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
+        .. deprecated:: 8.0
+        Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
     """
     def __init__(self, session, model):
         self.session = session
@@ -67,12 +69,6 @@ class Model(object):
             return result
         return proxy
 
-    def search_read(self, domain=None, fields=None, offset=0, limit=None, order=None, context=None):
-        record_ids = self.search(domain or [], offset, limit or False, order or False, context or {})
-        if not record_ids: return []
-        records = self.read(record_ids, fields or [], context or {})
-        return records
-
 class OpenERPSession(object):
     """
     An OpenERP RPC session, a given user can own multiple such sessions
@@ -163,19 +159,22 @@ class OpenERPSession(object):
 
     def send(self, service_name, method, *args):
         """
-        Deprecated. Use ``openerp.netsvc.dispatch_rpc()`` instead.
+        .. deprecated:: 8.0
+        Use ``openerp.netsvc.dispatch_rpc()`` instead.
         """
         return openerp.netsvc.dispatch_rpc(service_name, method, args)
 
     def proxy(self, service):
         """
-        Deprecated. Use ``openerp.netsvc.dispatch_rpc()`` instead.
+        .. deprecated:: 8.0
+        Use ``openerp.netsvc.dispatch_rpc()`` instead.
         """
         return Service(self, service)
 
     def assert_valid(self, force=False):
         """
-        Deprecated. Use ``check_security()`` instead.
+        .. deprecated:: 8.0
+        Use ``check_security()`` instead.
 
         Ensures this session is valid (logged into the openerp server)
         """
@@ -188,7 +187,8 @@ class OpenERPSession(object):
 
     def ensure_valid(self):
         """
-        Deprecated. Use ``check_security()`` instead.
+        .. deprecated:: 8.0
+        Use ``check_security()`` instead.
         """
         if self._uid:
             try:
@@ -198,7 +198,8 @@ class OpenERPSession(object):
 
     def execute(self, model, func, *l, **d):
         """
-        Deprecated. Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
+        .. deprecated:: 8.0
+        Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
         """
         model = self.model(model)
         r = getattr(model, func)(*l, **d)
@@ -206,7 +207,8 @@ class OpenERPSession(object):
 
     def exec_workflow(self, model, id, signal):
         """
-        Deprecated. Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
+        .. deprecated:: 8.0
+        Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
         """
         self.assert_valid()
         r = self.proxy('object').exec_workflow(self._db, self._uid, self._password, model, signal, id)
@@ -214,7 +216,8 @@ class OpenERPSession(object):
 
     def model(self, model):
         """
-        Deprecated. Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
+        .. deprecated:: 8.0
+        Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
 
         Get an RPC proxy for the object ``model``, bound to this session.
 

From c90e8119bb2f4e51f21fa2cb8ca633d5ddd8fb05 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 21 Jun 2013 13:44:24 +0200
Subject: [PATCH 80/94] Put session.py in http.py

bzr revid: nicolas.vanhoren@openerp.com-20130621114424-s0nd8orv5ej05pwv
---
 addons/web/http.py    | 235 ++++++++++++++++++++++++++++++++++++++++--
 addons/web/session.py | 233 -----------------------------------------
 2 files changed, 226 insertions(+), 242 deletions(-)
 delete mode 100644 addons/web/session.py

diff --git a/addons/web/http.py b/addons/web/http.py
index b42a7d7d0eb..83a3ac4fa42 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -34,8 +34,6 @@ import urllib2
 
 import openerp
 
-import session
-
 import inspect
 import functools
 
@@ -119,7 +117,7 @@ class WebRequest(object):
                 self.session_id = uuid.uuid4().hex
         self.session = self.httpsession.get(self.session_id)
         if not self.session:
-            self.session = session.OpenERPSession()
+            self.session = OpenERPSession()
             self.httpsession[self.session_id] = self.session
 
         with set_request(self):
@@ -157,13 +155,13 @@ class WebRequest(object):
         elif self.auth_method == "noauth":
             self.db = (self.session._db or openerp.addons.web.controllers.main.db_monodb()).lower()
             if not self.db:
-                raise session.SessionExpiredException("No valid database for request %s" % self.httprequest)
+                raise SessionExpiredException("No valid database for request %s" % self.httprequest)
             self.uid = None
         else: # auth
             try:
                 self.session.check_security()
-            except session.SessionExpiredException, e:
-                raise session.SessionExpiredException("Session expired for request %s" % self.httprequest)
+            except SessionExpiredException, e:
+                raise SessionExpiredException("Session expired for request %s" % self.httprequest)
             self.db = self.session._db
             self.uid = self.session._uid
 
@@ -337,7 +335,7 @@ class JsonRequest(WebRequest):
             #    _logger.debug("--> %s.%s\n%s", func.im_class.__name__, func.__name__, pprint.pformat(self.jsonrequest))
             response['id'] = self.jsonrequest.get('id')
             response["result"] = self._call_function(**self.params)
-        except session.AuthenticationError, e:
+        except AuthenticationError, e:
             _logger.exception("Exception during JSON request handling.")
             se = serialize_exception(e)
             error = {
@@ -566,6 +564,225 @@ class Controller(object):
         else:
             return getattr(self, name)
 
+#############################
+# OpenERP Sessions          #
+#############################
+
+class AuthenticationError(Exception):
+    pass
+
+class SessionExpiredException(Exception):
+    pass
+
+class Service(object):
+    """
+        .. deprecated:: 8.0
+        Use ``openerp.netsvc.dispatch_rpc()`` instead.
+    """
+    def __init__(self, session, service_name):
+        self.session = session
+        self.service_name = service_name
+
+    def __getattr__(self, method):
+        def proxy_method(*args):
+            result = openerp.netsvc.dispatch_rpc(self.service_name, method, args)
+            return result
+        return proxy_method
+
+class Model(object):
+    """
+        .. deprecated:: 8.0
+        Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
+    """
+    def __init__(self, session, model):
+        self.session = session
+        self.model = model
+        self.proxy = self.session.proxy('object')
+
+    def __getattr__(self, method):
+        self.session.assert_valid()
+        def proxy(*args, **kw):
+            # Can't provide any retro-compatibility for this case, so we check it and raise an Exception
+            # to tell the programmer to adapt his code
+            if not http.request.db or not http.request.uid or self.session._db != http.request.db \
+                or self.session._uid != http.request.uid:
+                raise Exception("Trying to use Model with badly configured database or user.")
+                
+            mod = http.request.registry.get(self.model)
+            meth = getattr(mod, method)
+            cr = http.request.cr
+            result = meth(cr, http.request.uid, *args, **kw)
+            # reorder read
+            if method == "read":
+                if isinstance(result, list) and len(result) > 0 and "id" in result[0]:
+                    index = {}
+                    for r in result:
+                        index[r['id']] = r
+                    result = [index[x] for x in args[0] if x in index]
+            return result
+        return proxy
+
+class OpenERPSession(object):
+    """
+    An OpenERP RPC session, a given user can own multiple such sessions
+    in a web session.
+
+    .. attribute:: context
+
+        The session context, a ``dict``. Can be reloaded by calling
+        :meth:`openerpweb.openerpweb.OpenERPSession.get_context`
+
+    .. attribute:: domains_store
+
+        A ``dict`` matching domain keys to evaluable (but non-literal) domains.
+
+        Used to store references to non-literal domains which need to be
+        round-tripped to the client browser.
+    """
+    def __init__(self):
+        self._creation_time = time.time()
+        self._db = False
+        self._uid = False
+        self._login = False
+        self._password = False
+        self._suicide = False
+        self.context = {}
+        self.jsonp_requests = {}     # FIXME use a LRU
+
+    def authenticate(self, db, login, password, env=None):
+        """
+        Authenticate the current user with the given db, login and password. If successful, store
+        the authentication parameters in the current session and request.
+        """
+        uid = openerp.netsvc.dispatch_rpc('common', 'authenticate', [db, login, password, env])
+        self._db = db
+        self._uid = uid
+        self._login = login
+        self._password = password
+        http.request.db = db
+        http.request.uid = uid
+
+        if uid: self.get_context()
+        return uid
+
+    def check_security(self):
+        """
+        Chech the current authentication parameters to know if those are still valid. This method
+        should be called at each request. If the authentication fails, a ``SessionExpiredException``
+        is raised.
+        """
+        if not self._db or not self._uid:
+            raise SessionExpiredException("Session expired")
+        import openerp.service.security as security
+        security.check(self._db, self._uid, self._password)
+
+    def get_context(self):
+        """
+        Re-initializes the current user's session context (based on
+        his preferences) by calling res.users.get_context() with the old
+        context.
+
+        :returns: the new context
+        """
+        assert self._uid, "The user needs to be logged-in to initialize his context"
+        self.context = http.request.registry.get('res.users').context_get(http.request.cr, http.request.uid) or {}
+        self.context['uid'] = self._uid
+        self._fix_lang(self.context)
+        return self.context
+
+    def _fix_lang(self, context):
+        """ OpenERP provides languages which may not make sense and/or may not
+        be understood by the web client's libraries.
+
+        Fix those here.
+
+        :param dict context: context to fix
+        """
+        lang = context['lang']
+
+        # inane OpenERP locale
+        if lang == 'ar_AR':
+            lang = 'ar'
+
+        # lang to lang_REGION (datejs only handles lang_REGION, no bare langs)
+        if lang in babel.core.LOCALE_ALIASES:
+            lang = babel.core.LOCALE_ALIASES[lang]
+
+        context['lang'] = lang or 'en_US'
+
+    def send(self, service_name, method, *args):
+        """
+        .. deprecated:: 8.0
+        Use ``openerp.netsvc.dispatch_rpc()`` instead.
+        """
+        return openerp.netsvc.dispatch_rpc(service_name, method, args)
+
+    def proxy(self, service):
+        """
+        .. deprecated:: 8.0
+        Use ``openerp.netsvc.dispatch_rpc()`` instead.
+        """
+        return Service(self, service)
+
+    def assert_valid(self, force=False):
+        """
+        .. deprecated:: 8.0
+        Use ``check_security()`` instead.
+
+        Ensures this session is valid (logged into the openerp server)
+        """
+        if self._uid and not force:
+            return
+        # TODO use authenticate instead of login
+        self._uid = self.proxy("common").login(self._db, self._login, self._password)
+        if not self._uid:
+            raise AuthenticationError("Authentication failure")
+
+    def ensure_valid(self):
+        """
+        .. deprecated:: 8.0
+        Use ``check_security()`` instead.
+        """
+        if self._uid:
+            try:
+                self.assert_valid(True)
+            except Exception:
+                self._uid = None
+
+    def execute(self, model, func, *l, **d):
+        """
+        .. deprecated:: 8.0
+        Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
+        """
+        model = self.model(model)
+        r = getattr(model, func)(*l, **d)
+        return r
+
+    def exec_workflow(self, model, id, signal):
+        """
+        .. deprecated:: 8.0
+        Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
+        """
+        self.assert_valid()
+        r = self.proxy('object').exec_workflow(self._db, self._uid, self._password, model, signal, id)
+        return r
+
+    def model(self, model):
+        """
+        .. deprecated:: 8.0
+        Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
+
+        Get an RPC proxy for the object ``model``, bound to this session.
+
+        :param model: an OpenERP model name
+        :type model: str
+        :rtype: a model object
+        """
+        if self._db == False:
+            raise SessionExpiredException("Session expired")
+
+        return Model(self, model)
+
 #----------------------------------------------------------
 # Session context manager
 #----------------------------------------------------------
@@ -584,7 +801,7 @@ def session_context(request, session_store, session_lock, sid):
         # session id, and are generally noise
         removed_sessions = set()
         for key, value in request.session.items():
-            if not isinstance(value, session.OpenERPSession):
+            if not isinstance(value, OpenERPSession):
                 continue
             if getattr(value, '_suicide', False) or (
                         not value._uid
@@ -612,7 +829,7 @@ def session_context(request, session_store, session_lock, sid):
                 in_store = session_store.get(sid)
                 for k, v in request.session.iteritems():
                     stored = in_store.get(k)
-                    if stored and isinstance(v, session.OpenERPSession):
+                    if stored and isinstance(v, OpenERPSession):
                         if hasattr(v, 'contexts_store'):
                             del v.contexts_store
                         if hasattr(v, 'domains_store'):
diff --git a/addons/web/session.py b/addons/web/session.py
deleted file mode 100644
index 948cd4c4ad0..00000000000
--- a/addons/web/session.py
+++ /dev/null
@@ -1,233 +0,0 @@
-#!/usr/bin/python
-import datetime
-import babel
-import dateutil.relativedelta
-import logging
-import time
-import traceback
-import sys
-
-import openerp
-import http
-
-_logger = logging.getLogger(__name__)
-
-#----------------------------------------------------------
-# OpenERPSession RPC openerp backend access
-#----------------------------------------------------------
-class AuthenticationError(Exception):
-    pass
-
-class SessionExpiredException(Exception):
-    pass
-
-class Service(object):
-    """
-        .. deprecated:: 8.0
-        Use ``openerp.netsvc.dispatch_rpc()`` instead.
-    """
-    def __init__(self, session, service_name):
-        self.session = session
-        self.service_name = service_name
-
-    def __getattr__(self, method):
-        def proxy_method(*args):
-            result = openerp.netsvc.dispatch_rpc(self.service_name, method, args)
-            return result
-        return proxy_method
-
-class Model(object):
-    """
-        .. deprecated:: 8.0
-        Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
-    """
-    def __init__(self, session, model):
-        self.session = session
-        self.model = model
-        self.proxy = self.session.proxy('object')
-
-    def __getattr__(self, method):
-        self.session.assert_valid()
-        def proxy(*args, **kw):
-            # Can't provide any retro-compatibility for this case, so we check it and raise an Exception
-            # to tell the programmer to adapt his code
-            if not http.request.db or not http.request.uid or self.session._db != http.request.db \
-                or self.session._uid != http.request.uid:
-                raise Exception("Trying to use Model with badly configured database or user.")
-                
-            mod = http.request.registry.get(self.model)
-            meth = getattr(mod, method)
-            cr = http.request.cr
-            result = meth(cr, http.request.uid, *args, **kw)
-            # reorder read
-            if method == "read":
-                if isinstance(result, list) and len(result) > 0 and "id" in result[0]:
-                    index = {}
-                    for r in result:
-                        index[r['id']] = r
-                    result = [index[x] for x in args[0] if x in index]
-            return result
-        return proxy
-
-class OpenERPSession(object):
-    """
-    An OpenERP RPC session, a given user can own multiple such sessions
-    in a web session.
-
-    .. attribute:: context
-
-        The session context, a ``dict``. Can be reloaded by calling
-        :meth:`openerpweb.openerpweb.OpenERPSession.get_context`
-
-    .. attribute:: domains_store
-
-        A ``dict`` matching domain keys to evaluable (but non-literal) domains.
-
-        Used to store references to non-literal domains which need to be
-        round-tripped to the client browser.
-    """
-    def __init__(self):
-        self._creation_time = time.time()
-        self._db = False
-        self._uid = False
-        self._login = False
-        self._password = False
-        self._suicide = False
-        self.context = {}
-        self.jsonp_requests = {}     # FIXME use a LRU
-
-    def authenticate(self, db, login, password, env=None):
-        """
-        Authenticate the current user with the given db, login and password. If successful, store
-        the authentication parameters in the current session and request.
-        """
-        uid = openerp.netsvc.dispatch_rpc('common', 'authenticate', [db, login, password, env])
-        self._db = db
-        self._uid = uid
-        self._login = login
-        self._password = password
-        http.request.db = db
-        http.request.uid = uid
-
-        if uid: self.get_context()
-        return uid
-
-    def check_security(self):
-        """
-        Chech the current authentication parameters to know if those are still valid. This method
-        should be called at each request. If the authentication fails, a ``SessionExpiredException``
-        is raised.
-        """
-        if not self._db or not self._uid:
-            raise SessionExpiredException("Session expired")
-        import openerp.service.security as security
-        security.check(self._db, self._uid, self._password)
-
-    def get_context(self):
-        """
-        Re-initializes the current user's session context (based on
-        his preferences) by calling res.users.get_context() with the old
-        context.
-
-        :returns: the new context
-        """
-        assert self._uid, "The user needs to be logged-in to initialize his context"
-        self.context = http.request.registry.get('res.users').context_get(http.request.cr, http.request.uid) or {}
-        self.context['uid'] = self._uid
-        self._fix_lang(self.context)
-        return self.context
-
-    def _fix_lang(self, context):
-        """ OpenERP provides languages which may not make sense and/or may not
-        be understood by the web client's libraries.
-
-        Fix those here.
-
-        :param dict context: context to fix
-        """
-        lang = context['lang']
-
-        # inane OpenERP locale
-        if lang == 'ar_AR':
-            lang = 'ar'
-
-        # lang to lang_REGION (datejs only handles lang_REGION, no bare langs)
-        if lang in babel.core.LOCALE_ALIASES:
-            lang = babel.core.LOCALE_ALIASES[lang]
-
-        context['lang'] = lang or 'en_US'
-
-    def send(self, service_name, method, *args):
-        """
-        .. deprecated:: 8.0
-        Use ``openerp.netsvc.dispatch_rpc()`` instead.
-        """
-        return openerp.netsvc.dispatch_rpc(service_name, method, args)
-
-    def proxy(self, service):
-        """
-        .. deprecated:: 8.0
-        Use ``openerp.netsvc.dispatch_rpc()`` instead.
-        """
-        return Service(self, service)
-
-    def assert_valid(self, force=False):
-        """
-        .. deprecated:: 8.0
-        Use ``check_security()`` instead.
-
-        Ensures this session is valid (logged into the openerp server)
-        """
-        if self._uid and not force:
-            return
-        # TODO use authenticate instead of login
-        self._uid = self.proxy("common").login(self._db, self._login, self._password)
-        if not self._uid:
-            raise AuthenticationError("Authentication failure")
-
-    def ensure_valid(self):
-        """
-        .. deprecated:: 8.0
-        Use ``check_security()`` instead.
-        """
-        if self._uid:
-            try:
-                self.assert_valid(True)
-            except Exception:
-                self._uid = None
-
-    def execute(self, model, func, *l, **d):
-        """
-        .. deprecated:: 8.0
-        Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
-        """
-        model = self.model(model)
-        r = getattr(model, func)(*l, **d)
-        return r
-
-    def exec_workflow(self, model, id, signal):
-        """
-        .. deprecated:: 8.0
-        Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
-        """
-        self.assert_valid()
-        r = self.proxy('object').exec_workflow(self._db, self._uid, self._password, model, signal, id)
-        return r
-
-    def model(self, model):
-        """
-        .. deprecated:: 8.0
-        Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
-
-        Get an RPC proxy for the object ``model``, bound to this session.
-
-        :param model: an OpenERP model name
-        :type model: str
-        :rtype: a model object
-        """
-        if self._db == False:
-            raise SessionExpiredException("Session expired")
-
-        return Model(self, model)
-
-# vim:et:ts=4:sw=4:

From 2fd53a468cf55d4d4beadd7f620677d172b5d3ed Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 21 Jun 2013 14:15:10 +0200
Subject: [PATCH 81/94] multiple refactoring with authentication

bzr revid: nicolas.vanhoren@openerp.com-20130621121510-gx22b6j9pwsfe352
---
 addons/web/controllers/main.py     | 116 ++++++++++++++---------------
 addons/web/controllers/testing.py  |   2 +-
 addons/web/doc/web_controllers.rst |   8 +-
 addons/web/http.py                 |  50 ++++++-------
 4 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 16efea06f13..51abe2d8a01 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -572,7 +572,7 @@ html_template = """<!DOCTYPE html>
 
 class Home(http.Controller):
 
-    @http.route('/', type='http', authentication="nodb")
+    @http.route('/', type='http', auth="none")
     def index(self, s_action=None, db=None, **kw):
         db, redir = db_monodb_redirect()
         if redir:
@@ -589,30 +589,30 @@ class Home(http.Controller):
         }
         return r
 
-    @http.route('/login', type='http', authentication="auth")
+    @http.route('/login', type='http', auth="user")
     def login(self, db, login, key):
         return login_and_redirect(db, login, key)
 
-    @http.route('/jsonrpc', type='json', authentication="nodb")
+    @http.route('/jsonrpc', type='json', auth="none")
     def jsonrpc(self, service, method, args):
         """ Method used by client APIs to contact OpenERP. """
         return openerp.netsvc.dispatch_rpc(service, method, args)
 
 class WebClient(http.Controller):
 
-    @http.route('/web/webclient/csslist', type='json', authentication="nodb")
+    @http.route('/web/webclient/csslist', type='json', auth="none")
     def csslist(self, mods=None):
         return manifest_list('css', mods=mods)
 
-    @http.route('/web/webclient/jslist', type='json', authentication="nodb")
+    @http.route('/web/webclient/jslist', type='json', auth="none")
     def jslist(self, mods=None):
         return manifest_list('js', mods=mods)
 
-    @http.route('/web/webclient/qweblist', type='json', authentication="nodb")
+    @http.route('/web/webclient/qweblist', type='json', auth="none")
     def qweblist(self, mods=None):
         return manifest_list('qweb', mods=mods)
 
-    @http.route('/web/webclient/css', type='http', authentication="nodb")
+    @http.route('/web/webclient/css', type='http', auth="none")
     def css(self, mods=None, db=None):
         files = list(manifest_glob('css', addons=mods, db=db))
         last_modified = get_last_modified(f[0] for f in files)
@@ -663,7 +663,7 @@ class WebClient(http.Controller):
             request.make_response(content, [('Content-Type', 'text/css')]),
             last_modified, checksum)
 
-    @http.route('/web/webclient/js', type='http', authentication="nodb")
+    @http.route('/web/webclient/js', type='http', auth="none")
     def js(self, mods=None, db=None):
         files = [f[0] for f in manifest_glob('js', addons=mods, db=db)]
         last_modified = get_last_modified(files)
@@ -676,7 +676,7 @@ class WebClient(http.Controller):
             request.make_response(content, [('Content-Type', 'application/javascript')]),
             last_modified, checksum)
 
-    @http.route('/web/webclient/qweb', type='http', authentication="nodb")
+    @http.route('/web/webclient/qweb', type='http', auth="none")
     def qweb(self, mods=None, db=None):
         files = [f[0] for f in manifest_glob('qweb', addons=mods, db=db)]
         last_modified = get_last_modified(files)
@@ -689,7 +689,7 @@ class WebClient(http.Controller):
             request.make_response(content, [('Content-Type', 'text/xml')]),
             last_modified, checksum)
 
-    @http.route('/web/webclient/bootstrap_translations', type='json', authentication="nodb")
+    @http.route('/web/webclient/bootstrap_translations', type='json', auth="none")
     def bootstrap_translations(self, mods):
         """ Load local translations from *.po files, as a temporary solution
             until we have established a valid session. This is meant only
@@ -712,7 +712,7 @@ class WebClient(http.Controller):
         return {"modules": translations_per_module,
                 "lang_parameters": None}
 
-    @http.route('/web/webclient/translations', type='json', authentication="auth")
+    @http.route('/web/webclient/translations', type='json', auth="user")
     def translations(self, mods, lang):
         res_lang = request.session.model('res.lang')
         ids = res_lang.search([("code", "=", lang)])
@@ -737,13 +737,13 @@ class WebClient(http.Controller):
         return {"modules": translations_per_module,
                 "lang_parameters": lang_params}
 
-    @http.route('/web/webclient/version_info', type='json', authentication="nodb")
+    @http.route('/web/webclient/version_info', type='json', auth="none")
     def version_info(self):
         return openerp.service.common.exp_version()
 
 class Proxy(http.Controller):
 
-    @http.route('/web/proxy/load', type='json', authentication="nodb")
+    @http.route('/web/proxy/load', type='json', auth="none")
     def load(self, path):
         """ Proxies an HTTP request through a JSON request.
 
@@ -760,11 +760,11 @@ class Proxy(http.Controller):
 
 class Database(http.Controller):
 
-    @http.route('/web/database/get_list', type='json', authentication="nodb")
+    @http.route('/web/database/get_list', type='json', auth="none")
     def get_list(self):
         return db_list()
 
-    @http.route('/web/database/create', type='json', authentication="nodb")
+    @http.route('/web/database/create', type='json', auth="none")
     def create(self, fields):
         params = dict(map(operator.itemgetter('name', 'value'), fields))
         return request.session.proxy("db").create_database(
@@ -774,7 +774,7 @@ class Database(http.Controller):
             params['db_lang'],
             params['create_admin_pwd'])
 
-    @http.route('/web/database/duplicate', type='json', authentication="nodb")
+    @http.route('/web/database/duplicate', type='json', auth="none")
     def duplicate(self, fields):
         params = dict(map(operator.itemgetter('name', 'value'), fields))
         duplicate_attrs = (
@@ -785,7 +785,7 @@ class Database(http.Controller):
 
         return request.session.proxy("db").duplicate_database(*duplicate_attrs)
 
-    @http.route('/web/database/drop', type='json', authentication="nodb")
+    @http.route('/web/database/drop', type='json', auth="none")
     def drop(self, fields):
         password, db = operator.itemgetter(
             'drop_pwd', 'drop_db')(
@@ -798,7 +798,7 @@ class Database(http.Controller):
         except Exception:
             return {'error': _('Could not drop database !'), 'title': _('Drop Database')}
 
-    @http.route('/web/database/backup', type='http', authentication="nodb")
+    @http.route('/web/database/backup', type='http', auth="none")
     def backup(self, backup_db, backup_pwd, token):
         try:
             db_dump = base64.b64decode(
@@ -816,7 +816,7 @@ class Database(http.Controller):
         except Exception, e:
             return simplejson.dumps([[],[{'error': openerp.tools.ustr(e), 'title': _('Backup Database')}]])
 
-    @http.route('/web/database/restore', type='http', authentication="nodb")
+    @http.route('/web/database/restore', type='http', auth="none")
     def restore(self, db_file, restore_pwd, new_db):
         try:
             data = base64.b64encode(db_file.read())
@@ -825,7 +825,7 @@ class Database(http.Controller):
         except openerp.exceptions.AccessDenied, e:
             raise Exception("AccessDenied")
 
-    @http.route('/web/database/change_password', type='json', authentication="nodb")
+    @http.route('/web/database/change_password', type='json', auth="none")
     def change_password(self, fields):
         old_password, new_password = operator.itemgetter(
             'old_pwd', 'new_pwd')(
@@ -849,13 +849,13 @@ class Session(http.Controller):
             "username": request.session._login,
         }
 
-    @http.route('/web/session/get_session_info', type='json', authentication="nodb")
+    @http.route('/web/session/get_session_info', type='json', auth="none")
     def get_session_info(self):
         request.uid = request.session._uid
         request.db = request.session._db
         return self.session_info()
 
-    @http.route('/web/session/authenticate', type='json', authentication="nodb")
+    @http.route('/web/session/authenticate', type='json', auth="none")
     def authenticate(self, db, login, password, base_location=None):
         wsgienv = request.httprequest.environ
         env = dict(
@@ -867,7 +867,7 @@ class Session(http.Controller):
 
         return self.session_info()
 
-    @http.route('/web/session/change_password', type='json', authentication="auth")
+    @http.route('/web/session/change_password', type='json', auth="user")
     def change_password(self, fields):
         old_password, new_password,confirm_password = operator.itemgetter('old_pwd', 'new_password','confirm_pwd')(
                 dict(map(operator.itemgetter('name', 'value'), fields)))
@@ -883,24 +883,24 @@ class Session(http.Controller):
             return {'error': _('The old password you provided is incorrect, your password was not changed.'), 'title': _('Change Password')}
         return {'error': _('Error, password not changed !'), 'title': _('Change Password')}
 
-    @http.route('/web/session/sc_list', type='json', authentication="auth")
+    @http.route('/web/session/sc_list', type='json', auth="user")
     def sc_list(self):
         return request.session.model('ir.ui.view_sc').get_sc(
             request.session._uid, "ir.ui.menu", request.context)
 
-    @http.route('/web/session/get_lang_list', type='json', authentication="nodb")
+    @http.route('/web/session/get_lang_list', type='json', auth="none")
     def get_lang_list(self):
         try:
             return request.session.proxy("db").list_lang() or []
         except Exception, e:
             return {"error": e, "title": _("Languages")}
 
-    @http.route('/web/session/modules', type='json', authentication="auth")
+    @http.route('/web/session/modules', type='json', auth="user")
     def modules(self):
         # return all installed modules. Web client is smart enough to not load a module twice
         return module_installed()
 
-    @http.route('/web/session/save_session_action', type='json', authentication="auth")
+    @http.route('/web/session/save_session_action', type='json', auth="user")
     def save_session_action(self, the_action):
         """
         This method store an action object in the session object and returns an integer
@@ -924,7 +924,7 @@ class Session(http.Controller):
         saved_actions["next"] = key + 1
         return key
 
-    @http.route('/web/session/get_session_action', type='json', authentication="auth")
+    @http.route('/web/session/get_session_action', type='json', auth="user")
     def get_session_action(self, key):
         """
         Gets back a previously saved action. This method can return None if the action
@@ -940,18 +940,18 @@ class Session(http.Controller):
             return None
         return saved_actions["actions"].get(key)
 
-    @http.route('/web/session/check', type='json', authentication="auth")
+    @http.route('/web/session/check', type='json', auth="user")
     def check(self):
         request.session.assert_valid()
         return None
 
-    @http.route('/web/session/destroy', type='json', authentication="auth")
+    @http.route('/web/session/destroy', type='json', auth="user")
     def destroy(self):
         request.session._suicide = True
 
 class Menu(http.Controller):
 
-    @http.route('/web/menu/get_user_roots', type='json', authentication="auth")
+    @http.route('/web/menu/get_user_roots', type='json', auth="user")
     def get_user_roots(self):
         """ Return all root menu ids visible for the session user.
 
@@ -973,7 +973,7 @@ class Menu(http.Controller):
 
         return Menus.search(menu_domain, 0, False, False, request.context)
 
-    @http.route('/web/menu/load', type='json', authentication="auth")
+    @http.route('/web/menu/load', type='json', auth="user")
     def load(self):
         """ Loads all menu items (all applications and their sub-menus).
 
@@ -1024,7 +1024,7 @@ class Menu(http.Controller):
 
         return menu_root
 
-    @http.route('/web/menu/load_needaction', type='json', authentication="auth")
+    @http.route('/web/menu/load_needaction', type='json', auth="user")
     def load_needaction(self, menu_ids):
         """ Loads needaction counters for specific menu ids.
 
@@ -1033,7 +1033,7 @@ class Menu(http.Controller):
         """
         return request.session.model('ir.ui.menu').get_needaction_data(menu_ids, request.context)
 
-    @http.route('/web/menu/action', type='json', authentication="auth")
+    @http.route('/web/menu/action', type='json', auth="user")
     def action(self, menu_id):
         # still used by web_shortcut
         actions = load_actions_from_ir_values('action', 'tree_but_open',
@@ -1042,7 +1042,7 @@ class Menu(http.Controller):
 
 class DataSet(http.Controller):
 
-    @http.route('/web/dataset/search_read', type='json', authentication="auth")
+    @http.route('/web/dataset/search_read', type='json', auth="user")
     def search_read(self, model, fields=False, offset=0, limit=False, domain=None, sort=None):
         return self.do_search_read(model, fields, offset, limit, domain, sort)
     def do_search_read(self, model, fields=False, offset=0, limit=False, domain=None
@@ -1084,7 +1084,7 @@ class DataSet(http.Controller):
             'records': records
         }
 
-    @http.route('/web/dataset/load', type='json', authentication="auth")
+    @http.route('/web/dataset/load', type='json', auth="user")
     def load(self, model, id, fields):
         m = request.session.model(model)
         value = {}
@@ -1110,26 +1110,26 @@ class DataSet(http.Controller):
 
         return getattr(request.session.model(model), method)(*args, **kwargs)
 
-    @http.route('/web/dataset/call', type='json', authentication="auth")
+    @http.route('/web/dataset/call', type='json', auth="user")
     def call(self, model, method, args, domain_id=None, context_id=None):
         return self._call_kw(model, method, args, {})
 
-    @http.route(['/web/dataset/call_kw', '/web/dataset/call_kw/<path:path>'], type='json', authentication="auth")
+    @http.route(['/web/dataset/call_kw', '/web/dataset/call_kw/<path:path>'], type='json', auth="user")
     def call_kw(self, model, method, args, kwargs, path=None):
         return self._call_kw(model, method, args, kwargs)
 
-    @http.route('/web/dataset/call_button', type='json', authentication="auth")
+    @http.route('/web/dataset/call_button', type='json', auth="user")
     def call_button(self, model, method, args, domain_id=None, context_id=None):
         action = self._call_kw(model, method, args, {})
         if isinstance(action, dict) and action.get('type') != '':
             return clean_action(action)
         return False
 
-    @http.route('/web/dataset/exec_workflow', type='json', authentication="auth")
+    @http.route('/web/dataset/exec_workflow', type='json', auth="user")
     def exec_workflow(self, model, id, signal):
         return request.session.exec_workflow(model, id, signal)
 
-    @http.route('/web/dataset/resequence', type='json', authentication="auth")
+    @http.route('/web/dataset/resequence', type='json', auth="user")
     def resequence(self, model, ids, field='sequence', offset=0):
         """ Re-sequences a number of records in the model, by their ids
 
@@ -1154,7 +1154,7 @@ class DataSet(http.Controller):
 
 class View(http.Controller):
 
-    @http.route('/web/view/add_custom', type='json', authentication="auth")
+    @http.route('/web/view/add_custom', type='json', auth="user")
     def add_custom(self, view_id, arch):
         CustomView = request.session.model('ir.ui.view.custom')
         CustomView.create({
@@ -1164,7 +1164,7 @@ class View(http.Controller):
         }, request.context)
         return {'result': True}
 
-    @http.route('/web/view/undo_custom', type='json', authentication="auth")
+    @http.route('/web/view/undo_custom', type='json', auth="user")
     def undo_custom(self, view_id, reset=False):
         CustomView = request.session.model('ir.ui.view.custom')
         vcustom = CustomView.search([('user_id', '=', request.session._uid), ('ref_id' ,'=', view_id)],
@@ -1179,7 +1179,7 @@ class View(http.Controller):
 
 class TreeView(View):
 
-    @http.route('/web/treeview/action', type='json', authentication="auth")
+    @http.route('/web/treeview/action', type='json', auth="user")
     def action(self, model, id):
         return load_actions_from_ir_values(
             'action', 'tree_but_open',[(model, id)],
@@ -1187,7 +1187,7 @@ class TreeView(View):
 
 class Binary(http.Controller):
 
-    @http.route('/web/binary/image', type='http', authentication="auth")
+    @http.route('/web/binary/image', type='http', auth="user")
     def image(self, model, id, field, **kw):
         last_update = '__last_update'
         Model = request.session.model(model)
@@ -1242,7 +1242,7 @@ class Binary(http.Controller):
         addons_path = http.addons_manifest['web']['addons_path']
         return open(os.path.join(addons_path, 'web', 'static', 'src', 'img', image), 'rb').read()
 
-    @http.route('/web/binary/saveas', type='http', authentication="auth")
+    @http.route('/web/binary/saveas', type='http', auth="user")
     def saveas(self, model, field, id=None, filename_field=None, **kw):
         """ Download link for files stored as binary fields.
 
@@ -1275,7 +1275,7 @@ class Binary(http.Controller):
                 [('Content-Type', 'application/octet-stream'),
                  ('Content-Disposition', content_disposition(filename))])
 
-    @http.route('/web/binary/saveas_ajax', type='http', authentication="auth")
+    @http.route('/web/binary/saveas_ajax', type='http', auth="user")
     def saveas_ajax(self, data, token):
         jdata = simplejson.loads(data)
         model = jdata['model']
@@ -1308,7 +1308,7 @@ class Binary(http.Controller):
                         ('Content-Disposition', content_disposition(filename))],
                 cookies={'fileToken': int(token)})
 
-    @http.route('/web/binary/upload', type='http', authentication="auth")
+    @http.route('/web/binary/upload', type='http', auth="user")
     def upload(self, callback, ufile):
         # TODO: might be useful to have a configuration flag for max-length file uploads
         out = """<script language="javascript" type="text/javascript">
@@ -1323,7 +1323,7 @@ class Binary(http.Controller):
             args = [False, e.message]
         return out % (simplejson.dumps(callback), simplejson.dumps(args))
 
-    @http.route('/web/binary/upload_attachment', type='http', authentication="auth")
+    @http.route('/web/binary/upload_attachment', type='http', auth="user")
     def upload_attachment(self, callback, model, id, ufile):
         Model = request.session.model('ir.attachment')
         out = """<script language="javascript" type="text/javascript">
@@ -1346,7 +1346,7 @@ class Binary(http.Controller):
             args = {'error': "Something horrible happened"}
         return out % (simplejson.dumps(callback), simplejson.dumps(args))
 
-    @http.route('/web/binary/company_logo', type='http', authentication="nodb")
+    @http.route('/web/binary/company_logo', type='http', auth="none")
     def company_logo(self, dbname=None):
         # TODO add etag, refactor to use /image code for etag
         uid = None
@@ -1388,7 +1388,7 @@ class Binary(http.Controller):
 
 class Action(http.Controller):
 
-    @http.route('/web/action/load', type='json', authentication="auth")
+    @http.route('/web/action/load', type='json', auth="user")
     def load(self, action_id, do_not_eval=False):
         Actions = request.session.model('ir.actions.actions')
         value = False
@@ -1414,7 +1414,7 @@ class Action(http.Controller):
                 value = clean_action(action[0])
         return value
 
-    @http.route('/web/action/run', type='json', authentication="auth")
+    @http.route('/web/action/run', type='json', auth="user")
     def run(self, action_id):
         return_action = request.session.model('ir.actions.server').run(
             [action_id], request.context)
@@ -1425,7 +1425,7 @@ class Action(http.Controller):
 
 class Export(http.Controller):
 
-    @http.route('/web/export/formats', type='json', authentication="auth")
+    @http.route('/web/export/formats', type='json', auth="user")
     def formats(self):
         """ Returns all valid export formats
 
@@ -1439,7 +1439,7 @@ class Export(http.Controller):
         fields = Model.fields_get(False, request.context)
         return fields
 
-    @http.route('/web/export/get_fields', type='json', authentication="auth")
+    @http.route('/web/export/get_fields', type='json', auth="user")
     def get_fields(self, model, prefix='', parent_name= '',
                    import_compat=True, parent_field_type=None,
                    exclude=None):
@@ -1488,7 +1488,7 @@ class Export(http.Controller):
 
         return records
 
-    @http.route('/web/export/namelist', type='json', authentication="auth")
+    @http.route('/web/export/namelist', type='json', auth="user")
     def namelist(self, model, export_id):
         # TODO: namelist really has no reason to be in Python (although itertools.groupby helps)
         export = request.session.model("ir.exports").read([export_id])[0]
@@ -1608,7 +1608,7 @@ class ExportFormat(object):
 class CSVExport(ExportFormat, http.Controller):
     fmt = {'tag': 'csv', 'label': 'CSV'}
 
-    @http.route('/web/export/csv', type='http', authentication="auth")
+    @http.route('/web/export/csv', type='http', auth="user")
     def index(self, data, token):
         return self.base(data, token)
 
@@ -1650,7 +1650,7 @@ class ExcelExport(ExportFormat, http.Controller):
         'error': None if xlwt else "XLWT required"
     }
 
-    @http.route('/web/export/xls', type='http', authentication="auth")
+    @http.route('/web/export/xls', type='http', auth="user")
     def index(self, data, token):
         return self.base(data, token)
 
@@ -1696,7 +1696,7 @@ class Reports(http.Controller):
         'xls': 'application/vnd.ms-excel',
     }
 
-    @http.route('/web/report', type='http', authentication="auth")
+    @http.route('/web/report', type='http', auth="user")
     def index(self, action, token):
         action = simplejson.loads(action)
 
diff --git a/addons/web/controllers/testing.py b/addons/web/controllers/testing.py
index 5e156dc410e..36afbd1e653 100644
--- a/addons/web/controllers/testing.py
+++ b/addons/web/controllers/testing.py
@@ -87,7 +87,7 @@ TESTING = Template(u"""<!DOCTYPE html>
 
 class TestRunnerController(http.Controller):
 
-    @http.route('/web/tests', type='http', authentication="nodb")
+    @http.route('/web/tests', type='http', auth="none")
     def index(self, req, mod=None, **kwargs):
         ms = module.get_modules()
         manifests = dict(
diff --git a/addons/web/doc/web_controllers.rst b/addons/web/doc/web_controllers.rst
index c35bd66eef4..86ac0248e7e 100644
--- a/addons/web/doc/web_controllers.rst
+++ b/addons/web/doc/web_controllers.rst
@@ -135,12 +135,12 @@ Authorization Levels
 --------------------
 
 By default, all methods can only be used by users logged into OpenERP (OpenERP uses cookies to track logged users).
-There are some cases when you need to enable not-logged in users to access some methods. To do so, add the ``'noauth'``
-value to the ``authentication`` parameter of ``http.route()``:
+There are some cases when you need to enable not-logged in users to access some methods. To do so, add the ``'db'``
+value to the ``auth`` parameter of ``http.route()``:
 
 ::
 
-    @http.route('/hello', type="http", authentication="noauth")
+    @http.route('/hello', type="http", auth="db")
     def hello(self):
         return "<div>Hello unknown user!</div>"
 
@@ -158,7 +158,7 @@ want to override. Example that redefine the home page of your OpenERP applicatio
     import openerp.addons.web.controllers.main as main
 
     class Home2(main.Home):
-        @http.route('/', type="http", authentication="noauth")
+        @http.route('/', type="http", auth="db")
         def index(self):
             return "<div>This is my new home page.</div>"
 
diff --git a/addons/web/http.py b/addons/web/http.py
index 83a3ac4fa42..3e17f27774f 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -86,12 +86,12 @@ class WebRequest(object):
     .. attribute:: db
 
         ``str``, the name of the database linked to the current request. Can be ``None``
-        if the current request uses the ``nodb`` authentication.
+        if the current request uses the ``none`` authentication.
 
     .. attribute:: uid
 
         ``int``, the id of the user related to the current request. Can be ``None``
-        if the current request uses the ``nodb`` or the ``noauth`` authenticatoin.
+        if the current request uses the ``none`` or the ``db`` authenticatoin.
     """
     def __init__(self, httprequest):
         self.httprequest = httprequest
@@ -149,10 +149,10 @@ class WebRequest(object):
         self.lang = lang.replace('-', '_')
 
     def _authenticate(self):
-        if self.auth_method == "nodb":
+        if self.auth_method == "none":
             self.db = None
             self.uid = None
-        elif self.auth_method == "noauth":
+        elif self.auth_method == "db":
             self.db = (self.session._db or openerp.addons.web.controllers.main.db_monodb()).lower()
             if not self.db:
                 raise SessionExpiredException("No valid database for request %s" % self.httprequest)
@@ -169,14 +169,14 @@ class WebRequest(object):
     def registry(self):
         """
         The registry to the database linked to this request. Can be ``None`` if the current request uses the
-        ``nodb'' authentication.
+        ``none'' authentication.
         """
         return openerp.modules.registry.RegistryManager.get(self.db) if self.db else None
 
     @property
     def cr(self):
         """
-        The cursor initialized for the current method call. If the current request uses the ``nodb`` authentication
+        The cursor initialized for the current method call. If the current request uses the ``none`` authentication
         trying to access this property will raise an exception.
         """
         # some magic to lazy create the cr
@@ -209,7 +209,7 @@ class WebRequest(object):
             self.db = None
             self.uid = None
 
-def route(route, type="http", authentication="auth"):
+def route(route, type="http", auth="user"):
     """
     Decorator marking the decorated method as being a handler for requests. The method must be part of a subclass
     of ``Controller``.
@@ -222,16 +222,16 @@ def route(route, type="http", authentication="auth"):
     method. Can be a single string or an array of strings. See werkzeug's routing documentation for the format of
     route expression ( http://werkzeug.pocoo.org/docs/routing/ ).
     :param type: The type of request, can be ``'http'`` or ``'json'``.
-    :param authentication: The type of authentication method, can on of the following:
+    :param auth: The type of authentication method, can on of the following:
 
         * ``auth``: The user must be authenticated.
-        * ``noauth``: There is no need for the user to be authenticated but there must be a way to find the current
+        * ``db``: There is no need for the user to be authenticated but there must be a way to find the current
         database.
-        * ``nodb``: The method is always active, even if there is no database. Mainly used by the framework and
+        * ``none``: The method is always active, even if there is no database. Mainly used by the framework and
         authentication modules.
     """
     assert type in ["http", "json"]
-    assert authentication in ["auth", "noauth", "nodb"]
+    assert auth in ["user", "db", "none"]
     def decorator(f):
         if isinstance(route, list):
             f.routes = route
@@ -239,7 +239,7 @@ def route(route, type="http", authentication="auth"):
             f.routes = [route]
         f.exposed = type
         if getattr(f, "auth", None) is None:
-            f.auth = authentication
+            f.auth = auth
         return f
     return decorator
 
@@ -415,7 +415,7 @@ def jsonrequest(f):
     base = f.__name__
     if f.__name__ == "index":
         base = ""
-    return route([base, os.path.join(base, "<path:_ignored_path>")], type="json", authentication="auth")(f)
+    return route([base, os.path.join(base, "<path:_ignored_path>")], type="json", auth="user")(f)
 
 class HttpRequest(WebRequest):
     """ Regular GET/POST request
@@ -498,7 +498,7 @@ def httprequest(f):
     base = f.__name__
     if f.__name__ == "index":
         base = ""
-    return route([base, os.path.join(base, "<path:_ignored_path>")], type="http", authentication="auth")(f)
+    return route([base, os.path.join(base, "<path:_ignored_path>")], type="http", auth="user")(f)
 
 #----------------------------------------------------------
 # Local storage of requests
@@ -604,14 +604,14 @@ class Model(object):
         def proxy(*args, **kw):
             # Can't provide any retro-compatibility for this case, so we check it and raise an Exception
             # to tell the programmer to adapt his code
-            if not http.request.db or not http.request.uid or self.session._db != http.request.db \
-                or self.session._uid != http.request.uid:
+            if not request.db or not request.uid or self.session._db != request.db \
+                or self.session._uid != request.uid:
                 raise Exception("Trying to use Model with badly configured database or user.")
                 
-            mod = http.request.registry.get(self.model)
+            mod = request.registry.get(self.model)
             meth = getattr(mod, method)
-            cr = http.request.cr
-            result = meth(cr, http.request.uid, *args, **kw)
+            cr = request.cr
+            result = meth(cr, request.uid, *args, **kw)
             # reorder read
             if method == "read":
                 if isinstance(result, list) and len(result) > 0 and "id" in result[0]:
@@ -659,8 +659,8 @@ class OpenERPSession(object):
         self._uid = uid
         self._login = login
         self._password = password
-        http.request.db = db
-        http.request.uid = uid
+        request.db = db
+        request.uid = uid
 
         if uid: self.get_context()
         return uid
@@ -685,7 +685,7 @@ class OpenERPSession(object):
         :returns: the new context
         """
         assert self._uid, "The user needs to be logged-in to initialize his context"
-        self.context = http.request.registry.get('res.users').context_get(http.request.cr, http.request.uid) or {}
+        self.context = request.registry.get('res.users').context_get(request.cr, request.uid) or {}
         self.context['uid'] = self._uid
         self._fix_lang(self.context)
         return self.context
@@ -1031,7 +1031,7 @@ class Root(object):
                     members = inspect.getmembers(o)
                     for mk, mv in members:
                         if inspect.ismethod(mv) and getattr(mv, 'exposed', False) and \
-                                nodb_only == (getattr(mv, 'auth', None) == "nodb"):
+                                nodb_only == (getattr(mv, "user", None) == "none"):
                             function = (o.get_wrapped_method(mk), mv)
                             for url in mv.routes:
                                 if getattr(mv, "combine", False):
@@ -1042,7 +1042,7 @@ class Root(object):
 
         modules_set = set(controllers_per_module.keys())
         modules_set -= set("web")
-        # building all nodb methods
+        # building all none methods
         gen(["web"] + sorted(modules_set), True)
         if not db:
             return routing_map
@@ -1088,7 +1088,7 @@ class Root(object):
             return func(*args, **kwargs)
 
         request.func = nfunc
-        request.auth_method = getattr(original, "auth", "auth")
+        request.auth_method = getattr(original, "auth", "user")
         request.func_request_type = original.exposed
 
 def wsgi_postload():

From 95f94912523f427dd5039aa791d220f01b2545db Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 21 Jun 2013 14:31:49 +0200
Subject: [PATCH 82/94] Rewrite db_monodb

bzr revid: nicolas.vanhoren@openerp.com-20130621123149-ukxjzz9jyckf9a4r
---
 addons/web/controllers/main.py | 35 +++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 51abe2d8a01..3c26494f499 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -96,13 +96,32 @@ def db_list():
     return dbs
 
 def db_monodb_redirect():
-    db = False
+    db = db_monodb()
+
+    if request.params.get('db'):
+        return (db, False)
+
+    try:
+        dbs = db_list()
+    except Exception:
+        # ignore access denied
+        dbs = []
+
+    # redirect to the chosen db if multiple are available
     redirect = False
+    if db and len(dbs) > 1:
+        query = dict(urlparse.parse_qsl(request.httprequest.query_string, keep_blank_values=True))
+        query.update({ 'db': db })
+        redirect = request.httprequest.path + '?' + urllib.urlencode(query)
+    return (db, redirect)
+
+def db_monodb():
+    db = False
 
     # 1 try the db in the url
     db_url = request.params.get('db')
     if db_url:
-        return (db_url, False)
+        return db_url
 
     try:
         dbs = db_list()
@@ -118,17 +137,7 @@ def db_monodb_redirect():
     # 3 use the first db
     if dbs and not db:
         db = dbs[0]
-
-    # redirect to the chosen db if multiple are available
-    if db and len(dbs) > 1:
-        query = dict(urlparse.parse_qsl(request.httprequest.query_string, keep_blank_values=True))
-        query.update({ 'db': db })
-        redirect = request.httprequest.path + '?' + urllib.urlencode(query)
-    return (db, redirect)
-
-def db_monodb():
-    # if only one db exists, return it else return False
-    return db_monodb_redirect()[0]
+    return db
 
 def redirect_with_hash(url, code=303):
     if request.httprequest.user_agent.browser == 'msie':

From 93979c30b838792aed134c24850c4f882db12f05 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 21 Jun 2013 14:34:14 +0200
Subject: [PATCH 83/94] variable rename

bzr revid: nicolas.vanhoren@openerp.com-20130621123414-3hkklobsbf86glx6
---
 addons/web/http.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 3e17f27774f..b0177aa35d8 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -787,20 +787,20 @@ class OpenERPSession(object):
 # Session context manager
 #----------------------------------------------------------
 @contextlib.contextmanager
-def session_context(request, session_store, session_lock, sid):
+def session_context(httprequest, session_store, session_lock, sid):
     with session_lock:
         if sid:
-            request.session = session_store.get(sid)
+            httprequest.session = session_store.get(sid)
         else:
-            request.session = session_store.new()
+            httprequest.session = session_store.new()
     try:
-        yield request.session
+        yield httprequest.session
     finally:
         # Remove all OpenERPSession instances with no uid, they're generated
         # either by login process or by HTTP requests without an OpenERP
         # session id, and are generally noise
         removed_sessions = set()
-        for key, value in request.session.items():
+        for key, value in httprequest.session.items():
             if not isinstance(value, OpenERPSession):
                 continue
             if getattr(value, '_suicide', False) or (
@@ -810,7 +810,7 @@ def session_context(request, session_store, session_lock, sid):
                     and value._creation_time + (60*5) < time.time()):
                 _logger.debug('remove session %s', key)
                 removed_sessions.add(key)
-                del request.session[key]
+                del httprequest.session[key]
 
         with session_lock:
             if sid:
@@ -827,7 +827,7 @@ def session_context(request, session_store, session_lock, sid):
                 # other to get the right result, if we want to merge the
                 # ``context`` dict we'll need something smarter
                 in_store = session_store.get(sid)
-                for k, v in request.session.iteritems():
+                for k, v in httprequest.session.iteritems():
                     stored = in_store.get(k)
                     if stored and isinstance(v, OpenERPSession):
                         if hasattr(v, 'contexts_store'):
@@ -841,10 +841,10 @@ def session_context(request, session_store, session_lock, sid):
 
                 # add missing keys
                 for k, v in in_store.iteritems():
-                    if k not in request.session and k not in removed_sessions:
-                        request.session[k] = v
+                    if k not in httprequest.session and k not in removed_sessions:
+                        httprequest.session[k] = v
 
-            session_store.save(request.session)
+            session_store.save(httprequest.session)
 
 def session_gc(session_store):
     if random.random() < 0.001:

From 52d1b26b2fe8942faa7289a357e777e0c0a3e342 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 21 Jun 2013 14:41:43 +0200
Subject: [PATCH 84/94] Put db_monodb() method in http.py

bzr revid: nicolas.vanhoren@openerp.com-20130621124143-pe5hgwj81j2degg6
---
 addons/web/controllers/main.py | 33 ++--------------------------
 addons/web/http.py             | 40 +++++++++++++++++++++++++++++++---
 2 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 3c26494f499..09032513b8d 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -86,14 +86,7 @@ def rjsmin(script):
     ).strip()
     return result
 
-def db_list():
-    proxy = request.session.proxy("db")
-    dbs = proxy.list()
-    h = request.httprequest.environ['HTTP_HOST'].split(':')[0]
-    d = h.split('.')[0]
-    r = openerp.tools.config['dbfilter'].replace('%h', h).replace('%d', d)
-    dbs = [i for i in dbs if re.match(r, i)]
-    return dbs
+db_list = http.db_list
 
 def db_monodb_redirect():
     db = db_monodb()
@@ -115,29 +108,7 @@ def db_monodb_redirect():
         redirect = request.httprequest.path + '?' + urllib.urlencode(query)
     return (db, redirect)
 
-def db_monodb():
-    db = False
-
-    # 1 try the db in the url
-    db_url = request.params.get('db')
-    if db_url:
-        return db_url
-
-    try:
-        dbs = db_list()
-    except Exception:
-        # ignore access denied
-        dbs = []
-
-    # 2 use the database from the cookie if it's listable and still listed
-    cookie_db = request.httprequest.cookies.get('last_used_database')
-    if cookie_db in dbs:
-        db = cookie_db
-
-    # 3 use the first db
-    if dbs and not db:
-        db = dbs[0]
-    return db
+db_monodb = http.db_monodb
 
 def redirect_with_hash(url, code=303):
     if request.httprequest.user_agent.browser == 'msie':
diff --git a/addons/web/http.py b/addons/web/http.py
index b0177aa35d8..4566d45eed4 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -20,6 +20,7 @@ import traceback
 import urlparse
 import uuid
 import errno
+import re
 
 import babel.core
 import simplejson
@@ -121,7 +122,7 @@ class WebRequest(object):
             self.httpsession[self.session_id] = self.session
 
         with set_request(self):
-            self.db = (self.session._db or openerp.addons.web.controllers.main.db_monodb()).lower()
+            self.db = self.session._db or db_monodb()
 
         # TODO: remove this
         # set db/uid trackers - they're cleaned up at the WSGI
@@ -153,7 +154,7 @@ class WebRequest(object):
             self.db = None
             self.uid = None
         elif self.auth_method == "db":
-            self.db = (self.session._db or openerp.addons.web.controllers.main.db_monodb()).lower()
+            self.db = self.session._db or db_monodb()
             if not self.db:
                 raise SessionExpiredException("No valid database for request %s" % self.httprequest)
             self.uid = None
@@ -1031,7 +1032,7 @@ class Root(object):
                     members = inspect.getmembers(o)
                     for mk, mv in members:
                         if inspect.ismethod(mv) and getattr(mv, 'exposed', False) and \
-                                nodb_only == (getattr(mv, "user", None) == "none"):
+                                nodb_only == (getattr(mv, "auth", None) == "none"):
                             function = (o.get_wrapped_method(mk), mv)
                             for url in mv.routes:
                                 if getattr(mv, "combine", False):
@@ -1091,6 +1092,39 @@ class Root(object):
         request.auth_method = getattr(original, "auth", "user")
         request.func_request_type = original.exposed
 
+def db_list():
+    proxy = request.session.proxy("db")
+    dbs = proxy.list()
+    h = request.httprequest.environ['HTTP_HOST'].split(':')[0]
+    d = h.split('.')[0]
+    r = openerp.tools.config['dbfilter'].replace('%h', h).replace('%d', d)
+    dbs = [i for i in dbs if re.match(r, i)]
+    return dbs
+
+def db_monodb():
+    db = None
+
+    # 1 try the db in the url
+    db_url = request.params.get('db')
+    if db_url:
+        return db_url
+
+    try:
+        dbs = db_list()
+    except Exception:
+        # ignore access denied
+        dbs = []
+
+    # 2 use the database from the cookie if it's listable and still listed
+    cookie_db = request.httprequest.cookies.get('last_used_database')
+    if cookie_db in dbs:
+        db = cookie_db
+
+    # 3 use the first db
+    if dbs and not db:
+        db = dbs[0]
+    return db.lower() if db else db
+
 def wsgi_postload():
     openerp.wsgi.register_wsgi_handler(Root())
 

From a574ce71bf5a479f7ce7ebb825dc4338768681ca Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 21 Jun 2013 14:45:34 +0200
Subject: [PATCH 85/94] Small refactoring

bzr revid: nicolas.vanhoren@openerp.com-20130621124534-bvsjihld3j9vqpkw
---
 addons/auth_signup/controllers/main.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index e1e1fa5851a..8c61af1f03c 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -30,7 +30,7 @@ _logger = logging.getLogger(__name__)
 
 class Controller(http.Controller):
 
-    @http.route('/auth_signup/get_config', type='json', authentication="nodb")
+    @http.route('/auth_signup/get_config', type='json', auth="none")
     def get_config(self, dbname):
         """ retrieve the module config (which features are enabled) for the login page """
         registry = RegistryManager.get(dbname)
@@ -42,7 +42,7 @@ class Controller(http.Controller):
             }
         return config
 
-    @http.route('/auth_signup/retrieve', type='json', authentication="auth")
+    @http.route('/auth_signup/retrieve', type='json', auth="user")
     def retrieve(self, dbname, token):
         """ retrieve the user info (name, login or email) corresponding to a signup token """
         registry = RegistryManager.get(dbname)
@@ -51,7 +51,7 @@ class Controller(http.Controller):
             user_info = res_partner.signup_retrieve_info(cr, openerp.SUPERUSER_ID, token)
         return user_info
 
-    @http.route('/auth_signup/signup', type='json', authentication="auth")
+    @http.route('/auth_signup/signup', type='json', auth="user")
     def signup(self, dbname, token, **values):
         """ sign up a user (new or existing)"""
         try:
@@ -66,7 +66,7 @@ class Controller(http.Controller):
             res_users = registry.get('res.users')
             res_users.signup(cr, openerp.SUPERUSER_ID, values, token)
 
-    @http.route('/auth_signup/reset_password', type='json', authentication="auth")
+    @http.route('/auth_signup/reset_password', type='json', auth="user")
     def reset_password(self, dbname, login):
         """ retrieve user, and perform reset password """
         registry = RegistryManager.get(dbname)

From 355d8645260255cb976249889c82d16aa6ad29a2 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 21 Jun 2013 15:03:59 +0200
Subject: [PATCH 86/94] im: refactored due to changes in web framework

bzr revid: nicolas.vanhoren@openerp.com-20130621130359-6267v1w0hney9dtt
---
 addons/im/im.py | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/addons/im/im.py b/addons/im/im.py
index cee1705ec35..f6312629d92 100644
--- a/addons/im/im.py
+++ b/addons/im/im.py
@@ -22,6 +22,8 @@
 import openerp
 import openerp.tools.config
 import openerp.modules.registry
+import openerp.addons.web.http as http
+from openerp.addons.web.http import request
 from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
 import datetime
 from openerp.osv import osv, fields
@@ -90,36 +92,42 @@ POLL_TIMER = 30
 DISCONNECTION_TIMER = POLL_TIMER + 5
 WATCHER_ERROR_DELAY = 10
 
-class LongPollingController(openerp.addons.web.http.Controller):
-    _cp_path = '/longpolling/im'
+class LongPollingController(http.Controller):
 
-    @openerp.addons.web.http.jsonrequest
-    def poll(self, req, last=None, users_watch=None, db=None, uid=None, password=None, uuid=None):
+    @http.route('/longpolling/im/poll', type="json", auth="none")
+    def poll(self, last=None, users_watch=None, db=None, uid=None, password=None, uuid=None):
         assert_uuid(uuid)
         if not openerp.evented:
             raise Exception("Not usable in a server not running gevent")
         from openerp.addons.im.watcher import ImWatcher
         if db is not None:
-            req.session._db = db
-            req.session._uid = uid
-            req.session._password = password
-        req.session.model('im.user').im_connect(uuid=uuid, context=req.context)
-        my_id = req.session.model('im.user').get_by_user_id(uuid or req.session._uid, req.context)["id"]
+            request.session._db = db
+            request.session._uid = uid
+            request.session._password = password
+            request.session.check_security()
+        uid = request.session._uid
+        password = request.session._password
+        registry = openerp.modules.registry.RegistryManager.get(request.session._db)
+
+        with registry.cursor() as cr:
+            registry.get('im.user').im_connect(cr, uid, uuid=uuid, context=request.context)
+            my_id = registry.get('im.user').get_by_user_id(cr, uid, uuid or request.session._uid, request.context)["id"]
         num = 0
         while True:
-            res = req.session.model('im.message').get_messages(last, users_watch, uuid=uuid, context=req.context)
+            with registry.cursor() as cr:
+                res = registry.get('im.message').get_messages(cr, uid, last, users_watch, uuid=uuid, context=request.context)
             if num >= 1 or len(res["res"]) > 0:
                 return res
             last = res["last"]
             num += 1
             ImWatcher.get_watcher(res["dbname"]).stop(my_id, users_watch or [], POLL_TIMER)
 
-    @openerp.addons.web.http.jsonrequest
-    def activated(self, req):
+    @http.route('/longpolling/im/activated', type="json", auth="none")
+    def activated(self):
         return not not openerp.evented
 
-    @openerp.addons.web.http.jsonrequest
-    def gen_uuid(self, req):
+    @http.route('/longpolling/im/gen_uuid', type="json", auth="none")
+    def gen_uuid(self):
         import uuid
         return "%s" % uuid.uuid1()
 

From 6a82e64e4d119f3aecaa21bc39b70e46723f0f45 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 21 Jun 2013 15:23:39 +0200
Subject: [PATCH 87/94] small improvement, useful in some cases

bzr revid: nicolas.vanhoren@openerp.com-20130621132339-ohk9wiufk1l9z61v
---
 addons/web/http.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 4566d45eed4..c5f542d8f78 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -34,6 +34,7 @@ import werkzeug.routing as routing
 import urllib2
 
 import openerp
+import openerp.service.security as security
 
 import inspect
 import functools
@@ -650,12 +651,17 @@ class OpenERPSession(object):
         self.context = {}
         self.jsonp_requests = {}     # FIXME use a LRU
 
-    def authenticate(self, db, login, password, env=None):
+    def authenticate(self, db, login=None, password=None, env=None, uid=None):
         """
         Authenticate the current user with the given db, login and password. If successful, store
         the authentication parameters in the current session and request.
+
+        :param uid: If not None, that user id will be used instead the login to authenticate the user.
         """
-        uid = openerp.netsvc.dispatch_rpc('common', 'authenticate', [db, login, password, env])
+        if uid is None:
+            uid = openerp.netsvc.dispatch_rpc('common', 'authenticate', [db, login, password, env])
+        else:
+            security.check(db, uid, password)
         self._db = db
         self._uid = uid
         self._login = login
@@ -674,7 +680,6 @@ class OpenERPSession(object):
         """
         if not self._db or not self._uid:
             raise SessionExpiredException("Session expired")
-        import openerp.service.security as security
         security.check(self._db, self._uid, self._password)
 
     def get_context(self):

From 8cc30e00e6daf68d2978dd5cd38e5198ae90155a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 21 Jun 2013 15:24:02 +0200
Subject: [PATCH 88/94] Rewrite the way the im login authenticate

bzr revid: nicolas.vanhoren@openerp.com-20130621132402-peww92wss5vmjcp9
---
 addons/im/im.py | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/addons/im/im.py b/addons/im/im.py
index f6312629d92..4a867789cbc 100644
--- a/addons/im/im.py
+++ b/addons/im/im.py
@@ -101,21 +101,17 @@ class LongPollingController(http.Controller):
             raise Exception("Not usable in a server not running gevent")
         from openerp.addons.im.watcher import ImWatcher
         if db is not None:
-            request.session._db = db
-            request.session._uid = uid
-            request.session._password = password
-            request.session.check_security()
-        uid = request.session._uid
-        password = request.session._password
-        registry = openerp.modules.registry.RegistryManager.get(request.session._db)
+            request.session.authenticate(db=db, uid=uid, password=password)
+        else:
+            request.session.authenticate(db=request.session._db, uid=request.session._uid, password=request.session._password)
 
-        with registry.cursor() as cr:
-            registry.get('im.user').im_connect(cr, uid, uuid=uuid, context=request.context)
-            my_id = registry.get('im.user').get_by_user_id(cr, uid, uuid or request.session._uid, request.context)["id"]
+        with request.registry.cursor() as cr:
+            request.registry.get('im.user').im_connect(cr, request.uid, uuid=uuid, context=request.context)
+            my_id = request.registry.get('im.user').get_by_user_id(cr, request.uid, uuid or request.session._uid, request.context)["id"]
         num = 0
         while True:
-            with registry.cursor() as cr:
-                res = registry.get('im.message').get_messages(cr, uid, last, users_watch, uuid=uuid, context=request.context)
+            with request.registry.cursor() as cr:
+                res = request.registry.get('im.message').get_messages(cr, request.uid, last, users_watch, uuid=uuid, context=request.context)
             if num >= 1 or len(res["res"]) > 0:
                 return res
             last = res["last"]

From da38583b821bef77a74f299f2e05352231caddc2 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Fri, 21 Jun 2013 15:24:11 +0200
Subject: [PATCH 89/94] [IMP] oe initialize: add a file lock to protect
 concurrent access to the template db when creating a new db (useful when
 multiple oe initialize are performed at the same time).

bzr revid: vmt@openerp.com-20130621132411-r6trrt5kd8c4fbca
---
 openerpcommand/initialize.py | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/openerpcommand/initialize.py b/openerpcommand/initialize.py
index 9822dd5f5b2..6261312de7e 100644
--- a/openerpcommand/initialize.py
+++ b/openerpcommand/initialize.py
@@ -1,8 +1,11 @@
 """
 Install OpenERP on a new (by default) database.
 """
+import contextlib
+import errno
 import os
 import sys
+import time
 
 import common
 
@@ -11,7 +14,8 @@ def install_openerp(database_name, create_database_flag, module_names, install_d
     config = openerp.tools.config
 
     if create_database_flag:
-        create_database(database_name)
+        with lock_file('/tmp/global_openerp_create_database.lock'):
+            create_database(database_name)
 
     config['init'] = dict.fromkeys(module_names, 1)
 
@@ -23,6 +27,29 @@ def install_openerp(database_name, create_database_flag, module_names, install_d
 
     return registry
 
+# From http://code.activestate.com/recipes/576572/
+@contextlib.contextmanager
+def lock_file(path, wait_delay=.1, max_try=600):
+    attempt = 0
+    while True:
+        attempt += 1
+        if attempt > max_try:
+            raise IOError("Could not lock file %s." % path)
+        try:
+            fd = os.open(path, os.O_CREAT | os.O_EXCL | os.O_RDWR)
+        except OSError, e:
+            if e.errno != errno.EEXIST:
+                raise
+            time.sleep(wait_delay)
+            continue
+        else:
+            break
+    try:
+        yield fd
+    finally:
+        os.close(fd)
+        os.unlink(path)
+
 # TODO turn template1 in a parameter
 # This should be exposed from openerp (currently in
 # openerp/service/web_services.py).

From dcf20f9871183b1c807d9872a1ce5002f54c6d79 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 21 Jun 2013 15:33:10 +0200
Subject: [PATCH 90/94] Refactored livechat

bzr revid: nicolas.vanhoren@openerp.com-20130621133310-a68iiqy9wpu40iws
---
 addons/im_livechat/im_livechat.py | 44 +++++++++++++------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/addons/im_livechat/im_livechat.py b/addons/im_livechat/im_livechat.py
index 1ffb422fe6a..adceebc7cba 100644
--- a/addons/im_livechat/im_livechat.py
+++ b/addons/im_livechat/im_livechat.py
@@ -26,6 +26,8 @@ import random
 import jinja2
 from openerp.osv import osv, fields
 from openerp import tools
+import openerp.addons.web.http as http
+from openerp.addons.web.http import request
 
 env = jinja2.Environment(
     loader=jinja2.PackageLoader('openerp.addons.im_livechat', "."),
@@ -33,48 +35,38 @@ env = jinja2.Environment(
 )
 env.filters["json"] = json.dumps
 
-class LiveChatController(openerp.addons.web.http.Controller):
-    _cp_path = '/im_livechat'
+class LiveChatController(http.Controller):
 
-    @openerp.addons.web.http.httprequest
-    def loader(self, req, **kwargs):
+    @http.route('/im_livechat/loader')
+    def loader(self, **kwargs):
         p = json.loads(kwargs["p"])
         db = p["db"]
         channel = p["channel"]
         user_name = p.get("user_name", None)
-        req.session._db = db
-        req.session._uid = None
-        req.session._login = "anonymous"
-        req.session._password = "anonymous"
-        info = req.session.model('im_livechat.channel').get_info_for_chat_src(channel)
+        request.session.authenticate(db=db, login="anonymous", password="anonymous")
+        info = request.session.model('im_livechat.channel').get_info_for_chat_src(channel)
         info["db"] = db
         info["channel"] = channel
         info["userName"] = user_name
-        return req.make_response(env.get_template("loader.js").render(info),
+        return request.make_response(env.get_template("loader.js").render(info),
              headers=[('Content-Type', "text/javascript")])
 
-    @openerp.addons.web.http.httprequest
-    def web_page(self, req, **kwargs):
+    @http.route('/im_livechat/web_page')
+    def web_page(self, **kwargs):
         p = json.loads(kwargs["p"])
         db = p["db"]
         channel = p["channel"]
-        req.session._db = db
-        req.session._uid = None
-        req.session._login = "anonymous"
-        req.session._password = "anonymous"
-        script = req.session.model('im_livechat.channel').read(channel, ["script"])["script"]
-        info = req.session.model('im_livechat.channel').get_info_for_chat_src(channel)
+        request.session.authenticate(db=db, login="anonymous", password="anonymous")
+        script = request.session.model('im_livechat.channel').read(channel, ["script"])["script"]
+        info = request.session.model('im_livechat.channel').get_info_for_chat_src(channel)
         info["script"] = script
-        return req.make_response(env.get_template("web_page.html").render(info),
+        return request.make_response(env.get_template("web_page.html").render(info),
              headers=[('Content-Type', "text/html")])
 
-    @openerp.addons.web.http.jsonrequest
-    def available(self, req, db, channel):
-        req.session._db = db
-        req.session._uid = None
-        req.session._login = "anonymous"
-        req.session._password = "anonymous"
-        return req.session.model('im_livechat.channel').get_available_user(channel) > 0
+    @http.route('/im_livechat/available', type='json')
+    def available(self, db, channel):
+        request.session.authenticate(db=db, login="anonymous", password="anonymous")
+        return request.session.model('im_livechat.channel').get_available_user(channel) > 0
 
 class im_livechat_channel(osv.osv):
     _name = 'im_livechat.channel'

From 770751c7d7570907743e0efd0ba256cd5deea9c1 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 21 Jun 2013 16:36:48 +0200
Subject: [PATCH 91/94] removed some useless code

bzr revid: nicolas.vanhoren@openerp.com-20130621143648-fh7vnyt3o6a7swqj
---
 addons/web/controllers/main.py | 1 -
 addons/web/http.py             | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index f30c57a9617..7c845dd141c 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -35,7 +35,6 @@ from openerp.tools.translate import _
 from openerp.tools import config
 
 from .. import http
-http = http
 
 from openerp.addons.web.http import request
 
diff --git a/addons/web/http.py b/addons/web/http.py
index 249189a30de..f9a7e251453 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -1075,7 +1075,7 @@ class Root(object):
         if not router:
             router = self._build_router(db)
             with self.db_routers_lock:
-                router = self.db_routers[db] = router
+                self.db_routers[db] = router
         return router
 
     def find_handler(self):

From c433395b4ff2888d2fc11dce09704be7fce79efa Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 21 Jun 2013 16:54:55 +0200
Subject: [PATCH 92/94] Put json-rpc controller in http.py

bzr revid: nicolas.vanhoren@openerp.com-20130621145455-n933uz1dcdmsv9t7
---
 addons/web/controllers/main.py | 5 -----
 addons/web/http.py             | 8 ++++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 7c845dd141c..d82f4a85775 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -569,11 +569,6 @@ class Home(http.Controller):
     def login(self, db, login, key):
         return login_and_redirect(db, login, key)
 
-    @http.route('/jsonrpc', type='json', auth="none")
-    def jsonrpc(self, service, method, args):
-        """ Method used by client APIs to contact OpenERP. """
-        return openerp.netsvc.dispatch_rpc(service, method, args)
-
 class WebClient(http.Controller):
 
     @http.route('/web/webclient/csslist', type='json', auth="none")
diff --git a/addons/web/http.py b/addons/web/http.py
index f9a7e251453..7105b4a74c1 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -1134,6 +1134,14 @@ def db_monodb():
         db = dbs[0]
     return db.lower() if db else db
 
+
+class JsonRpcController(Controller):
+
+    @route('/jsonrpc', type='json', auth="none")
+    def jsonrpc(self, service, method, args):
+        """ Method used by client APIs to contact OpenERP. """
+        return openerp.netsvc.dispatch_rpc(service, method, args)
+
 def wsgi_postload():
     openerp.wsgi.register_wsgi_handler(Root())
 

From 31d05360b22860041b7341643bcbc7c4b9c6bbd4 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 19 Jun 2013 11:13:32 +0200
Subject: [PATCH 93/94] [REF] fields: removed deprecated view_load attribute
 and removed useless first argument in property fields definition

bzr revid: qdp-launchpad@openerp.com-20130619091332-29pisdnyfemn1u3d
---
 doc/03_module_dev_02.rst               |  1 -
 openerp/addons/base/base.sql           |  1 -
 openerp/addons/base/ir/ir_model.py     |  3 ---
 openerp/addons/base/res/ir_property.py |  2 +-
 openerp/osv/fields.py                  | 11 ++++++-----
 openerp/osv/orm.py                     | 11 +++++------
 6 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/doc/03_module_dev_02.rst b/doc/03_module_dev_02.rst
index 9c00df6223e..223c82d3f1c 100644
--- a/doc/03_module_dev_02.rst
+++ b/doc/03_module_dev_02.rst
@@ -843,7 +843,6 @@ A property is a special field: fields.property.
                                 relation='product.pricelist',
                                 string="Sale Pricelist",
                         		method=True,
-                        		view_load=True,
                         		group_name="Pricelists Properties"),
             }
 
diff --git a/openerp/addons/base/base.sql b/openerp/addons/base/base.sql
index b1ddb2eec70..e91e4516b1a 100644
--- a/openerp/addons/base/base.sql
+++ b/openerp/addons/base/base.sql
@@ -42,7 +42,6 @@ CREATE TABLE ir_model_fields (
   field_description varchar(256),
   ttype varchar(64),
   state varchar(64) default 'base',
-  view_load boolean,
   relate boolean default False,
   relation_field varchar(128),
   translate boolean default False,
diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index 165fd8a4be9..7eb4f5ecd94 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -245,7 +245,6 @@ class ir_model_fields(osv.osv):
             "specified as a Python expression defining a list of triplets. "
             "For example: [('color','=','red')]"),
         'groups': fields.many2many('res.groups', 'ir_model_fields_group_rel', 'field_id', 'group_id', 'Groups'),
-        'view_load': fields.boolean('View Auto-Load'),
         'selectable': fields.boolean('Selectable'),
         'modules': fields.function(_in_modules, type='char', size=128, string='In Modules', help='List of modules in which the field is defined'),
         'serialization_field_id': fields.many2one('ir.model.fields', 'Serialization Field', domain = "[('ttype','=','serialized')]",
@@ -256,7 +255,6 @@ class ir_model_fields(osv.osv):
     }
     _rec_name='field_description'
     _defaults = {
-        'view_load': 0,
         'selection': "",
         'domain': "[]",
         'name': 'x_',
@@ -386,7 +384,6 @@ class ir_model_fields(osv.osv):
             ('size', 'size', int),
             ('on_delete', 'ondelete', str),
             ('translate', 'translate', bool),
-            ('view_load', 'view_load', bool),
             ('selectable', 'selectable', bool),
             ('select_level', 'select', int),
             ('selection', 'selection', eval),
diff --git a/openerp/addons/base/res/ir_property.py b/openerp/addons/base/res/ir_property.py
index 5ec4f98c3b8..f4e53ba3293 100644
--- a/openerp/addons/base/res/ir_property.py
+++ b/openerp/addons/base/res/ir_property.py
@@ -35,7 +35,7 @@ class ir_property(osv.osv):
     def _models_field_get(self, cr, uid, field_key, field_value, context=None):
         get = attrgetter(field_key, field_value)
         obj = self.pool.get('ir.model.fields')
-        ids = obj.search(cr, uid, [('view_load','=',1)], context=context)
+        ids = obj.search(cr, uid, [], context=context)
         res = set()
         for o in obj.browse(cr, uid, ids, context=context):
             res.add(get(o))
diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index f38d1efa0cc..0ff78c69204 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -109,7 +109,6 @@ class _column(object):
         self._context = context
         self.write = False
         self.read = False
-        self.view_load = 0
         self.select = select
         self.manual = manual
         self.selectable = True
@@ -1477,11 +1476,13 @@ class property(function):
             self.field_id[cr.dbname] = res and res[0]
         return self.field_id[cr.dbname]
 
-    def __init__(self, obj_prop, **args):
-        # TODO remove obj_prop parameter (use many2one type)
+
+    def __init__(self, **args):
         self.field_id = {}
-        function.__init__(self, self._fnct_read, False, self._fnct_write,
-                          obj_prop, multi='properties', **args)
+        if 'view_load' in args:
+            _logger.warning("view_load attribute is deprecated on ir.fields. Args: %r", args)
+        obj = 'relation' in args and args['relation'] or ''
+        function.__init__(self, self._fnct_read, False, self._fnct_write, obj=obj, multi='properties', **args)
 
     def restart(self):
         self.field_id = {}
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 0dad128dfad..eb5f637622b 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -773,7 +773,6 @@ class BaseModel(object):
                 'field_description': f.string,
                 'ttype': f._type,
                 'relation': f._obj or '',
-                'view_load': (f.view_load and 1) or 0,
                 'select_level': tools.ustr(f.select or 0),
                 'readonly': (f.readonly and 1) or 0,
                 'required': (f.required and 1) or 0,
@@ -803,12 +802,12 @@ class BaseModel(object):
                 vals['id'] = id
                 cr.execute("""INSERT INTO ir_model_fields (
                     id, model_id, model, name, field_description, ttype,
-                    relation,view_load,state,select_level,relation_field, translate, serialization_field_id
+                    relation,state,select_level,relation_field, translate, serialization_field_id
                 ) VALUES (
-                    %s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s
+                    %s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s
                 )""", (
                     id, vals['model_id'], vals['model'], vals['name'], vals['field_description'], vals['ttype'],
-                     vals['relation'], bool(vals['view_load']), 'base',
+                     vals['relation'], 'base',
                     vals['select_level'], vals['relation_field'], bool(vals['translate']), vals['serialization_field_id']
                 ))
                 if 'module' in context:
@@ -826,11 +825,11 @@ class BaseModel(object):
                         cr.commit()
                         cr.execute("""UPDATE ir_model_fields SET
                             model_id=%s, field_description=%s, ttype=%s, relation=%s,
-                            view_load=%s, select_level=%s, readonly=%s ,required=%s, selectable=%s, relation_field=%s, translate=%s, serialization_field_id=%s
+                            select_level=%s, readonly=%s ,required=%s, selectable=%s, relation_field=%s, translate=%s, serialization_field_id=%s
                         WHERE
                             model=%s AND name=%s""", (
                                 vals['model_id'], vals['field_description'], vals['ttype'],
-                                vals['relation'], bool(vals['view_load']),
+                                vals['relation'],
                                 vals['select_level'], bool(vals['readonly']), bool(vals['required']), bool(vals['selectable']), vals['relation_field'], bool(vals['translate']), vals['serialization_field_id'], vals['model'], vals['name']
                             ))
                         break

From de8272eb5fa8106f250d6fb655c75961ff020825 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 24 Jun 2013 04:43:27 +0000
Subject: [PATCH 94/94] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130622053637-2na4t63xol7god9l
bzr revid: launchpad_translations_on_behalf_of_openerp-20130623051400-l1l4wdl3b4cl9mdf
bzr revid: launchpad_translations_on_behalf_of_openerp-20130624044327-367rvnm4zfnn3ovd
---
 addons/crm/i18n/hu.po                   |  35 +++---
 addons/hr_holidays/i18n/pl.po           |  46 ++++----
 addons/knowledge/i18n/th.po             | 118 +++++++++++++++++++
 addons/l10n_be_hr_payroll/i18n/zh_CN.po | 148 ++++++++++++++++++++++++
 addons/portal_anonymous/i18n/en_AU.po   |  25 ++++
 addons/stock_location/i18n/th.po        |   2 +-
 6 files changed, 334 insertions(+), 40 deletions(-)
 create mode 100644 addons/knowledge/i18n/th.po
 create mode 100644 addons/l10n_be_hr_payroll/i18n/zh_CN.po
 create mode 100644 addons/portal_anonymous/i18n/en_AU.po

diff --git a/addons/crm/i18n/hu.po b/addons/crm/i18n/hu.po
index 98313efb4f3..6673d2da235 100644
--- a/addons/crm/i18n/hu.po
+++ b/addons/crm/i18n/hu.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-04-13 08:42+0000\n"
+"PO-Revision-Date: 2013-06-21 07:11+0000\n"
 "Last-Translator: krnkris <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-14 05:12+0000\n"
-"X-Generator: Launchpad (build 16564)\n"
+"X-Launchpad-Export-Date: 2013-06-22 05:36+0000\n"
+"X-Generator: Launchpad (build 16677)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -31,7 +31,7 @@ msgstr ""
 "létrehozását a bejövő levelekből."
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:881
+#: code:addons/crm/crm_lead.py:898
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
@@ -192,8 +192,8 @@ msgstr ""
 "direkt HTML formátumú ahhoz hogy beilleszthető legyen a kanban nézetekbe."
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:624
-#: code:addons/crm/crm_lead.py:744
+#: code:addons/crm/crm_lead.py:640
+#: code:addons/crm/crm_lead.py:761
 #: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
@@ -304,7 +304,7 @@ msgid "Prospect Partner"
 msgstr "Leendő partner"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:982
+#: code:addons/crm/crm_lead.py:1002
 #, python-format
 msgid "No Subject"
 msgstr "Nincs tárgy"
@@ -482,7 +482,7 @@ msgid "#Opportunities"
 msgstr "Lehetőségek száma"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:624
+#: code:addons/crm/crm_lead.py:640
 #, python-format
 msgid ""
 "Please select more than one element (lead or opportunity) from the list view."
@@ -782,7 +782,7 @@ msgid "Statistics Dashboard"
 msgstr "Statisztika vezérlőpult"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:861
+#: code:addons/crm/crm_lead.py:878
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -844,7 +844,7 @@ msgid "Exclusive"
 msgstr "Kizárólagos"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:584
+#: code:addons/crm/crm_lead.py:600
 #, python-format
 msgid "From %s : %s"
 msgstr "Ettől %s : %s"
@@ -1016,7 +1016,7 @@ msgid "Next Action"
 msgstr "Következő művelet"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:763
+#: code:addons/crm/crm_lead.py:780
 #, python-format
 msgid "<b>Partner</b> set to <em>%s</em>."
 msgstr "<b>Partner</b> beállítva mint <em>%s</em>."
@@ -1109,7 +1109,7 @@ msgid "Creation Date"
 msgstr "Létrehozás dátuma"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:698
+#: code:addons/crm/crm_lead.py:715
 #, python-format
 msgid "Lead <b>converted into an Opportunity</b>"
 msgstr "Tervezet <b>lehetőséggé átalakítva lehetőséggé</b>"
@@ -1324,7 +1324,9 @@ msgid "Days to Close"
 msgstr "Lezárásig hátralévő napok"
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:1057
 #: field:crm.case.section,complete_name:0
+#, python-format
 msgid "unknown"
 msgstr "Ismeretlen"
 
@@ -1415,7 +1417,7 @@ msgid "Lead Description"
 msgstr "Érdeklődés leírása"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:565
+#: code:addons/crm/crm_lead.py:581
 #, python-format
 msgid "Merged opportunities"
 msgstr "Lehetőségek összefésülése"
@@ -1989,7 +1991,7 @@ msgid "Leads"
 msgstr "Érdeklődők"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:563
+#: code:addons/crm/crm_lead.py:579
 #, python-format
 msgid "Merged leads"
 msgstr "Össztefésült érdeklődések"
@@ -2085,7 +2087,6 @@ msgid "Global CC"
 msgstr "Globális CC /másolat/"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
@@ -2399,7 +2400,7 @@ msgstr "Érdeklődés átalakítva egy lehetőséggé"
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
-msgstr "Nem iktatott rdeklődések"
+msgstr "Nem iktatott érdeklődések"
 
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_won
@@ -3100,7 +3101,7 @@ msgid "Working Hours"
 msgstr "Munkaórák"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:968
+#: code:addons/crm/crm_lead.py:986
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
diff --git a/addons/hr_holidays/i18n/pl.po b/addons/hr_holidays/i18n/pl.po
index ebc13bc02d4..ad5730d2268 100644
--- a/addons/hr_holidays/i18n/pl.po
+++ b/addons/hr_holidays/i18n/pl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-14 12:51+0000\n"
-"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
+"PO-Revision-Date: 2013-06-22 10:54+0000\n"
+"Last-Translator: Dariusz Kubiak <d.kubiak@macopedia.pl>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:30+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-23 05:13+0000\n"
+"X-Generator: Launchpad (build 16677)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr "Oczekuje na drugą aprobatę"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:298
+#: code:addons/hr_holidays/hr_holidays.py:309
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,11 +109,13 @@ msgid ""
 "The default duration interval between the start date and the end date is 8 "
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
+"Domyślny odstęp między datą rozpoczęcia i data zakończenia jest 8 godzin. "
+"Zapraszam do dostosowania go do swoich potrzeb."
 
 #. module: hr_holidays
 #: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
 msgid "Request refused"
-msgstr ""
+msgstr "Wniosek odrzucony"
 
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
@@ -274,12 +276,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:238
 #: code:addons/hr_holidays/hr_holidays.py:249
-#: code:addons/hr_holidays/hr_holidays.py:274
-#: code:addons/hr_holidays/hr_holidays.py:298
-#: code:addons/hr_holidays/hr_holidays.py:421
-#: code:addons/hr_holidays/hr_holidays.py:471
+#: code:addons/hr_holidays/hr_holidays.py:260
+#: code:addons/hr_holidays/hr_holidays.py:285
+#: code:addons/hr_holidays/hr_holidays.py:309
+#: code:addons/hr_holidays/hr_holidays.py:432
+#: code:addons/hr_holidays/hr_holidays.py:482
 #, python-format
 msgid "Warning!"
 msgstr "Ostrzeżenie !"
@@ -317,7 +319,7 @@ msgid "Sick Leaves"
 msgstr "Zwolnienie lekarskie"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:478
+#: code:addons/hr_holidays/hr_holidays.py:489
 #, python-format
 msgid "Leave Request for %s"
 msgstr "Wniosek urlopowy dla %s"
@@ -341,7 +343,7 @@ msgstr "Pozostało dni urlopu"
 #. module: hr_holidays
 #: field:hr.holidays,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Obserwatorzy"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
@@ -388,7 +390,7 @@ msgid "Wheat"
 msgstr "Pszenny"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:476
+#: code:addons/hr_holidays/hr_holidays.py:487
 #, python-format
 msgid "Allocation for %s"
 msgstr "Przydział dla %s"
@@ -412,7 +414,7 @@ msgid "Number of Days"
 msgstr "Liczba dni"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:471
+#: code:addons/hr_holidays/hr_holidays.py:482
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -516,7 +518,7 @@ msgid "Start Date"
 msgstr "Data początkowa"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:421
+#: code:addons/hr_holidays/hr_holidays.py:432
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -678,7 +680,7 @@ msgstr "Podsumowanie"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
 msgid "Unpaid"
-msgstr "Niezapłacone"
+msgstr "Bezpłatny"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
@@ -741,7 +743,7 @@ msgstr "Różne"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_comp
 msgid "Compensatory Days"
-msgstr ""
+msgstr "Urlop wyrównawczy"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -766,7 +768,7 @@ msgid "Validated"
 msgstr "Zatwierdzony"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr "Nie możesz usunąć nieobecności, która jest w stanie %s."
@@ -830,7 +832,7 @@ msgid "To Submit"
 msgstr "Do wysłania"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:343
+#: code:addons/hr_holidays/hr_holidays.py:354
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -930,8 +932,8 @@ msgid "Messages and communication history"
 msgstr "Wiadomości i historia komunikacji"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:249
-#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:260
+#: code:addons/hr_holidays/hr_holidays.py:285
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
diff --git a/addons/knowledge/i18n/th.po b/addons/knowledge/i18n/th.po
new file mode 100644
index 00000000000..3b5327841d8
--- /dev/null
+++ b/addons/knowledge/i18n/th.po
@@ -0,0 +1,118 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-06-21 18:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai <th@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-06-22 05:36+0000\n"
+"X-Generator: Launchpad (build 16677)\n"
+
+#. module: knowledge
+#: view:knowledge.config.settings:0
+msgid "Documents"
+msgstr "เอกสาร"
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_knowledge_config_settings
+msgid "knowledge.config.settings"
+msgstr ""
+
+#. module: knowledge
+#: help:knowledge.config.settings,module_document_webdav:0
+msgid ""
+"Access your documents in OpenERP through WebDAV.\n"
+"                This installs the module document_webdav."
+msgstr ""
+
+#. module: knowledge
+#: help:knowledge.config.settings,module_document_page:0
+msgid "This installs the module document_page."
+msgstr ""
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
+#: view:knowledge.config.settings:0
+msgid "Configure Knowledge"
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.config.settings:0
+msgid "Knowledge and Documents Management"
+msgstr ""
+
+#. module: knowledge
+#: help:knowledge.config.settings,module_document:0
+msgid ""
+"This is a complete document management system, with: user authentication,\n"
+"                full document search (but pptx and docx are not supported), "
+"and a document dashboard.\n"
+"                This installs the module document."
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.config.settings,module_document_page:0
+msgid "Create static web pages"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.config.settings,module_document_ftp:0
+msgid "Share repositories (FTP)"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.config.settings,module_document:0
+msgid "Manage documents"
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.config.settings:0
+msgid "Cancel"
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.config.settings:0
+msgid "Apply"
+msgstr "ปรับใช้"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr "ตั้งค่า"
+
+#. module: knowledge
+#: help:knowledge.config.settings,module_document_ftp:0
+msgid ""
+"Access your documents in OpenERP through an FTP interface.\n"
+"                This installs the module document_ftp."
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.config.settings:0
+msgid "or"
+msgstr "หรือ"
+
+#. module: knowledge
+#: field:knowledge.config.settings,module_document_webdav:0
+msgid "Share repositories (WebDAV)"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
+msgid "Knowledge"
+msgstr "ความรู้"
diff --git a/addons/l10n_be_hr_payroll/i18n/zh_CN.po b/addons/l10n_be_hr_payroll/i18n/zh_CN.po
new file mode 100644
index 00000000000..e753e1e1bb2
--- /dev/null
+++ b/addons/l10n_be_hr_payroll/i18n/zh_CN.po
@@ -0,0 +1,148 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2013-06-23 05:44+0000\n"
+"Last-Translator: Calvin <mceiba@gmail.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-06-24 04:43+0000\n"
+"X-Generator: Launchpad (build 16677)\n"
+
+#. module: l10n_be_hr_payroll
+#: help:hr.employee,disabled_spouse_bool:0
+msgid "if recipient spouse is declared disabled by law"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: help:hr.employee,disabled_children_bool:0
+msgid "if recipient children is/are declared disabled by law"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,misc_onss_deduction:0
+msgid "Miscellaneous exempt ONSS "
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: model:ir.model,name:l10n_be_hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr "员工"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,disabled_spouse_bool:0
+msgid "Disabled Spouse"
+msgstr "残疾人配偶"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,retained_net_amount:0
+msgid "Net retained "
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,resident_bool:0
+msgid "Nonresident"
+msgstr "非常住人口"
+
+#. module: l10n_be_hr_payroll
+#: help:hr.employee,resident_bool:0
+msgid "if recipient lives in a foreign country"
+msgstr "如果接受者居住在国外"
+
+#. module: l10n_be_hr_payroll
+#: view:hr.employee:0
+msgid "if spouse has professionnel income or not"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,insurance_employee_deduction:0
+msgid "Insurance Group - by worker "
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: selection:hr.employee,spouse_fiscal_status:0
+msgid "With Income"
+msgstr "有收入"
+
+#. module: l10n_be_hr_payroll
+#: selection:hr.employee,spouse_fiscal_status:0
+msgid "Without Income"
+msgstr "无收入"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,disabled_children_number:0
+msgid "Number of disabled children"
+msgstr "残疾儿童个数"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,additional_net_amount:0
+msgid "Net supplements"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,car_company_amount:0
+msgid "Company car employer"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,misc_advantage_amount:0
+msgid "Benefits of various nature "
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,car_employee_deduction:0
+msgid "Company Car Deduction for Worker"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,disabled_children_bool:0
+msgid "Disabled Children"
+msgstr "残疾儿童"
+
+#. module: l10n_be_hr_payroll
+#: model:ir.model,name:l10n_be_hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr "合约"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,meal_voucher_amount:0
+msgid "Check Value Meal "
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,travel_reimbursement_amount:0
+msgid "Reimbursement of travel expenses"
+msgstr "差旅花费补贴"
+
+#. module: l10n_be_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! Contract start-date must be less than contract end-date."
+msgstr "错误！联系人开始日期必须小于结束日期"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,spouse_fiscal_status:0
+msgid "Tax status for spouse"
+msgstr "配偶缴税状态"
+
+#. module: l10n_be_hr_payroll
+#: view:hr.employee:0
+msgid "number of dependent children declared as disabled"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr "错误！，你不能创建循环的员工层次"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,meal_voucher_employee_deduction:0
+msgid "Check Value Meal - by worker "
+msgstr ""
diff --git a/addons/portal_anonymous/i18n/en_AU.po b/addons/portal_anonymous/i18n/en_AU.po
new file mode 100644
index 00000000000..f5b491b2574
--- /dev/null
+++ b/addons/portal_anonymous/i18n/en_AU.po
@@ -0,0 +1,25 @@
+# English (Australia) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-06-24 01:47+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (Australia) <en_AU@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-06-24 04:43+0000\n"
+"X-Generator: Launchpad (build 16677)\n"
+
+#. module: portal_anonymous
+#. openerp-web
+#: code:addons/portal_anonymous/static/src/xml/portal_anonymous.xml:8
+#, python-format
+msgid "Login"
+msgstr "Login"
diff --git a/addons/stock_location/i18n/th.po b/addons/stock_location/i18n/th.po
index b2cee6e2936..7636c8142c8 100644
--- a/addons/stock_location/i18n/th.po
+++ b/addons/stock_location/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-21 05:36+0000\n"
+"X-Launchpad-Export-Date: 2013-06-22 05:36+0000\n"
 "X-Generator: Launchpad (build 16677)\n"
 
 #. module: stock_location