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'}"