openerp-dev-web team mailing list archive

["Rucha \(Open ERP\)" <rpa@xxxxxxxxxxx>]

Rucha (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-crm-fixes-rpa into lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind.

Requested reviews:
  OpenERP R&D Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-crm-fixes-rpa/+merge/57632

• Fixed missing functionality for "Allow unlink" in case sections
• Meeting recurrency option, Way to end reccurency, End date, then field "Repeat Until" must be set as required
• Fix: Meeting recurrency option, Repeat Until is not working properly, if I set 15 th as until date, it must include 15th , but it takes meetings till 14th only
• Sales/Meetings/Synchronyze this calendar should have atleast ok or cancel button
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-crm-fixes-rpa/+merge/57632
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-crm-fixes-rpa into lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind.

=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py	2011-02-18 10:09:57 +0000
+++ base_calendar/base_calendar.py	2011-04-14 08:32:32 +0000
@@ -1296,7 +1296,7 @@
                         if name == "UNTIL":
                             is_until = True
                             value = parser.parse(value)
-                            rrule_until_date = parser.parse(value.strftime("%Y-%m-%d"))
+                            rrule_until_date = parser.parse(value.strftime("%Y-%m-%d %H:%M:%S"))
                             if until_date and until_date >= rrule_until_date:
                                 until_date = rrule_until_date
                             if until_date:

=== modified file 'caldav/wizard/caldav_browse_view.xml'
--- caldav/wizard/caldav_browse_view.xml	2011-01-17 22:03:45 +0000
+++ caldav/wizard/caldav_browse_view.xml	2011-04-14 08:32:32 +0000
@@ -15,8 +15,10 @@
                         <separator string="Description" colspan="4"/>
                         <field name="description"  colspan="4"  nolabel="1"/>
                         <separator colspan="4"/>
-                       
-                        
+                      <group col="4" colspan="4">
+                        <label string="" colspan="2"/>
+                        <button special="cancel" string="_Close" icon="gtk-close"/>
+                      </group>
                     </group>
                 </form>
             </field>

=== modified file 'crm/crm.py'
--- crm/crm.py	2011-03-04 12:53:34 +0000
+++ crm/crm.py	2011-04-14 08:32:32 +0000
@@ -199,6 +199,13 @@
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         return user.context_section_id.id or False
 
+    def unlink(self, cr, uid, ids, context={}):
+        for case in self.browse(cr, uid, ids, context):
+            if (not case.section_id.allow_unlink) and (case.state <> 'draft'):
+                raise osv.except_osv(_('Warning !'),
+                    _('You can not delete this case. You should better cancel it.'))
+        return super(crm_case, self).unlink(cr, uid, ids, context)
+
     def _find_next_stage(self, cr, uid, stage_list, index, current_seq, stage_pool, context=None):
         if index + 1 == len(stage_list):
             return False

=== modified file 'crm/crm_meeting_view.xml'
--- crm/crm_meeting_view.xml	2011-04-07 06:19:38 +0000
+++ crm/crm_meeting_view.xml	2011-04-14 08:32:32 +0000
@@ -179,7 +179,7 @@
                                 <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
                                 <label string=" " colspan="2" />
                                 <newline />
-                                <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')] }"/>
+                                <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')], 'required': [('end_type', '=', 'end_date')]}"/>
                                 <newline />