[MERGE]: with trunk

bzr revid: aja@tinyerp.com-20130624070057-0l0wiwzoblb1tk61

diff --cc addons/crm/crm_lead.py
Simple merge

diff --cc addons/crm/crm_lead_data.xml
index cda92ab,9291454..0a3ff08
--- 1/addons/crm/crm_lead_data.xml
--- 2/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@@ -147,14 -161,8 +147,8 @@@
              <field name="name">Lead Created</field>
              <field name="res_model">crm.lead</field>
              <field name="default" eval="False"/>
 -            <field name="description">Opportunity created</field>
 +            <field name="description">Lead 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 --cc addons/crm/crm_lead_view.xml
index 5e6e9eb,df6a4a0..08d7b33
--- 1/addons/crm/crm_lead_view.xml
--- 2/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@@ -608,8 -617,9 +610,9 @@@
              <field name="state">code</field>
              <field name="code">
                  if context.get('active_model') == 'crm.lead' and context.get('active_ids'):
 -                    self.case_cancel(cr, uid, context['active_ids'], context=context)
 +                    self.case_mark_lost(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 --cc addons/crm_partner_assign/crm_lead_view.xml
index 6439663,5c14680..3b253b1
--- 1/addons/crm_partner_assign/crm_lead_view.xml
--- 2/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@@ -55,11 -60,7 +61,10 @@@
              <field name="arch" type="xml">
                  <filter string="Team" position="after">
                      <filter string="Assigned Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_assigned_id'}"/>
 +                    <filter string="Assigned Month"  icon="terp-go-month"
 +                            domain="[]" context="{'group_by':'date_assign'}"/>
 +
                  </filter>
- 
                  <field name="partner_id" position="after">
                      <field name="partner_assigned_id"/>
                  </field>

diff --cc addons/crm_partner_assign/res_partner_view.xml
index 8ccd4f3,874d2a9..6823c26
--- 1/addons/crm_partner_assign/res_partner_view.xml
--- 2/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@@ -33,131 -33,134 +33,130 @@@
              <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" />
 -                </field>
 +    <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">
 +                    <field name="name"/>
 +                    <field name="sequence"/>
 +                    <field name="active"/>
 +                </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"/>
              </field>
 -        </record>
 +        </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>
 +    <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>
 -        </record>
 +        </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">
 +    <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="Geo Localization">
 +                    <group>
                          <group>
 -                            <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_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">
 -                                    <p class="oe_grey">
 -                                        Higher is the value, higher is the probability for this partner to get more leads.
 -                                    </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>
 +                            <separator string="Partner Activation" colspan="2"/>
 +                            <field name="grade_id" widget="selection"/>
 +                            <field name="activation" widget="selection"/>
 +                            <field name="partner_weight"/>
                          </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>
 +                        <group>
 +                            <separator string="Partner Review" colspan="2"/>
 +                            <field name="date_review"/>
 +                            <field name="date_review_next"/>
 +                            <field name="date_partnership"/>
 +                        </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/>
 +
 +                    <field name="opportunity_assigned_ids" colspan="4" nolabel="1">
 +                         <tree string="Assigned Opportunities">
 +                             <field name="create_date"/>
 +                             <field name="name"/>
 +                             <field name="type"/>
 +                             <field name="stage_id"/>
 +                             <field name="section_id"
 +                                    invisible="context.get('invisible_section', True)"
 +                                    groups="base.group_multi_salesteams"/>
 +                             <field name="user_id" />
 +                             <button string="Convert to Opportunity"
 +                                    name="convert_opportunity"
 +                                    type="object" 
 +                                    attrs="{'invisible':[('type','=','opportunity'),('probability', '=', 100)]}" />
 +                             <button name="case_escalate" string="Escalate"
 +                                    type="object"
 +                                    icon="gtk-go-up" 
 +                                    attrs="{'invisible':[('probability', '=', 100)]}" />
 +                         </tree>
 +                    </field>
 +                </page>
 +            </xpath>
 +        </field>
 +    </record>
  
- 
      </data>
  </openerp>