Browse Source

[MIG] b_shift : fix validation wizard to fit 12.0 requirements

pull/143/head
Elouan Le Bars 5 years ago
parent
commit
ef1ad141bd
  1. 8
      beesdoo_shift/wizard/validate_attendance_sheet.py
  2. 2
      beesdoo_shift/wizard/validate_attendance_sheet.xml

8
beesdoo_shift/wizard/validate_attendance_sheet.py

@ -64,10 +64,10 @@ class ValidateAttendanceSheet(models.TransientModel):
default=_get_warning_regular_workers, default=_get_warning_regular_workers,
help="Is any regular worker doing its regular shift as an added one ?", help="Is any regular worker doing its regular shift as an added one ?",
) )
notes = fields.Text(related="active_sheet.notes")
feedback = fields.Text(related="active_sheet.feedback")
notes = fields.Text(related="active_sheet.notes", readonly=False)
feedback = fields.Text(related="active_sheet.feedback", readonly=False)
worker_nb_feedback = fields.Selection( worker_nb_feedback = fields.Selection(
related="active_sheet.worker_nb_feedback", required=True
related="active_sheet.worker_nb_feedback", readonly=False, required=True
) )
def on_barcode_scanned(self, barcode): def on_barcode_scanned(self, barcode):
@ -97,7 +97,7 @@ class ValidateAttendanceSheet(models.TransientModel):
if not self.login: if not self.login:
raise UserError(_("Please enter your login.")) raise UserError(_("Please enter your login."))
user = self.env["res.users"].search([("login", "=", self.login)]) user = self.env["res.users"].search([("login", "=", self.login)])
user.sudo(user.id).check_credentials(self.password)
user.sudo(user.id)._check_credentials(self.password)
partner = user.partner_id partner = user.partner_id
is_admin = partner.user_ids.has_group( is_admin = partner.user_ids.has_group(

2
beesdoo_shift/wizard/validate_attendance_sheet.xml

@ -13,7 +13,7 @@
readonly="1" readonly="1"
attrs="{'invisible': [('warning_regular_workers', '=', False)]}" attrs="{'invisible': [('warning_regular_workers', '=', False)]}"
/> />
<group col="1" string="Additional informations" >
<group string="Additional informations" >
<field name="notes" /> <field name="notes" />
<field name="feedback" /> <field name="feedback" />
</group> </group>

Loading…
Cancel
Save