odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]crm_partner_assign: some view changes 

bzr revid: dle@openerp.com-20130614101041-jegs9jglt0ymehrf
This commit is contained in:
Denis Ledoux 2013-06-14 12:10:41 +02:00
parent 4fc3cc862f
commit 617d59cd41
2 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
addons/crm_partner_assign/crm_lead_view.xml
View File

@ -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>

32
addons/crm_partner_assign/res_partner_view.xml
View File

@ -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">