Khushboo Bhatt(openerp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-calendar-phase2-schedule_meeting_calendar-kbh
into lp:~openerp-dev/openobject-addons/trunk-calendar-phase2.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-calendar-phase2-schedule_meeting_calendar-kbh/+merge/91040
Hello,
====crm=====
I have set domain and contexts for crm.lead and crm.phonecall object.
Thank you,
kbh.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-calendar-phase2-schedule_meeting_calendar-kbh/+merge/91040
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-calendar-phase2.
=== modified file 'base_calendar/calendar_event_view.xml'
--- base_calendar/calendar_event_view.xml 2012-01-30 06:57:12 +0000
+++ base_calendar/calendar_event_view.xml 2012-02-01 10:26:19 +0000
@@ -266,14 +266,13 @@
domain="[('state','=','done')]"
help="Confirmed Events" />
<separator orientation="vertical"/>
- <field name="name" string="Meeting"
- filter_domain="['|', ('name','ilike',self)]"/>
<field name="user_id" groups="base.group_extended">
<filter icon="terp-personal" groups="base.group_extended"
domain="[('user_id','=',uid)]"
help="My Meetings" />
</field>
<separator orientation="vertical"/>
+ <field name="calendar_id" string="Calendar"/>
<field name="name" string="Summary"/>
<separator orientation="vertical"/>
<field name="location" string="Location"/>
=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py 2012-02-01 04:38:21 +0000
+++ crm/crm_lead.py 2012-02-01 10:26:19 +0000
@@ -809,7 +809,8 @@
})
value = {
'name': _('Meetings'),
- 'context': context,
+ 'domain': "[('calendar_id.model','=','crm.lead')]",
+ 'context': "{'calendar_id': ref('model_crm_lead')}",
'view_type': 'form',
'view_mode': 'calendar,form,tree',
'res_model': 'calendar.event',
=== modified file 'crm/crm_phonecall.py'
--- crm/crm_phonecall.py 2012-02-01 04:38:21 +0000
+++ crm/crm_phonecall.py 2012-02-01 10:26:19 +0000
@@ -214,6 +214,8 @@
search_view = model_data.get_object_reference(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
value = {
'name': _('Phone Call'),
+ 'domain': "[('calendar_id.model','=','crm.phonecall')]",
+ 'context': "{'calendar_id': ref('model_crm_phonecall')}",
'view_type': 'form',
'view_mode': 'tree,form',
'res_model': 'crm.phonecall',
_______________________________________________
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
