Raphael Collet (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-first_10_clicks_crm-rco into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-first_10_clicks_crm-rco/+merge/113165
Simple improvements in crm:
- related actions (fix default search on partner's opportunities and meetings)
- group together contact name and title in lead and opportunity form viewsµ
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-first_10_clicks_crm-rco/+merge/113165
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-first_10_clicks_crm-rco.
=== modified file 'account_analytic_analysis/account_analytic_analysis_menu.xml'
--- account_analytic_analysis/account_analytic_analysis_menu.xml 2012-06-25 05:04:07 +0000
+++ account_analytic_analysis/account_analytic_analysis_menu.xml 2012-07-03 07:31:21 +0000
@@ -77,7 +77,7 @@
<menuitem id="base.menu_sales" name="Sales"
parent="base.menu_base_partner"
sequence="1"/>
- <menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="6" parent="base.menu_sales"/>
+ <menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="7" parent="base.menu_sales"/>
</data>
=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml 2012-07-02 16:16:22 +0000
+++ crm/crm_lead_view.xml 2012-07-03 07:31:21 +0000
@@ -171,10 +171,13 @@
</div>
</group>
<group>
- <field name="contact_name" />
+ <label for="contact_name" />
+ <div>
+ <field name="contact_name" class="oe_inline"/>,
+ <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline"/>
+ </div>
<field name="email_from" widget="email"/>
<field name="function" />
- <field domain="[('domain', '=', 'contact')]" name="title"/>
<field name="phone"/>
<field name="mobile"/>
<field name="fax"/>
@@ -531,9 +534,12 @@
</group>
<group>
- <field name="contact_name" />
+ <label for="contact_name" />
+ <div>
+ <field name="contact_name" class="oe_inline"/>,
+ <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline"/>
+ </div>
<field name="function" />
- <field domain="[('domain', '=', 'contact')]" name="title"/>
<field name="mobile"/>
<field name="fax"/>
</group>
=== modified file 'crm/crm_meeting_menu.xml'
--- crm/crm_meeting_menu.xml 2012-07-02 11:27:50 +0000
+++ crm/crm_meeting_menu.xml 2012-07-03 07:31:21 +0000
@@ -83,7 +83,7 @@
<menuitem name="Meetings" id="menu_crm_case_categ_meet"
action="crm_case_categ_meet" parent="base.menu_sales"
- sequence="7" />
+ sequence="8" />
<record id="action_view_attendee_form" model="ir.actions.act_window">
<field name="name">Meeting Invitations</field>
=== modified file 'crm/res_partner_view.xml'
--- crm/res_partner_view.xml 2012-07-02 16:37:25 +0000
+++ crm/res_partner_view.xml 2012-07-03 07:31:21 +0000
@@ -45,25 +45,58 @@
</field>
</record>
- <act_window
- id="crm_meeting_partner"
- name="Meetings"
- res_model="crm.meeting"
- src_model="res.partner"
- view_mode="calendar,tree,form,gantt"
- context="{'search_default_partner_id': [active_id],'default_partner_id': active_id}"
- />
- <act_window
- id="act_res_partner_2_opportunity"
- name="Opportunities"
- res_model="crm.lead"
- src_model="res.partner"
- view_mode="kanban,tree,form,graph,calendar"
- domain="[('type','=','opportunity')]"
- context="{'search_default_partner_id': [active_id],'default_partner_id': active_id}"
+ <!-- open meetings related to given partner -->
+ <act_window
+ id="crm_meeting_partner"
+ name="Meetings"
+ res_model="crm.meeting"
+ src_model="res.partner"
+ view_mode="calendar,tree,form,gantt"
+ context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}"
/>
-<!-- Partner kanban view inherte -->
+ <!-- open opportunities related to given partner -->
+ <record model="ir.actions.act_window" id="relate_partner_opportunities">
+ <field name="name">Opportunities</field>
+ <field name="res_model">crm.lead</field>
+ <field name="view_mode">kanban,tree,form,graph,calendar</field>
+ <field name="domain">[('type','=','opportunity')]</field>
+ <field name="context">{'search_default_partner_id': active_id, 'default_partner_id': active_id,
+ 'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
+ <field name="view_id" eval="False"/>
+ <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
+ <field name="help">
+ With opportunities you can manage and keep track of your sales pipeline by creating specific customer- or prospect-related sales documents to follow up potential sales. Information such as expected revenue, opportunity stage, expected closing date, communication history and much more can be stored. Opportunities can be connected to the email gateway: new emails may create opportunities, each of them automatically gets the history of the conversation with the customer.
+
+ You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more.
+ </field>
+ </record>
+ <record model="ir.actions.act_window.view" id="relate_partner_opportunities_kanban">
+ <field name="sequence" eval="0"/>
+ <field name="view_mode">kanban</field>
+ <field name="view_id" ref="crm_case_kanban_view_leads"/>
+ <field name="act_window_id" ref="relate_partner_opportunities"/>
+ </record>
+ <record model="ir.actions.act_window.view" id="relate_partner_opportunities_tree">
+ <field name="sequence" eval="1"/>
+ <field name="view_mode">tree</field>
+ <field name="view_id" ref="crm_case_tree_view_oppor"/>
+ <field name="act_window_id" ref="relate_partner_opportunities"/>
+ </record>
+ <record model="ir.actions.act_window.view" id="relate_partner_opportunities_form">
+ <field name="sequence" eval="2"/>
+ <field name="view_mode">form</field>
+ <field name="view_id" ref="crm_case_form_view_oppor"/>
+ <field name="act_window_id" ref="relate_partner_opportunities"/>
+ </record>
+ <record model="ir.actions.act_window.view" id="relate_partner_opportunities_graph">
+ <field name="sequence" eval="4"/>
+ <field name="view_mode">graph</field>
+ <field name="view_id" ref="crm_case_graph_view_opportunity"/>
+ <field name="act_window_id" ref="relate_partner_opportunities"/>
+ </record>
+
+ <!-- Partner kanban view inherte -->
<record model="ir.ui.view" id="crm_lead_partner_kanban_view">
<field name="name">res.partner.kanban.inherit</field>
<field name="model">res.partner</field>
@@ -75,11 +108,11 @@
<field name="meeting_count"/>
</field>
<xpath expr="//h4[@class='oe_partner_heading']" position="after">
- <a name="%(act_res_partner_2_opportunity)d" type="action">
- <t t-if="record.opportunity_count.value"><t t-esc="record.opportunity_count.value"/> Opportunities</t>
+ <a name="%(relate_partner_opportunities)d" type="action">
+ <t t-if="record.opportunity_count.value">Opportunities(<t t-esc="record.opportunity_count.value"/>)</t>
</a>
<a name="%(crm_meeting_partner)d" type="action">
- <t t-if="record.meeting_count.value"><t t-esc="record.meeting_count.value"/> Meetings</t>
+ <t t-if="record.meeting_count.value">Meetings(<t t-esc="record.meeting_count.value"/>)</t>
</a>
</xpath>
</field>
@@ -96,12 +129,20 @@
<button type="action"
string="Schedule a Meeting"
name="%(crm.crm_case_categ_meet_create_partner)d"
- context="{'default_partner_id': [active_id], 'default_duration': 4.0}"/>
+ context="{'default_partner_id': active_id, 'default_duration': 4.0}"/>
<button type="action" string="Schedule a Call"
name="%(crm.crm_case_categ_phone_create_partner)d"
+<<<<<<< TREE
context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}" />
+=======
+ context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />
+>>>>>>> MERGE-SOURCE
<button type="action" string="Opportunities"
+<<<<<<< TREE
name="%(crm.crm_case_category_act_oppor11)d" context="{'search_default_partner_id': [active_id]}"/>
+=======
+ name="%(crm.relate_partner_opportunities)d" />
+>>>>>>> MERGE-SOURCE
</xpath>
</field>
</record>
=== modified file 'crm_todo/crm_todo_view.xml'
--- crm_todo/crm_todo_view.xml 2012-06-03 21:23:55 +0000
+++ crm_todo/crm_todo_view.xml 2012-07-03 07:31:21 +0000
@@ -58,7 +58,7 @@
id="menu_crm_todo"
parent="base.menu_sales"
action="crm_todo_action"
- sequence="5"/>
+ sequence="6"/>
</data>
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml 2012-07-02 17:08:54 +0000
+++ sale/sale_view.xml 2012-07-03 07:31:21 +0000
@@ -370,7 +370,7 @@
<field name="context">{"search_default_sales":1}</field>
<field name="help">Sales Orders help you manage quotations and orders from your customers. OpenERP suggests that you start by creating a quotation. Once it is confirmed, the quotation will be converted into a Sales Order. OpenERP can handle several types of products so that a sales order may trigger tasks, delivery orders, manufacturing orders, purchases and so on. Based on the configuration of the sales order, a draft invoice will be generated so that you just have to confirm it when you want to bill your customer.</field>
</record>
- <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="4" groups="base.group_sale_salesman,base.group_sale_manager"/>
+ <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="5" groups="base.group_sale_salesman,base.group_sale_manager"/>
<record id="action_order_tree2" model="ir.actions.act_window">
<field name="name">Sales in Exception</field>
@@ -413,7 +413,7 @@
<menuitem id="menu_sale_quotations"
action="action_order_tree5" parent="base.menu_sales"
- sequence="3"/>
+ sequence="4"/>
<record id="action_order_tree" model="ir.actions.act_window">
<field name="name">Old Quotations</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
