odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]: base_calendar, crm: Minor Improvements in view 

bzr revid: rpa@tinyerp.com-20100903133450-1g0mahcm9mjgfoc9
This commit is contained in:
rpa (Open ERP) 2010-09-03 19:04:50 +05:30
parent 3aa4446439
commit 75a7213498
5 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/base_calendar/base_calendar.py
View File

@ -942,7 +942,7 @@ class calendar_event(osv.osv):
if not start_date:
return value
if not end_date and not duration:
duration = 8.00
duration = 1.00
value['duration'] = duration
if allday: # For all day event

16
addons/base_calendar/base_calendar_view.xml
View File

@ -339,6 +339,22 @@
<field name="email" />
<field name="role" width="200" select="1" />
<field name="state" />
<button name="do_tentative"
states="needs-action,declined,accepted"
string="Uncertain" type="object"
icon="terp-crm" />
<button name="do_accept" string="Accept"
states="needs-action,tentative,declined"
type="object" icon="gtk-apply" />
<button name="do_decline" string="Decline"
states="needs-action,tentative,accepted"
type="object" icon="gtk-cancel" />
<button
name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
string="Delegate" type="action"
icon="gtk-sort-descending"
states="needs-action,tentative,declined,accepted"
context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
</tree>
<form string="Invitation details">
<notebook colspan="4">

3
addons/base_calendar/wizard/base_calendar_invite_attendee.py
View File

@ -48,7 +48,8 @@ send an Email to Invited Person')
}
_defaults = {
'type': lambda *x: 'internal'
'type': 'internal',
'send_mail': True
}
def do_invite(self, cr, uid, ids, context=None):

18
addons/crm/crm_meeting_view.xml
View File

@ -51,7 +51,7 @@
attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
name="open_meeting" icon="gtk-edit"
type="object" />
<button string="ExRule"
<button string="Exclude range" groups="base.group_extended"
help="Add Exception Rule"
name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out" type="action"
context="{'model' : 'crm.meeting'}"
@ -161,6 +161,22 @@
<field name="email" string="Mail TO"/>
<field name="role" select="1" />
<field name="state" />
<button name="do_tentative"
states="needs-action,declined,accepted"
string="Uncertain" type="object"
icon="terp-crm" />
<button name="do_accept" string="Accept"
states="needs-action,tentative,declined"
type="object" icon="gtk-apply" />
<button name="do_decline" string="Decline"
states="needs-action,tentative,accepted"
type="object" icon="gtk-cancel" />
<button
name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
string="Delegate" type="action"
icon="gtk-sort-descending"
states="needs-action,tentative,declined,accepted"
context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
</tree>
<form string="Invitation details">
<notebook colspan="4">

2
addons/project_caldav/project_caldav_view.xml
View File

@ -72,7 +72,7 @@
attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
name="open_meeting" icon="gtk-edit"
type="object" />
<button string="ExRule"
<button string="Exclude range" groups="base.group_extended"
help="Add Exception Rule"
name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out" type="action"
context="{'model' : 'project.task'}"