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

[IMP] sale_crm, website_sale : onboarding improvements

Browse Source 
sale_crm : prevent the creation of SO from lead form view (avoid bypassing process)
website_quote : "View Quotation" on SO form view should not be a state button, so it is now replaced by a link near the field
This commit is contained in:
Jamin Shah
2015-06-10 14:46:57 +02:00
committed by Jérome Maes
parent d4a8ab4691
commit cec4e34146
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale_crm/sale_crm_view.xml
+13 -13
View File
@@ -2,20 +2,20 @@
<openerp>
<data>
<act_window name="Sale Orders"
context="{'search_default_opportunity_id': active_id, 'default_opportunity_id': active_id}"
res_model="sale.order"
src_model="crm.lead"
view_mode="form,tree,graph"
domain="[('opportunity_id', '=', active_id)]"
id="sale_action_quotations_new"/>
<record id="sale_action_quotations_new" model="ir.actions.act_window">
<field name="name">Quotation</field>
<field name="res_model">sale.order</field>
<field name="view_mode">form,tree,graph</field>
<field name="domain">[('opportunity_id', '=', active_id)]</field>
<field name="context">{'search_default_opportunity_id': active_id, 'default_opportunity_id': active_id}</field>
</record>
<act_window name="Sale Orders"
context="{'search_default_opportunity_id': [active_id], 'default_opportunity_id': active_id}"
res_model="sale.order"
src_model="crm.lead"
domain="[('opportunity_id', '=', active_id)]"
id="sale_action_quotations"/>
<record id="sale_action_quotations" model="ir.actions.act_window">
<field name="name">Quotations</field>
<field name="res_model">sale.order</field>
<field name="domain">[('opportunity_id', '=', active_id)]</field>
<field name="context">{'search_default_opportunity_id': [active_id], 'default_opportunity_id': active_id}</field>
</record>
<record model="ir.ui.view" id="crm_case_form_view_oppor">
<field name="name">CRM - Opportunities - Quote Inherit</field>
addons/website_quote/views/website_quotation_backend.xml
+7 -8
View File
@@ -17,13 +17,6 @@
<xpath expr="//header/button[@name='print_quotation'][1]" position="replace">
<button name="print_quotation" string="Print" type="object" states="draft" groups="base.group_user"/>
</xpath>
<xpath expr="//sheet/div[@name='buttons']" position="inside">
<button name="open_quotation" type="object" icon="fa fa-book"
class="oe_inline oe_stat_button oe_right"
attrs="{'invisible': [('template_id', '=', False)]}">
<div>View Online<br />Quotation</div>
</button>
</xpath>
<xpath expr="//page[@string='Order Lines']" position="after">
<page string="Suggested Products">
<label string="Optional Products &amp; Services" for="options"/>
@@ -42,7 +35,13 @@
</page>
</xpath>
<xpath expr="//field[@name='payment_term_id']" position="after">
<field name="template_id" on_change="onchange_template_id(template_id, partner_id, fiscal_position_id)"/>
<label for="template_id"/>
<div>
<field name="template_id" on_change="onchange_template_id(template_id, partner_id, fiscal_position_id)"/>
<button name="open_quotation" type="object"
class="oe_link" string="View Online Quotation"
attrs="{'invisible': [('template_id', '=', False)]}"/>
</div>
</xpath>
<xpath expr="//field[@name='client_order_ref']" position="after">
<field name="website_description" invisible="1"/>