From 75a721349805481bfa31c11b761fa777dedffbed Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 3 Sep 2010 19:04:50 +0530
Subject: [PATCH] [IMP]: base_calendar, crm: Minor Improvements in view

bzr revid: rpa@tinyerp.com-20100903133450-1g0mahcm9mjgfoc9
---
 addons/base_calendar/base_calendar.py          |  2 +-
 addons/base_calendar/base_calendar_view.xml    | 16 ++++++++++++++++
 .../wizard/base_calendar_invite_attendee.py    |  3 ++-
 addons/crm/crm_meeting_view.xml                | 18 +++++++++++++++++-
 addons/project_caldav/project_caldav_view.xml  |  2 +-
 5 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 6547676dc2b..11bd22e6134 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -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
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 05bf60888bd..35e3f794571 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -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">
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index 15763da202d..f60139c0600 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -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):
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 716607dfb38..5dbadcd26e1 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -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">
diff --git a/addons/project_caldav/project_caldav_view.xml b/addons/project_caldav/project_caldav_view.xml
index f5c157e4bf6..259d336c398 100644
--- a/addons/project_caldav/project_caldav_view.xml
+++ b/addons/project_caldav/project_caldav_view.xml
@@ -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'}"