Intégration modif. certaines-absences-engendrent-une-erreur

shifts/models.py

@@ -773,20 +773,28 @@ class CagetteServices(models.Model):
                 canceled_reg_ids.append(int(r['id']))
         # coop_logger.info("Traitement absences shift_registration ids %s", ids)
         f = {'state': absence_status, 'date_closed': now.isoformat()}
-        update_shift_reg_result = {'update': api.update('shift.registration', ids, f), 'reg_shift': res, 'errors': []}
-        if update_shift_reg_result['update'] is True:
-            update_shift_reg_result['process_status_res'] = api.execute('res.partner','run_process_target_status', [])
-            # change shift state by triggering button_done method for all related shifts
-            if len(canceled_reg_ids) > 0:
-                f = {'state': 'cancel', 'date_closed': now.isoformat()}
-                api.update('shift.registration', canceled_reg_ids, f)
-            for sid in shift_ids:
-                try:
-                    api.execute('shift.shift', 'button_done', sid)
-                except Exception as e:
-                    marshal_none_error = 'cannot marshal None unless allow_none is enabled'
-                    if not (marshal_none_error in str(e)):
-                        update_shift_reg_result['errors'].append({'shift_id': sid, 'msg' :str(e)})
+        update_shift_reg_result = {'update': False, 'reg_shift': res, 'errors': []}
+        individual_update_result = {}
+        for mysregid in ids:
+            try:
+                individual_update_result[str(mysregid)] = api.update('shift.registration', [mysregid], f)
+            except Exception as e:
+                coop_logger.error("Error on updating shift.registration ids %s :   %s", str(mysregid), str(e))
+        update_shift_reg_result['update'] = individual_update_result
+
+        # With new way of overriding awesomefoodcoop status management, the following line is no more useful
+        # update_shift_reg_result['process_status_res'] = api.execute('res.partner','run_process_target_status', [])
+        # change shift state by triggering button_done method for all related shifts
+        if len(canceled_reg_ids) > 0:
+            f = {'state': 'cancel', 'date_closed': now.isoformat()}
+            api.update('shift.registration', canceled_reg_ids, f)
+        for sid in shift_ids:
+            try:
+                api.execute('shift.shift', 'button_done', sid)
+            except Exception as e:
+                marshal_none_error = 'cannot marshal None unless allow_none is enabled'
+                if not (marshal_none_error in str(e)):
+                    update_shift_reg_result['errors'].append({'shift_id': sid, 'msg' :str(e)})
 
         return update_shift_reg_result