pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF] crm,sale,sales_team,crm_partner_assign: templates changes

Browse Source 
* Add missing group titles
* Geolocation template was broken
* Fix wrong templates (alignement problems)
This commit is contained in:
qsm-odoo
2015-08-28 17:07:45 +02:00
parent 6a8c5070a6
commit 31ca94ce8d
5 changed files with 92 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/crm_lead_view.xml
+27 -27
View File
@@ -172,35 +172,35 @@
<field name="tag_ids" widget="many2many_tags"/>
</group>
</group>
<notebook colspan="4">
<page string="Internal Notes">
<field name="description"/>
</page>
<page name="extra" string="Extra Info">
<group>
<notebook>
<page string="Internal Notes">
<field name="description"/>
</page>
<page name="extra" string="Extra Info">
<group>
<field name="opt_out"/>
<field name="message_bounce" readonly="1" groups="base.group_no_one"/>
<group string="Email">
<field name="opt_out"/>
<field name="message_bounce" readonly="1" groups="base.group_no_one"/>
</group>
<group string="Tracking" groups="base.group_multi_company,base.group_no_one" name="categorization">
<field name="company_id"
groups="base.group_multi_company"
options="{'no_create': True}"/>
<field name="campaign_id" />
<field name="medium_id"/>
<field name="source_id"/>
<field name="referred"/>
</group>
<group string="Opportunity" name="misc">
<field name="probability" groups="base.group_no_one"/>
<field name="active"/>
</group>
<group string="Analysis" groups="base.group_no_one">
<field name="date_open"/>
<field name="date_closed"/>
</group>
</group>
<group string="Categorization" groups="base.group_multi_company,base.group_no_one" name="categorization">
<field name="company_id"
groups="base.group_multi_company"
options="{'no_create': True}"/>
<field name="campaign_id" />
<field name="medium_id"/>
<field name="source_id" />
</group>
<group name="misc">
<field name="probability" groups="base.group_no_one"/>
<field name="active"/>
<field name="referred"/>
</group>
<group>
<field name="date_open" groups="base.group_no_one"/>
<field name="date_closed" groups="base.group_no_one"/>
</group>
</group>
</page>
</page>
</notebook>
</sheet>
<div class="oe_chatter">
addons/crm/sales_team_view.xml
+7 -5
View File
@@ -87,12 +87,14 @@
<field name="inherit_id" ref="sales_team.crm_team_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[@name='options_active']" position="inside">
<div groups="crm.group_use_lead">
<field name="use_leads" on_change="onchange_use_leads_opportunities(use_leads, use_opportunities)"/>
<label for="use_leads" string="Leads"/>
<div class="o_row">
<span groups="crm.group_use_lead" class="o_row">
<field name="use_leads" on_change="onchange_use_leads_opportunities(use_leads, use_opportunities)"/>
<label for="use_leads" string="Leads"/>
</span>
<field name="use_opportunities" on_change="onchange_use_leads_opportunities(use_leads, use_opportunities)"/>
<label for="use_opportunities"/>
</div>
<field name="use_opportunities" class="oe_inline" on_change="onchange_use_leads_opportunities(use_leads, use_opportunities)"/>
<label for="use_opportunities"/>
</xpath>
<xpath expr="//page[@name='members']" position="after">
<page string="Stages" groups="base.group_no_one">
addons/crm_partner_assign/crm_lead_view.xml
+48 -66
View File
@@ -6,39 +6,30 @@
<field name="model">crm.lead</field>
<field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
<field name="arch" type="xml">
<data>
<xpath expr="//notebook/page[@name='lead']" position="after">
<page string="Assigned Partner" groups="base.group_sale_salesman">
<group name="partner_assign_group">
<group string="Partner Assignation" col="3" colspan="1">
<label for="partner_latitude" string="Geolocation" />
<div class="oe_title">
<h3>
<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>
</h3>
</div>
<button string="Automatic Assignation" name="action_assign_partner" type="object" colspan="1"
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="Send Email"
attrs="{'invisible':[('partner_assigned_id','=',False)]}"
name="%(crm_lead_forward_to_partner_act)d"
type="action"
context="{'default_composition_mode': 'forward','hide_forward_type': 1 , 'default_partner_ids': [partner_assigned_id]}"/>
</div>
</group>
</group>
</page>
</xpath>
</data>
<xpath expr="//notebook/page[@name='lead']" position="after">
<page string="Assigned Partner" groups="base.group_sale_salesman">
<group col="3">
<label for="partner_latitude" string="Geolocation"/>
<div class="o_row">
<span class="oe_grey">( </span>
<field name="partner_latitude"/>
<span class="oe_grey" attrs="{'invisible':[('partner_latitude','&lt;=',0)]}">N </span>
<span class="oe_grey" attrs="{'invisible':[('partner_latitude','&gt;=',0)]}">S </span>
<field name="partner_longitude"/>
<span class="oe_grey" attrs="{'invisible':[('partner_longitude','&lt;=',0)]}">E </span>
<span class="oe_grey" attrs="{'invisible':[('partner_longitude','&gt;=',0)]}">W </span>
<span class="oe_grey">) </span>
</div>
<button string="Automatic Assignation" name="action_assign_partner" type="object" class="btn-link"/>
<field name="partner_assigned_id" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
<button string="Send Email" type="action" class="btn-link"
attrs="{'invisible':[('partner_assigned_id','=',False)]}"
name="%(crm_lead_forward_to_partner_act)d"
context="{'default_composition_mode': 'forward','hide_forward_type': 1 , 'default_partner_ids': [partner_assigned_id]}"/>
</group>
</page>
</xpath>
</field>
</record>
@@ -76,39 +67,30 @@
<field name="model">crm.lead</field>
<field name="inherit_id" ref="crm.crm_case_form_view_leads"/>
<field name="arch" type="xml">
<data>
<xpath expr="//notebook/page[@name='extra']" position="after">
<page string="Assigned Partner" groups="base.group_sale_salesman">
<group name="partner_assign_group">
<group string="Partner Assignation" col="3">
<label for="partner_latitude" string="Geolocation" />
<div>
<h3>
<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>
</h3>
</div>
<button string="Automatic Assignation" name="action_assign_partner" type="object" colspan="1"
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="Send Email"
attrs="{'invisible':[('partner_assigned_id','=',False)]}"
name="%(crm_lead_forward_to_partner_act)d"
type="action"
context="{'default_composition_mode': 'forward','hide_forward_type': 1 , 'default_partner_ids': [partner_assigned_id]}"/>
</div>
</group>
</group>
</page>
</xpath>
</data>
<xpath expr="//notebook/page[@name='extra']" position="after">
<page string="Assigned Partner" groups="base.group_sale_salesman">
<group col="3">
<label for="partner_latitude" string="Geolocation"/>
<div class="o_row">
<span class="oe_grey">( </span>
<field name="partner_latitude"/>
<span class="oe_grey" attrs="{'invisible':[('partner_latitude','&lt;=',0)]}">N </span>
<span class="oe_grey" attrs="{'invisible':[('partner_latitude','&gt;=',0)]}">S </span>
<field name="partner_longitude"/>
<span class="oe_grey" attrs="{'invisible':[('partner_longitude','&lt;=',0)]}">E </span>
<span class="oe_grey" attrs="{'invisible':[('partner_longitude','&gt;=',0)]}">W </span>
<span class="oe_grey">) </span>
</div>
<button string="Automatic Assignation" name="action_assign_partner" type="object" class="btn-link"/>
<field name="partner_assigned_id" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
<button string="Send Email" type="action" class="btn-link"
attrs="{'invisible':[('partner_assigned_id','=',False)]}"
name="%(crm_lead_forward_to_partner_act)d"
context="{'default_composition_mode': 'forward','hide_forward_type': 1 , 'default_partner_ids': [partner_assigned_id]}"/>
</group>
</page>
</xpath>
</field>
</record>
addons/sale/sales_team_view.xml
+5 -7
View File
@@ -6,21 +6,19 @@
<field name="model">crm.team</field>
<field name="inherit_id" ref="sales_team.crm_team_view_form"/>
<field name="arch" type="xml">
<data>
<xpath expr="//div[@name='options_active']" position="inside">
<field name="use_quotations" class="oe_inline"/><label for="use_quotations"/>
<field name="use_invoices" class="oe_inline" groups="account.group_account_invoice"/>
<label for="use_invoices" groups="account.group_account_invoice"/>
<div class="o_row">
<field name="use_quotations"/><label for="use_quotations"/>
<field name="use_invoices" groups="account.group_account_invoice"/><label for="use_invoices" groups="account.group_account_invoice"/>
</div>
</xpath>
<xpath expr="//group[@name='sales_team_more_info']" position="inside">
<xpath expr="//page[@name='more_info']" position="inside">
<group string="Invoicing/Progression Ratio">
<field name="invoiced_target"/>
<field name="invoiced"/>
</group>
</xpath>
</data>
</field>
</record>
</data>
</openerp>
addons/sales_team/sales_team.xml
+5 -7
View File
@@ -57,7 +57,7 @@
<h1>
<field name="name" string="Salesteam"/>
</h1>
<div name="options_active"></div>
<div name="options_active"/>
</div>
<group>
<group name="left">
@@ -67,7 +67,7 @@
<group name="right">
</group>
</group>
<notebook colspan="4">
<notebook>
<page name="members" string="Team Members">
<field name="member_ids" widget="many2many_kanban">
<kanban quick_create="false" create="true" delete="true">
@@ -88,14 +88,12 @@
</kanban>
</field>
</page>
<page string="More Info" groups="base.group_no_one">
<page string="More Info" name="more_info" groups="base.group_no_one">
<group>
<field name="active"/>
<group string="Company" groups="base.group_multi_company">
<field name="company_id" options="{'no_create': True}"/>
</group>
</group>
<group name="sales_team_more_info">
<group string="Company" groups="base.group_multi_company">
<field name="company_id" options="{'no_create': True}"/>
</group>
</page>
</notebook>