OpenERP Community Backports (Addons)

Merge lp:~invitu/ocb-addons/7.0-fix-1179307-1179305 into lp:ocb-addons

  1. 7.0-fix-1179307-1179305
  2. Merge into 7.0
Proposed by invitu
Status: Merged
Merged at revision: 9198
Proposed branch: lp:~invitu/ocb-addons/7.0-fix-1179307-1179305
Merge into: lp:ocb-addons
Diff against target: 64 lines (+8/-0)
3 files modified
crm/crm_lead_view.xml (+4/-0)
crm/report/crm_phonecall_report.py (+2/-0)
crm/report/crm_phonecall_report_view.xml (+2/-0)
To merge this branch: bzr merge lp:~invitu/ocb-addons/7.0-fix-1179307-1179305
Reviewer Review Type Date Requested Status
Stefan Rijnhart (Opener) Approve
Holger Brunn (Therp) code review Approve
Review via email: mp+165807@code.launchpad.net
To post a comment you must log in.
Revision history for this message
invitu (invitu) wrote :

the indent problem is fixed

Revision history for this message
Holger Brunn (Therp) (hbrunn) wrote :

looks good to me

review: Approve (code review)
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'crm/crm_lead_view.xml'
2--- crm/crm_lead_view.xml 2013-04-20 02:26:42 +0000
3+++ crm/crm_lead_view.xml 2013-05-27 04:23:46 +0000
4@@ -73,16 +73,20 @@
5 name="Phone calls"
6 groups="base.group_sale_salesman"
7 res_model="crm.phonecall"
8+ src_model="crm.lead"
9 view_mode="tree,calendar,form"
10 context="{'default_duration': 1.0 ,'default_opportunity_id': active_id}"
11+ domain="[('opportunity_id', '=', active_id)]"
12 view_type="form"/>
13
14 <act_window
15 id="act_crm_opportunity_crm_meeting_new"
16 name="Meetings"
17 res_model="crm.meeting"
18+ src_model="crm.lead"
19 view_mode="tree,form,calendar"
20 context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
21+ domain="[('opportunity_id', '=', active_id)]"
22 view_type="form"/>
23
24
25
26=== modified file 'crm/report/crm_phonecall_report.py'
27--- crm/report/crm_phonecall_report.py 2012-12-06 14:56:32 +0000
28+++ crm/report/crm_phonecall_report.py 2013-05-27 04:23:46 +0000
29@@ -61,6 +61,7 @@
30 domain="[('section_id','=',section_id),\
31 ('object_id.model', '=', 'crm.phonecall')]"),
32 'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
33+ 'opportunity_id': fields.many2one('crm.lead', 'Lead/Opportunity' , readonly=True),
34 'company_id': fields.many2one('res.company', 'Company', readonly=True),
35 'opening_date': fields.date('Opening Date', readonly=True, select=True),
36 'creation_date': fields.date('Creation Date', readonly=True, select=True),
37@@ -88,6 +89,7 @@
38 c.section_id,
39 c.categ_id,
40 c.partner_id,
41+ c.opportunity_id,
42 c.duration,
43 c.company_id,
44 c.priority,
45
46=== modified file 'crm/report/crm_phonecall_report_view.xml'
47--- crm/report/crm_phonecall_report_view.xml 2013-04-20 02:26:42 +0000
48+++ crm/report/crm_phonecall_report_view.xml 2013-05-27 04:23:46 +0000
49@@ -16,6 +16,7 @@
50 <field name="user_id" invisible="1"/>
51 <field name="company_id" invisible="1"/>
52 <field name="partner_id" invisible="1"/>
53+ <field name="opportunity_id" invisible="1"/>
54 <field name="state" invisible="1"/>
55 <field name="categ_id" invisible="1"/>
56 <field name="day" invisible="1"/>
57@@ -72,6 +73,7 @@
58 <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
59 <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
60 <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
61+ <filter string="Lead/Opportunity" icon="terp-personal+" context="{'group_by':'opportunity_id'}" />
62 <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
63 <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
64 <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />