openerp-dev-web team mailing list archive

["atp\(OpenERP\)" <atp@xxxxxxxxxxx>]

atp(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-dev-addons1-atp into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  Sbh (Open ERP) (sbh-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-dev-addons1-atp/+merge/44954

1) Fixed "tzinfo" problem of "Assign Task" wizard.

2) Fixed "groupby field not in list" problem for Meeting Invitation form.

-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-dev-addons1-atp/+merge/44954
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-dev-addons1-atp.

=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py	2010-12-22 17:34:38 +0000
+++ base_calendar/base_calendar.py	2010-12-31 12:25:30 +0000
@@ -410,6 +410,8 @@
             return res
         cal = vobject.iCalendar()
         event = cal.add('vevent')
+        if not event_obj.date_deadline or not event_obj.date:
+              raise osv.except_osv(_('Warning !'),_("You must enter Date"))            
         event.add('created').value = ics_datetime(time.strftime('%Y-%m-%d %H:%M:%S'))
         event.add('dtstart').value = ics_datetime(event_obj.date)
         event.add('dtend').value = ics_datetime(event_obj.date_deadline)
@@ -461,7 +463,6 @@
             attendee_add.params['ROLE'] = [str(attendee.role)]
             attendee_add.params['RSVP'] = [str(attendee.rsvp)]
             attendee_add.value = 'MAILTO:' + (attendee.email or '')
-            
         res = cal.serialize()
         return res
 

=== modified file 'base_calendar/base_calendar_view.xml'
--- base_calendar/base_calendar_view.xml	2010-12-27 06:53:45 +0000
+++ base_calendar/base_calendar_view.xml	2010-12-31 12:25:30 +0000
@@ -77,6 +77,7 @@
                 <tree string="Invitation details">
                     <field name="sent_by_uid" string="Invitation From" />
                     <field name="role" string="My Role"/>
+                    <field name="user_id" invisible="1"/>
                     <field name="cutype" string="Invitation type"/>
                     <field name="state" />
                     <field name="rsvp" string="Required to Join"/>