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
=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml 2013-04-20 02:26:42 +0000
+++ crm/crm_lead_view.xml 2013-05-27 04:23:46 +0000
@@ -73,16 +73,20 @@
73 name="Phone calls"73 name="Phone calls"
74 groups="base.group_sale_salesman"74 groups="base.group_sale_salesman"
75 res_model="crm.phonecall"75 res_model="crm.phonecall"
76 src_model="crm.lead"
76 view_mode="tree,calendar,form"77 view_mode="tree,calendar,form"
77 context="{'default_duration': 1.0 ,'default_opportunity_id': active_id}"78 context="{'default_duration': 1.0 ,'default_opportunity_id': active_id}"
79 domain="[('opportunity_id', '=', active_id)]"
78 view_type="form"/>80 view_type="form"/>
7981
80 <act_window82 <act_window
81 id="act_crm_opportunity_crm_meeting_new"83 id="act_crm_opportunity_crm_meeting_new"
82 name="Meetings"84 name="Meetings"
83 res_model="crm.meeting"85 res_model="crm.meeting"
86 src_model="crm.lead"
84 view_mode="tree,form,calendar"87 view_mode="tree,form,calendar"
85 context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"88 context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
89 domain="[('opportunity_id', '=', active_id)]"
86 view_type="form"/>90 view_type="form"/>
8791
8892
8993
=== modified file 'crm/report/crm_phonecall_report.py'
--- crm/report/crm_phonecall_report.py 2012-12-06 14:56:32 +0000
+++ crm/report/crm_phonecall_report.py 2013-05-27 04:23:46 +0000
@@ -61,6 +61,7 @@
61 domain="[('section_id','=',section_id),\61 domain="[('section_id','=',section_id),\
62 ('object_id.model', '=', 'crm.phonecall')]"),62 ('object_id.model', '=', 'crm.phonecall')]"),
63 'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),63 'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
64 'opportunity_id': fields.many2one('crm.lead', 'Lead/Opportunity' , readonly=True),
64 'company_id': fields.many2one('res.company', 'Company', readonly=True),65 'company_id': fields.many2one('res.company', 'Company', readonly=True),
65 'opening_date': fields.date('Opening Date', readonly=True, select=True),66 'opening_date': fields.date('Opening Date', readonly=True, select=True),
66 'creation_date': fields.date('Creation Date', readonly=True, select=True),67 'creation_date': fields.date('Creation Date', readonly=True, select=True),
@@ -88,6 +89,7 @@
88 c.section_id,89 c.section_id,
89 c.categ_id,90 c.categ_id,
90 c.partner_id,91 c.partner_id,
92 c.opportunity_id,
91 c.duration,93 c.duration,
92 c.company_id,94 c.company_id,
93 c.priority,95 c.priority,
9496
=== modified file 'crm/report/crm_phonecall_report_view.xml'
--- crm/report/crm_phonecall_report_view.xml 2013-04-20 02:26:42 +0000
+++ crm/report/crm_phonecall_report_view.xml 2013-05-27 04:23:46 +0000
@@ -16,6 +16,7 @@
16 <field name="user_id" invisible="1"/>16 <field name="user_id" invisible="1"/>
17 <field name="company_id" invisible="1"/>17 <field name="company_id" invisible="1"/>
18 <field name="partner_id" invisible="1"/>18 <field name="partner_id" invisible="1"/>
19 <field name="opportunity_id" invisible="1"/>
19 <field name="state" invisible="1"/>20 <field name="state" invisible="1"/>
20 <field name="categ_id" invisible="1"/>21 <field name="categ_id" invisible="1"/>
21 <field name="day" invisible="1"/>22 <field name="day" invisible="1"/>
@@ -72,6 +73,7 @@
72 <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />73 <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
73 <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />74 <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
74 <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />75 <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
76 <filter string="Lead/Opportunity" icon="terp-personal+" context="{'group_by':'opportunity_id'}" />
75 <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />77 <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
76 <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />78 <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
77 <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />79 <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />