Amit Patel (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons9-crm-apa into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons9-crm-apa/+merge/124676
Hello,
- In Opportunities form view, the button convert to quote should be renamed
into "Convert to Quotation"
- The escalate button should be near the field "Sales Team"
- DB with all modules and demo data, can't convert an opportunity because of
"Shop" field -> the default one is stock Configuration Issue, Default Company
shop is assigned to diff company. If we do not have any Shop for company we
will face same issue.
Thanks,
Amit
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons9-crm-apa/+merge/124676
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons9-crm-apa.
=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml 2012-09-10 20:14:08 +0000
+++ crm/crm_lead_view.xml 2012-09-17 13:18:27 +0000
@@ -132,8 +132,6 @@
<header>
<button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
states="draft,open,pending" help="Convert to Opportunity" class="oe_highlight"/>
- <button name="case_escalate" string="Escalate" type="object"
- states="draft,open,pending"/>
<button name="case_reset" string="Reset" type="object"
states="cancel"/>
<button name="case_cancel" string="Cancel" type="object"
@@ -188,7 +186,11 @@
</group>
<group>
<field name="user_id"/>
- <field name="section_id"/>
+ <label for="section_id"/>
+ <div>
+ <field name="section_id"/>
+ <button name="case_escalate" string="Escalate" type="object" states="draft,open,pending"/>
+ </div>
<field name="type" invisible="1"/>
</group>
<group>
@@ -402,8 +404,6 @@
states="draft,open,pending" class="oe_highlight"/>
<button name="case_mark_lost" string="Mark Lost" type="object"
states="draft,open" class="oe_highlight"/>
- <button name="case_escalate" string="Escalate" type="object"
- states="open" />
<field name="stage_id" widget="statusbar" clickable="True"/>
</header>
<sheet>
@@ -449,7 +449,11 @@
<group>
<field name="user_id"/>
- <field name="section_id" colspan="1" widget="selection"/>
+ <label for="section_id"/>
+ <div>
+ <field name="section_id" widget="selection"/>
+ <button name="case_escalate" string="Escalate" type="object" states="open" />
+ </div>
</group>
<group>
<field name="categ_ids"
=== modified file 'multi_company/multi_company_demo.xml'
--- multi_company/multi_company_demo.xml 2012-08-31 17:03:56 +0000
+++ multi_company/multi_company_demo.xml 2012-09-17 13:18:27 +0000
@@ -181,7 +181,7 @@
</record>
<record id="sale.sale_order_5" model="sale.order">
- <field name="company_id" ref="res_company_oerp_in"/>
+ <field name="company_id" ref="base.main_company"/>
</record>
=== modified file 'sale_crm/sale_crm_view.xml'
--- sale_crm/sale_crm_view.xml 2012-08-13 16:06:57 +0000
+++ sale_crm/sale_crm_view.xml 2012-09-17 13:18:27 +0000
@@ -9,8 +9,8 @@
<field name="arch" type="xml">
<data>
<xpath expr="/form/header/button[@name='case_mark_lost']" position="after">
- <button states="done" string="Convert to Quote" name="%(action_crm_make_sale)d" type="action" class="oe_highlight"/>
- <button states="draft,open,pending" string="Convert to Quote" name="%(action_crm_make_sale)d" type="action"/>
+ <button states="done" string="Convert to Quotation" name="%(action_crm_make_sale)d" type="action" class="oe_highlight"/>
+ <button states="draft,open,pending" string="Convert to Quotation" name="%(action_crm_make_sale)d" type="action"/>
</xpath>
</data>
</field>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
