Browse Source

[UPD] b_shifts : traductions and terms

pull/143/head
Elouan Le Bars 3 years ago
parent
commit
f3362f2f01
  1. 10
      beesdoo_shift/data/mail_template.xml
  2. 470
      beesdoo_shift/i18n/fr.po
  3. 470
      beesdoo_shift/i18n/fr_BE.po
  4. 567
      beesdoo_shift/i18n/nl_BE.po
  5. 6
      beesdoo_shift/models/attendance_sheet.py
  6. 1
      beesdoo_shift/views/attendance_sheet.xml
  7. 6
      beesdoo_shift/wizard/subscribe.py
  8. 22
      beesdoo_shift/wizard/validate_attendance_sheet.py
  9. 2
      beesdoo_shift/wizard/validate_attendance_sheet.xml

10
beesdoo_shift/data/mail_template.xml

@ -38,6 +38,13 @@
% if object.state == 'absent_2':
<br><br>Super-cooperator assigned you 2 compensations, so you have to attend two additionnal shifts before your next regular shift.
% endif
% if object.replaced_id:
You were supposed to replace ${object.worker_id.name}.
You have to do ${(object.replaced_id.cooperative_status_ids.sr + object.replaced_id.cooperative_status_ids.sc) * -1 } shifts before your next regular shift.<br>
% else:
You have to do ${(object.worker_id.cooperative_status_ids.sr + object.worker_id.cooperative_status_ids.sc) * -1 } shifts before your next regular shift.<br>
% endif
% endif
% if object.worker_id.working_mode == 'irregular':
@ -51,8 +58,7 @@
% endif
% if object.replaced_id:
You were supposed to replace ${object.worker_id.name} and your
current status is "${object.replaced_id.cooperative_status_ids.get_status_value()}".
Your current status is "${object.replaced_id.cooperative_status_ids.get_status_value()}".
% else:
<br><br>Your current status is "${object.worker_id.cooperative_status_ids.get_status_value()}".
% endif

470
beesdoo_shift/i18n/fr.po
File diff suppressed because it is too large
View File

470
beesdoo_shift/i18n/fr_BE.po
File diff suppressed because it is too large
View File

567
beesdoo_shift/i18n/nl_BE.po
File diff suppressed because it is too large
View File

6
beesdoo_shift/models/attendance_sheet.py

@ -363,7 +363,7 @@ class AttendanceSheet(models.Model):
)
if worker.working_mode not in ("regular", "irregular"):
raise UserError(
_("%s is %s and should be regular or irregular.")
_("%s's working mode is %s and should be regular or irregular.")
% (worker.name, worker.working_mode)
)
@ -377,7 +377,7 @@ class AttendanceSheet(models.Model):
return
if shift.worker_id == worker and shift.replaced_id:
raise UserError(
_("%s was expected as replaced.") % worker.name
_("%s is registered as replaced.") % worker.name
)
is_compensation = worker.working_mode == "regular"
@ -420,7 +420,7 @@ class AttendanceSheet(models.Model):
workers = []
for task in tasks:
# Only one shift is added if multiple similar exist
# Only one shift is added if multiple similar exist
if task.worker_id and task.worker_id not in workers and (task.state != "cancel") :
expected_shift.create(
{

1
beesdoo_shift/views/attendance_sheet.xml

@ -154,6 +154,7 @@
and you won't be able to add any latecomers.
The counters of those who didn't attend will be updated
and they will get warning emails."
attrs="{'invisible': [('state', '=', 'validated')]}"
/>
</header>
<sheet >

6
beesdoo_shift/wizard/subscribe.py

@ -74,11 +74,11 @@ class Subscribe(models.TransientModel):
nb_shifts = fields.Integer(string='Number of shifts', default=_get_nb_shifts)
reset_counter = fields.Boolean(default=_get_reset_counter_default)
reset_compensation_counter = fields.Boolean(default=False)
unsubscribed = fields.Boolean(default=False, string="Are you sure to unsubscribe this cooperator")
unsubscribed = fields.Boolean(default=False, string="Are you sure to remove this cooperator from his subscribed shift ?")
irregular_start_date = fields.Date(string="Start Date", default=fields.Date.today)
resigning = fields.Boolean(default=False, help="Want to leave the beescoop")
@api.multi
def unsubscribe(self):
@ -108,7 +108,7 @@ class Subscribe(models.TransientModel):
if self.working_mode != 'regular':
#Remove existing shift then subscribe to the new shift
self.cooperator_id.sudo().write({'subscribed_shift_ids': [(5,)]})
data = {
'info_session': self.info_session,

22
beesdoo_shift/wizard/validate_attendance_sheet.py

@ -56,7 +56,9 @@ class ValidateAttendanceSheet(models.TransientModel):
active_sheet = fields.Many2one(
"beesdoo.shift.sheet", default=_get_active_sheet
)
card_support = fields.Boolean(default=_get_card_support_setting)
card_support = fields.Boolean(
default=_get_card_support_setting, string="Card validation"
)
login = fields.Char(string="Login")
password = fields.Char(string="Password")
barcode = fields.Char(string="Barcode")
@ -65,8 +67,18 @@ 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", default="", readonly=False)
feedback = fields.Text(related="active_sheet.feedback", default="", readonly=False)
notes = fields.Text(
related="active_sheet.notes",
string="Notes about the attendance for the Members Office",
default="",
readonly=False,
)
feedback = fields.Text(
related="active_sheet.feedback",
string="Comments about the shift",
default="",
readonly=False,
)
worker_nb_feedback = fields.Selection(
related="active_sheet.worker_nb_feedback", readonly=False
)
@ -86,7 +98,9 @@ class ValidateAttendanceSheet(models.TransientModel):
sheet = self.active_sheet
if not self.worker_nb_feedback:
raise UserError(_("Please give your feedback on the number of workers."))
raise UserError(
_("Please give your feedback on the number of workers.")
)
if self.card_support:
# Login with barcode

2
beesdoo_shift/wizard/validate_attendance_sheet.xml

@ -35,7 +35,7 @@
<footer>
<button type="object"
name="validate_sheet"
string="Comment and validate"
string="Validate"
class="oe_highlight"
/>
<button type="object" name="save"

Loading…
Cancel
Save