[MERGE] Improved opportunity form view
bzr revid: fme@openerp.com-20120425085128-4u9ye3tbi3c3cbcq
This commit is contained in:
Fabien Meghazi
@@ -53,7 +53,7 @@
|
||||
<form string="Invoice Line">
|
||||
<field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
|
||||
<field colspan="2" name="name"/>
|
||||
<label string="Quantity :" align="1.0"/>
|
||||
<label string="Quantity" for="quantity" align="1.0"/>
|
||||
<group colspan="1" col="2">
|
||||
<field name="quantity" nolabel="1"/>
|
||||
<field name="uos_id" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)" nolabel="1"/>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<field name="property_account_payable" position="after">
|
||||
<group colspan="2" col="6">
|
||||
<field name="vat" on_change="vat_change(vat)"/>
|
||||
<button name="button_check_vat" string="Check VAT" type="object" icon="gtk-execute"/>
|
||||
<button colspan="2" name="button_check_vat" string="Check VAT" type="object" icon="gtk-execute"/>
|
||||
<field name="vat_subjected" colspan="1" groups="base.group_extended" />
|
||||
</group>
|
||||
</field>
|
||||
|
||||
@@ -413,114 +413,117 @@
|
||||
</div>
|
||||
</div>
|
||||
<sheet layout="auto">
|
||||
<group colspan="4" col="7">
|
||||
<field name="name" required="1" string="Opportunity"/>
|
||||
<label string="Stage:" align="1.0"/>
|
||||
<group colspan="1" col="4">
|
||||
<field name="stage_id" nolabel="1"
|
||||
on_change="onchange_stage_id(stage_id)"
|
||||
domain="section_id and [('section_ids', '=', section_id)] or []"/>
|
||||
<button name="stage_previous"
|
||||
states="draft,open,pending" type="object"
|
||||
icon="gtk-go-back" string="" context="{'stage_type': 'opportunity'}"/>
|
||||
<button name="stage_next" states="draft,open,pending"
|
||||
type="object" icon="gtk-go-forward" string="" context="{'stage_type': 'opportunity'}"/>
|
||||
</group>
|
||||
<field name="user_id"/>
|
||||
|
||||
<group colspan="4" col="3">
|
||||
<field name="name" required="1" nolabel="1" class="oe_form_title" width="80%%"/>
|
||||
<button string="Schedule/Log Call"
|
||||
name="%(opportunity2phonecall_act)d" icon="terp-call-start"
|
||||
type="action"/>
|
||||
|
||||
<button string="Schedule Meeting" icon="gtk-redo"
|
||||
name="action_makeMeeting"
|
||||
type="object"/>
|
||||
</group>
|
||||
<group colspan="4" col="4" class="oe_form_group_label_border" style="margin-top: 20px;">
|
||||
<field name="user_id"/>
|
||||
<field name="planned_revenue"/>
|
||||
<field name="probability"/>
|
||||
|
||||
<field name="date_action"/>
|
||||
<field name="date_deadline"/>
|
||||
|
||||
<button name="action_makeMeeting" type="object"
|
||||
string="Schedule Meeting" icon="gtk-redo" />
|
||||
<newline/>
|
||||
<field name="date_action"/>
|
||||
<field name="title_action"/>
|
||||
<field name="priority" string="Priority"/>
|
||||
<newline/>
|
||||
<field name="probability"/>
|
||||
|
||||
<field name="type" invisible="1"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Opportunity">
|
||||
<group col="4" colspan="2">
|
||||
<separator colspan="4" string="Contacts"/>
|
||||
<group colspan="2">
|
||||
<field name="partner_id" select="1"
|
||||
on_change="onchange_partner_id(partner_id, email_from)" string="Customer"
|
||||
colspan="2" />
|
||||
<group colspan="2" col="3" class="oe_form_group_label_border">
|
||||
<field width="80%%" name="partner_id" select="1"
|
||||
on_change="onchange_partner_id(partner_id, email_from)" string="Customer"/>
|
||||
<button name="%(action_crm_lead2partner)d"
|
||||
icon="terp-partner" type="action"
|
||||
string="Create"
|
||||
attrs="{'invisible':[('partner_id','!=',False)]}"/>
|
||||
</group>
|
||||
|
||||
<group col="3" colspan="2">
|
||||
<field name="email_from" string="Email" />
|
||||
<button string="Mail"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail':'new', 'model': 'crm.lead'}"
|
||||
icon="terp-mail-message-new" type="action" />
|
||||
</group>
|
||||
<field name="phone"/>
|
||||
|
||||
<field name="phone" colspan="3"/>
|
||||
|
||||
<field width="80%%" name="email_from" string="Email"/>
|
||||
<button string="Mail"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail':'new', 'model': 'crm.lead'}"
|
||||
icon="terp-mail-message-new" type="action" />
|
||||
</group>
|
||||
</group>
|
||||
<group col="2" colspan="2">
|
||||
<group col="2" colspan="2" class="oe_form_group_label_border">
|
||||
<separator colspan="2" string="Categorization"/>
|
||||
<field name="section_id" colspan="1" widget="selection"/>
|
||||
<field name="categ_id" select="1"
|
||||
string="Category" widget="selection"
|
||||
domain="[('object_id.model', '=', 'crm.lead')]" />
|
||||
string="Category" widget="selection"
|
||||
domain="[('object_id.model', '=', 'crm.lead')]" />
|
||||
|
||||
<label string="Stage" for="stage_id" align="1.0"/>
|
||||
<group colspan="1" col="3">
|
||||
<field name="stage_id" nolabel="1"
|
||||
on_change="onchange_stage_id(stage_id)"
|
||||
domain="section_id and [('section_ids', '=', section_id)] or []" width="60%%"/>
|
||||
<button name="stage_previous"
|
||||
states="draft,open,pending" type="object"
|
||||
icon="gtk-go-back" string="" context="{'stage_type': 'opportunity'}"/>
|
||||
<button name="stage_next" states="draft,open,pending"
|
||||
type="object" icon="gtk-go-forward" string="" context="{'stage_type': 'opportunity'}"/>
|
||||
</group>
|
||||
|
||||
<field name="priority" string="Priority"/>
|
||||
</group>
|
||||
|
||||
<separator colspan="4" string="Details"/>
|
||||
<field name="description" nolabel="1" colspan="4"/>
|
||||
</page>
|
||||
<page string="Lead">
|
||||
<group colspan="2" col="4">
|
||||
<separator string="Contact" colspan="4" col="4"/>
|
||||
<separator string="Contact" colspan="4"/>
|
||||
<group colspan="4" col="4" class="oe_form_group_label_border">
|
||||
<field name="partner_name" string="Customer Name" colspan="4"/>
|
||||
<newline/>
|
||||
</group>
|
||||
<group colspan="2" col="2" class="oe_form_group_label_border">
|
||||
<field domain="[('domain', '=', 'contact')]" name="title" widget="selection"/>
|
||||
<field name="function" />
|
||||
<field name="street" colspan="4"/>
|
||||
<field name="street2" colspan="4"/>
|
||||
<field name="fax"/>
|
||||
<field name="street"/>
|
||||
<field name="zip"/>
|
||||
<field name="city"/>
|
||||
<field name="country_id"/>
|
||||
</group>
|
||||
<group colspan="2" col="2" class="oe_form_group_label_border">
|
||||
<field name="function" />
|
||||
<field name="mobile"/>
|
||||
<field name="street2"/>
|
||||
<field name="city"/>
|
||||
<field name="state_id"/>
|
||||
</group>
|
||||
<group colspan="2" col="2">
|
||||
<separator string="Communication" colspan="2"/>
|
||||
<field name="fax"/>
|
||||
<field name="mobile"/>
|
||||
</group>
|
||||
<group colspan="2" col="2">
|
||||
|
||||
<group colspan="2" col="2" class="oe_form_group_label_border">
|
||||
<separator string="Categorization" colspan="2"/>
|
||||
<field name="type_id" widget="selection" groups="base.group_extended"/>
|
||||
<field name="channel_id" widget="selection"/>
|
||||
</group>
|
||||
<group colspan="2" col="2">
|
||||
<group colspan="2" col="2" class="oe_form_group_label_border">
|
||||
<separator string="Mailings" colspan="2"/>
|
||||
<field name="optin" on_change="on_change_optin(optin)"/>
|
||||
<field name="optout" on_change="on_change_optout(optout)"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Extra Info" groups="base.group_extended">
|
||||
<group col="2" colspan="2">
|
||||
<group col="2" colspan="2" class="oe_form_group_label_border">
|
||||
<separator string="Misc" colspan="2"/>
|
||||
<field name="active"/>
|
||||
<field name="day_open" groups="base.group_no_one"/>
|
||||
<field name="day_close" groups="base.group_no_one"/>
|
||||
<field name="referred"/>
|
||||
</group>
|
||||
<separator colspan="4" string="References"/>
|
||||
<field name="ref"/>
|
||||
<field name="ref2"/>
|
||||
<group col="2" colspan="2" class="oe_form_group_label_border">
|
||||
<separator colspan="4" string="References"/>
|
||||
<field name="ref"/>
|
||||
<field name="ref2"/>
|
||||
</group>
|
||||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
<data>
|
||||
<xpath expr="//notebook/page[@string='Lead']" position="after">
|
||||
<page string="Assignation" groups="base.group_extended">
|
||||
<group name="partner_assign_group" col="5" colspan="4">
|
||||
<group name="partner_assign_group" col="5" colspan="4" class="oe_form_group_label_border">
|
||||
<separator string="Partner Assignation" colspan="5"/>
|
||||
<field name="partner_assigned_id" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','<>',False)]"/>
|
||||
<field name="date_assign"/>
|
||||
<group colspan="1" col="1">
|
||||
<field width="50%%" name="partner_assigned_id" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','<>',False)]"/>
|
||||
<field width="40%%" name="date_assign"/>
|
||||
<group width="10%%" colspan="1" col="1">
|
||||
<button string="Forward"
|
||||
attrs="{'invisible':[('partner_assigned_id','=',False)]}"
|
||||
name="%(crm_lead_forward_to_partner_act)d"
|
||||
@@ -22,15 +22,12 @@
|
||||
context="{'default_name': 'partner', 'default_partner_id': partner_assigned_id}"
|
||||
/>
|
||||
</group>
|
||||
<group name="geo_assign_group" col="5" colspan="4">
|
||||
<separator string="Geo Assignation" colspan="5"/>
|
||||
<field name="partner_latitude"/>
|
||||
<field name="partner_longitude"/>
|
||||
<group colspan="1" col="1">
|
||||
<button string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
|
||||
icon="gtk-apply"/>
|
||||
</group>
|
||||
</group>
|
||||
|
||||
<separator string="Geo Assignation" colspan="5"/>
|
||||
<field width="50%%" name="partner_latitude"/>
|
||||
<field width="40%%" name="partner_longitude"/>
|
||||
<button width="10%%" string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
|
||||
icon="gtk-apply"/>
|
||||
</group>
|
||||
</page>
|
||||
</xpath>
|
||||
|
||||
@@ -8,9 +8,11 @@
|
||||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="priority" position="after">
|
||||
<button string="Convert to Quote" icon="gtk-go-forward" name="%(action_crm_make_sale)d" type="action"/>
|
||||
</field>
|
||||
<data>
|
||||
<xpath expr="//div[contains(@class,'oe_form_topbar')]/div[contains(@class,'oe_right')]" position="before">
|
||||
<button string="Convert to Quote" icon="gtk-go-forward" name="%(action_crm_make_sale)d" type="action"/>
|
||||
</xpath>
|
||||
</data>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
<field name="inherit_id" ref="product.product_normal_form_view"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="standard_price" position="replace">
|
||||
<label string="Cost Price :" align="1.0"/>
|
||||
<label string="Cost Price" for="standard_price" align="1.0"/>
|
||||
<group col="2" colspan="1">
|
||||
<field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
|
||||
<button name="%(action_view_change_standard_price)d" string="Update"
|
||||
|
||||
Reference in New Issue
Block a user