From 0a91cc7bc9d386bdd2c7360bbf031cb2b2a77e02 Mon Sep 17 00:00:00 2001 From: Elouan Le Bars Date: Wed, 29 Jan 2020 17:43:47 +0100 Subject: [PATCH] [FIX] b_shift : automatic error message For regular non-attended not doing their compensation shift. --- beesdoo_shift/wizard/validate_attendance_sheet.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/beesdoo_shift/wizard/validate_attendance_sheet.py b/beesdoo_shift/wizard/validate_attendance_sheet.py index 08b1fd4..8bfc4d6 100644 --- a/beesdoo_shift/wizard/validate_attendance_sheet.py +++ b/beesdoo_shift/wizard/validate_attendance_sheet.py @@ -33,7 +33,8 @@ class ValidateAttendanceSheet(models.TransientModel): but should be doing their regular shifts. This warning is added to sheet's notes at validation. """ - sheet = self.active_sheet + sheet = self._get_active_sheet() + warning_message = "" if sheet: for added_shift in sheet.added_shift_ids: @@ -64,8 +65,8 @@ class ValidateAttendanceSheet(models.TransientModel): default=_get_warning_regular_workers, help="Is any regular worker doing its regular shift as an added one ?", ) - notes = fields.Text(related="active_sheet.notes", readonly=False) - feedback = fields.Text(related="active_sheet.feedback", readonly=False) + notes = fields.Text(related="active_sheet.notes", default="", readonly=False) + feedback = fields.Text(related="active_sheet.feedback", default="", readonly=False) worker_nb_feedback = fields.Selection( related="active_sheet.worker_nb_feedback", readonly=False, required=True ) @@ -83,7 +84,6 @@ class ValidateAttendanceSheet(models.TransientModel): @api.multi def validate_sheet(self): sheet = self.active_sheet - if self.card_support: # Login with barcode card = self.env["member.card"].search( @@ -111,6 +111,10 @@ class ValidateAttendanceSheet(models.TransientModel): ) ) - self.notes += self.warning_regular_workers + if self.notes and self.warning_regular_workers: + self.notes += self.warning_regular_workers + elif self.warning_regular_workers: + self.notes = self.warning_regular_workers + self.save() sheet._validate(partner or self.env.user.partner_id)