Commit 6963f5a9 by Yvon Kerdoncuff

Merge branch '7800-make-test-solution-work' into migration-v12

parents 972db44b ab301bb2
Pipeline #4174 failed with stage
...@@ -912,12 +912,20 @@ class CagetteService(models.Model): ...@@ -912,12 +912,20 @@ class CagetteService(models.Model):
partner_ids.append(int(r['partner_id'][0])) partner_ids.append(int(r['partner_id'][0]))
#TODO : improve name of following method #TODO : improve name of following method
canceled_reg_ids, excluded_partner, ids = CagetteServices.fetch_registrations_infos_excluding_exempted_people( canceled_reg_ids, excluded_partner, ids = CagetteServices.fetch_registrations_infos_excluding_exempted_people(
api, partner_ids, res self.o_api, partner_ids, res
) )
f = {'state': absence_status, 'date_closed': now.isoformat()} f = {'state': absence_status, 'date_closed': now.isoformat()}
update_shift_reg_result = {'update': self.o_api.update('shift.registration', ids, f), 'reg_shift': res, 'errors': []}
try:
update_shift_reg_result = {'update': self.o_api.update('shift.registration', ids, f), 'reg_shift': res, 'errors': []}
except Exception as e:
if not ("cannot marshal" in str(e)):
raise e
else:
update_shift_reg_result = {'update': True, 'reg_shift': None, 'errors': []}
if update_shift_reg_result['update'] is True: if update_shift_reg_result['update'] is True:
update_shift_reg_result['process_status_res'] = self.o_api.execute('res.partner','run_process_target_status', []) # With new way of overriding awesomefoodcoop status management, the following line is no more useful
# update_shift_reg_result['process_status_res'] = self.o_api.execute('res.partner','run_process_target_status', [])
# change shift state by triggering button_done method for all related shifts # change shift state by triggering button_done method for all related shifts
if len(canceled_reg_ids) > 0: if len(canceled_reg_ids) > 0:
f = {'state': 'cancel', 'date_closed': now.isoformat()} f = {'state': 'cancel', 'date_closed': now.isoformat()}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment