diff --git a/hr_holidays_usability/hr_holidays.py b/hr_holidays_usability/hr_holidays.py index 1c968a3..ac47e8f 100644 --- a/hr_holidays_usability/hr_holidays.py +++ b/hr_holidays_usability/hr_holidays.py @@ -345,8 +345,8 @@ class HrHolidays(orm.Model): raise orm.except_orm( _('Warning!'), _('There are not enough %s allocated for ' - 'employee %s (requesting %s but only %s ' - 'left).') + 'employee %s (requesting %s days but only %s ' + 'days left).') % (record.holiday_status_id.name, record.employee_id.name, record.number_of_days * -1, diff --git a/hr_holidays_usability/i18n/fr.po b/hr_holidays_usability/i18n/fr.po index b690983..2deba7e 100644 --- a/hr_holidays_usability/i18n/fr.po +++ b/hr_holidays_usability/i18n/fr.po @@ -125,7 +125,7 @@ msgstr "\n" #. module: hr_holidays_usability #: view:hr.holidays:0 msgid " days" -msgstr " days" +msgstr " jours" #. module: hr_holidays_usability #: model:email.template,subject:hr_holidays_usability.email_template_hr_holidays @@ -155,13 +155,13 @@ msgstr "Auto-email validated leave" #. module: hr_holidays_usability #: field:hr.holidays.mass.allocation,auto_approve:0 msgid "Automatic Approval" -msgstr "Automatic Approval" +msgstr "Validation automatique" #. module: hr_holidays_usability #: view:hr.holidays.mass.allocation:0 #: view:hr.holidays.post:0 msgid "Cancel" -msgstr "Cancel" +msgstr "Annuler" #. module: hr_holidays_usability #: model:ir.model,name:hr_holidays_usability.model_res_company @@ -171,35 +171,35 @@ msgstr "Sociétés" #. module: hr_holidays_usability #: view:hr.holidays:0 msgid "Counter for this leave type" -msgstr "Counter for this leave type" +msgstr "Compteur pour ce type de congé" #. module: hr_holidays_usability #: model:ir.actions.act_window,name:hr_holidays_usability.hr_holidays_employee_counter_action #: model:ir.ui.menu,name:hr_holidays_usability.hr_holidays_employee_counter_menu msgid "Counters" -msgstr "Counters" +msgstr "Compteurs" #. module: hr_holidays_usability #: view:hr.holidays.mass.allocation:0 msgid "Create Allocations" -msgstr "Create Allocations" +msgstr "Créer des attributions" #. module: hr_holidays_usability #: field:hr.holidays,current_leaves_taken:0 #: field:hr.holidays.employee.counter,current_leaves_taken:0 msgid "Current Leaves Taken" -msgstr "Current Leaves Taken" +msgstr "Congés pris" #. module: hr_holidays_usability #: field:hr.holidays,current_remaining_leaves:0 #: field:hr.holidays.employee.counter,current_remaining_leaves:0 msgid "Current Remaining Leaves" -msgstr "Current Remaining Leaves" +msgstr "Congés restants" #. module: hr_holidays_usability #: field:res.company,mass_allocation_default_holiday_status_id:0 msgid "Default Leave Type for Mass Allocation" -msgstr "Default Leave Type for Mass Allocation" +msgstr "Type de congé par défaut pour attribution en masse" #. module: hr_holidays_usability #: field:hr.holidays.mass.allocation,name:0 @@ -209,12 +209,12 @@ msgstr "Description" #. module: hr_holidays_usability #: selection:hr.holidays.post,state:0 msgid "Done" -msgstr "Done" +msgstr "" #. module: hr_holidays_usability #: selection:hr.holidays.post,state:0 msgid "Draft" -msgstr "Draft" +msgstr "" #. module: hr_holidays_usability #: view:hr.holidays.employee.counter:0 @@ -226,12 +226,12 @@ msgstr "Employé" #. module: hr_holidays_usability #: view:hr.holidays.employee.counter:0 msgid "Employee Holidays Counters" -msgstr "Employee Holidays Counters" +msgstr "Compteurs de congé de l'employé" #. module: hr_holidays_usability #: field:hr.holidays.mass.allocation,employee_ids:0 msgid "Employees" -msgstr "Employees" +msgstr "Employés" #. module: hr_holidays_usability #: field:hr.holidays,vacation_time_to:0 @@ -285,12 +285,12 @@ msgstr "Par exemple, si vous partez en congé pendant une semaine calendaire, le #. module: hr_holidays_usability #: view:hr.holidays.post:0 msgid "Get Holiday Requests" -msgstr "Get Holiday Requests" +msgstr "Obtenir les congés" #. module: hr_holidays_usability #: view:hr.holidays.employee.counter:0 msgid "Group By" -msgstr "Group By" +msgstr "Grouper par" #. module: hr_holidays_usability #: selection:hr.holidays.status,vacation_compute_method:0 @@ -316,7 +316,7 @@ msgstr "Congé" #: view:hr.holidays.post:0 #: field:hr.holidays.post,holidays_to_post_ids:0 msgid "Leave Requests to Post" -msgstr "Leave Requests to Post" +msgstr "Congés à comptabiliser" #. module: hr_holidays_usability #: view:hr.holidays.employee.counter:0 @@ -342,12 +342,12 @@ msgstr "Calendrier des absences" #: model:ir.actions.act_window,name:hr_holidays_usability.hr_holidays_mass_allocation_action #: model:ir.ui.menu,name:hr_holidays_usability.hr_holidays_mass_allocation_menu msgid "Mass Allocation" -msgstr "Mass Allocation" +msgstr "Attribution en masse" #. module: hr_holidays_usability #: view:hr.holidays.mass.allocation:0 msgid "Mass Allocation of Holidays" -msgstr "Mass Allocation of Holidays" +msgstr "Attribution de congés en masse" #. module: hr_holidays_usability #: selection:hr.holidays,vacation_time_from:0 @@ -357,8 +357,8 @@ msgstr "Matin" #. module: hr_holidays_usability #: code:addons/hr_holidays_usability/wizard/hr_holidays_post.py:85 #, python-format -msgid "No for the number of days." -msgstr "No for the number of days." +msgid "No leave request to post." +msgstr "Aucun congé à comptabiliser." #. module: hr_holidays_usability #: selection:hr.holidays,vacation_time_from:0 @@ -369,7 +369,7 @@ msgstr "Midi" #. module: hr_holidays_usability #: field:hr.holidays.mass.allocation,number_of_days:0 msgid "Number of Days" -msgstr "Number of Days" +msgstr "Nombre de jours" #. module: hr_holidays_usability #: field:hr.holidays,number_of_days_remove:0 @@ -379,28 +379,28 @@ msgstr "Nombre de jours de congé" #. module: hr_holidays_usability #: view:hr.holidays.post:0 msgid "Post" -msgstr "Post" +msgstr "Comptabiliser" #. module: hr_holidays_usability #: model:ir.actions.act_window,name:hr_holidays_usability.hr_holidays_post_action #: model:ir.ui.menu,name:hr_holidays_usability.hr_holidays_post_menu msgid "Post Leave Requests" -msgstr "Post Leave Requests" +msgstr "Comptabiliser les congés" #. module: hr_holidays_usability #: view:hr.holidays.post:0 msgid "Post Leaves" -msgstr "Post Leaves" +msgstr "Comptabiliser les congés" #. module: hr_holidays_usability #: field:hr.holidays,posted_date:0 msgid "Posted Date" -msgstr "Posted Date" +msgstr "Date de comptabilisation" #. module: hr_holidays_usability #: field:hr.holidays.post,before_date:0 -msgid "Select Holidays That Ended Before" -msgstr "Select Holidays That Ended Before" +msgid "Select Leave Requests That Ended Before" +msgstr "Sélectionner les congés pris avant le" #. module: hr_holidays_usability #: field:hr.holidays,vacation_time_from:0 @@ -410,7 +410,7 @@ msgstr "Début du congé" #. module: hr_holidays_usability #: field:hr.holidays.post,state:0 msgid "State" -msgstr "State" +msgstr "" #. module: hr_holidays_usability #: code:addons/hr_holidays_usability/hr_holidays.py:238 @@ -445,7 +445,7 @@ msgstr "Le dernier jour de congé ne peut pas être un jour férié !" #. module: hr_holidays_usability #: sql_constraint:hr.holidays.mass.allocation:0 msgid "The number of days must be positive" -msgstr "The number of days must be positive" +msgstr "Le nombre de jours doit être positif" #. module: hr_holidays_usability #: code:addons/hr_holidays_usability/hr_holidays.py:244 @@ -456,29 +456,29 @@ msgstr "Le début du congé est égal à la fin du congé !" #. module: hr_holidays_usability #: help:hr.holidays.post,before_date:0 msgid "The wizard will select the validated holidays that ended before that date (including holidays that ended on that date)." -msgstr "The wizard will select the validated holidays that ended before that date (including holidays that ended on that date)." +msgstr "L'assistant sélectionnera les congés validés qui se sont terminés avant cette date ou à cette date." #. module: hr_holidays_usability #: code:addons/hr_holidays_usability/hr_holidays.py:347 #, python-format -msgid "There are not enough %s allocated for employee %s (requesting %s but only %s left)." -msgstr "There are not enough %s allocated for employee %s (requesting %s but only %s left)." +msgid "There are not enough %s allocated for employee %s (requesting %s days but only %s days left)." +msgstr "Il n'y a pas assez de %s attribués à l'employé %s (demande de %s jours mais il ne reste que %s jours)." #. module: hr_holidays_usability #: field:hr.holidays,total_allocated_leaves:0 #: field:hr.holidays.employee.counter,total_allocated_leaves:0 msgid "Total Allocated Leaves" -msgstr "Total Allocated Leaves" +msgstr "Total des congés attribués" #. module: hr_holidays_usability #: view:hr.holidays:0 msgid "Total Days of Vacation" -msgstr "Total Days of Vacation" +msgstr "Total des congés pris" #. module: hr_holidays_usability #: view:hr.holidays.employee.counter:0 msgid "Total Remaining Leaves" -msgstr "Total Remaining Leaves" +msgstr "Total des congés restants" #. module: hr_holidays_usability #: field:hr.holidays.status,vacation_compute_method:0 @@ -494,29 +494,29 @@ msgstr "Warning!" #. module: hr_holidays_usability #: model:ir.model,name:hr_holidays_usability.model_hr_holidays_mass_allocation msgid "Wizard for mass allocation of holidays" -msgstr "Wizard for mass allocation of holidays" +msgstr "Assistant pour l'attribution de congés en masse" #. module: hr_holidays_usability #: model:ir.model,name:hr_holidays_usability.model_hr_holidays_post msgid "Wizard for post holidays" -msgstr "Wizard for post holidays" +msgstr "Assistant pour la comptabilisation des congés" #. module: hr_holidays_usability #: code:addons/hr_holidays_usability/wizard/hr_holidays_mass_allocation.py:76 #, python-format msgid "You must select at least one employee." -msgstr "You must select at least one employee." +msgstr "Vous devez sélectionner au moins un employé." #. module: hr_holidays_usability #: code:addons/hr_holidays_usability/wizard/hr_holidays_mass_allocation.py:72 #, python-format msgid "You must set a value for the number of days." -msgstr "You must set a value for the number of days." +msgstr "Vous devez entrer une valeur pour le nombre de jours." #. module: hr_holidays_usability #: constraint:hr.holidays:0 msgid "error msg in raise" -msgstr "error msg in raise" +msgstr "" #. module: hr_holidays_usability #: model:ir.model,name:hr_holidays_usability.model_hr_holidays_employee_counter diff --git a/hr_holidays_usability/i18n/hr_holidays_usability.pot b/hr_holidays_usability/i18n/hr_holidays_usability.pot index 86c96e9..1ff027a 100644 --- a/hr_holidays_usability/i18n/hr_holidays_usability.pot +++ b/hr_holidays_usability/i18n/hr_holidays_usability.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-11 22:19+0000\n" -"PO-Revision-Date: 2015-06-11 22:19+0000\n" +"POT-Creation-Date: 2015-06-12 07:36+0000\n" +"PO-Revision-Date: 2015-06-12 07:36+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -24,48 +24,37 @@ msgid "\n" "

WARNING : THIS IS A TEST E-MAIL sent from a test OpenERP database (${ctx.get('dbname')}). Do not take into account !

\n" "\n" "% endif\n" -"

La ${object.type == 'remove' and 'demande' or \"demande d'ATTRIBUTION\"} de congé a été ${ctx.get('wkf_tracker') or 'ERROR'} aujourd'hui dans OpenERP par ${user.name or ''} :

\n" +"

The following ${object.type == 'remove' and 'leave request' or 'ALLOCATION request (i.e. credit of days, not debit !)'} has been ${ctx.get('wkf_tracker') or 'ERROR'} today in OpenERP by ${user.name or ''} :

\n" "\n" "\n" "\n" -"% if ctx.get('wkf_tracker') == 'soumise':\n" +"% if ctx.get('wkf_tracker') == 'submitted':\n" "% if object.type == 'remove':\n" -"

Pour la valider ou la refuser, allez dans le menu Ressources humaines > Congés > Demandes de congé à valider.

\n" +"

To validate or refuse it, go to the menu Human Resources > Leaves > Leave requests to approve.

\n" "% else:\n" -"

Pour la valider ou la refuser, allez dans le menu Ressources humaines > Congés > Demandes d'attribution de congés à valider.

\n" +"

To validate or refuse it, go to the menu Human Resources > Leaves > Allocation requests.

\n" "% endif\n" +"\n" "% endif\n" "

\n" "--
\n" -"Mail envoyé automatiquement par OpenERP. Ne pas répondre.
\n" -"Base de donnée : ${ctx.get('dbname')}
\n" +"Automatic e-mail sent by OpenERP. Do not reply.
\n" +"Database : ${ctx.get('dbname')}
\n" "

\n" "\n" "" @@ -78,7 +67,7 @@ msgstr "" #. module: hr_holidays_usability #: model:email.template,subject:hr_holidays_usability.email_template_hr_holidays -msgid "${ctx.get('dbname') and 'prod' not in ctx.get('dbname') and '[TEST]' or ''}[${object.type == 'remove' and 'Demande' or 'Attribution'} de congé ${ctx.get('wkf_tracker')}] ${object.name or ''} - ${object.employee_id.name or ''}" +msgid "${ctx.get('dbname') and 'prod' not in ctx.get('dbname') and '[TEST]' or ''}[${object.type == 'remove' and 'Leave' or 'Allocation'} ${ctx.get('wkf_tracker')}] ${object.name or ''} - ${object.employee_id.name or ''}" msgstr "" #. module: hr_holidays_usability @@ -128,6 +117,11 @@ msgstr "" msgid "Counters" msgstr "" +#. module: hr_holidays_usability +#: model:ir.model,name:hr_holidays_usability.model_hr_holidays_employee_counter +msgid "Counters for holidays of employees" +msgstr "" + #. module: hr_holidays_usability #: view:hr.holidays.mass.allocation:0 msgid "Create Allocations" @@ -168,7 +162,6 @@ msgstr "" #. module: hr_holidays_usability #: view:hr.holidays.employee.counter:0 #: field:hr.holidays.employee.counter,employee_id:0 -#: model:ir.model,name:hr_holidays_usability.model_hr_employee msgid "Employee" msgstr "" @@ -197,20 +190,6 @@ msgstr "" msgid "Enter the last day of vacation. For example, if you leave one full calendar week, the last day of vacation is Friday evening (and not Monday of the week after)" msgstr "" -#. module: hr_holidays_usability -#: code:addons/hr_holidays_usability/hr_holidays.py:237 -#: code:addons/hr_holidays_usability/hr_holidays.py:243 -#: code:addons/hr_holidays_usability/hr_holidays.py:250 -#: code:addons/hr_holidays_usability/hr_holidays.py:257 -#: code:addons/hr_holidays_usability/hr_holidays.py:263 -#: code:addons/hr_holidays_usability/hr_holidays.py:269 -#: code:addons/hr_holidays_usability/wizard/hr_holidays_mass_allocation.py:71 -#: code:addons/hr_holidays_usability/wizard/hr_holidays_mass_allocation.py:75 -#: code:addons/hr_holidays_usability/wizard/hr_holidays_post.py:84 -#, python-format -msgid "Error:" -msgstr "" - #. module: hr_holidays_usability #: selection:hr.holidays,vacation_time_to:0 msgid "Evening" @@ -303,12 +282,6 @@ msgstr "" msgid "Morning" msgstr "" -#. module: hr_holidays_usability -#: code:addons/hr_holidays_usability/wizard/hr_holidays_post.py:85 -#, python-format -msgid "No for the number of days." -msgstr "" - #. module: hr_holidays_usability #: selection:hr.holidays,vacation_time_from:0 #: selection:hr.holidays,vacation_time_to:0 @@ -348,7 +321,7 @@ msgstr "" #. module: hr_holidays_usability #: field:hr.holidays.post,before_date:0 -msgid "Select Holidays That Ended Before" +msgid "Select Leave Requests That Ended Before" msgstr "" #. module: hr_holidays_usability @@ -361,58 +334,16 @@ msgstr "" msgid "State" msgstr "" -#. module: hr_holidays_usability -#: code:addons/hr_holidays_usability/hr_holidays.py:238 -#, python-format -msgid "The first day cannot be after the last day !" -msgstr "" - -#. module: hr_holidays_usability -#: code:addons/hr_holidays_usability/hr_holidays.py:264 -#, python-format -msgid "The first day of vacation cannot be a bank holiday !" -msgstr "" - -#. module: hr_holidays_usability -#: code:addons/hr_holidays_usability/hr_holidays.py:251 -#, python-format -msgid "The first day of vacation cannot be a saturday or sunday !" -msgstr "" - -#. module: hr_holidays_usability -#: code:addons/hr_holidays_usability/hr_holidays.py:258 -#, python-format -msgid "The last day of Vacation cannot be a saturday or sunday !" -msgstr "" - -#. module: hr_holidays_usability -#: code:addons/hr_holidays_usability/hr_holidays.py:270 -#, python-format -msgid "The last day of vacation cannot be a bank holiday !" -msgstr "" - #. module: hr_holidays_usability #: sql_constraint:hr.holidays.mass.allocation:0 msgid "The number of days must be positive" msgstr "" -#. module: hr_holidays_usability -#: code:addons/hr_holidays_usability/hr_holidays.py:244 -#, python-format -msgid "The start of vacation is exactly the same as the end !" -msgstr "" - #. module: hr_holidays_usability #: help:hr.holidays.post,before_date:0 msgid "The wizard will select the validated holidays that ended before that date (including holidays that ended on that date)." msgstr "" -#. module: hr_holidays_usability -#: code:addons/hr_holidays_usability/hr_holidays.py:347 -#, python-format -msgid "There are not enough %s allocated for employee %s (requesting %s but only %s left)." -msgstr "" - #. module: hr_holidays_usability #: field:hr.holidays,total_allocated_leaves:0 #: field:hr.holidays.employee.counter,total_allocated_leaves:0 @@ -434,12 +365,6 @@ msgstr "" msgid "Vacation Compute Method" msgstr "" -#. module: hr_holidays_usability -#: code:addons/hr_holidays_usability/hr_holidays.py:346 -#, python-format -msgid "Warning!" -msgstr "" - #. module: hr_holidays_usability #: model:ir.model,name:hr_holidays_usability.model_hr_holidays_mass_allocation msgid "Wizard for mass allocation of holidays" @@ -450,25 +375,8 @@ msgstr "" msgid "Wizard for post holidays" msgstr "" -#. module: hr_holidays_usability -#: code:addons/hr_holidays_usability/wizard/hr_holidays_mass_allocation.py:76 -#, python-format -msgid "You must select at least one employee." -msgstr "" - -#. module: hr_holidays_usability -#: code:addons/hr_holidays_usability/wizard/hr_holidays_mass_allocation.py:72 -#, python-format -msgid "You must set a value for the number of days." -msgstr "" - #. module: hr_holidays_usability #: constraint:hr.holidays:0 msgid "error msg in raise" msgstr "" -#. module: hr_holidays_usability -#: model:ir.model,name:hr_holidays_usability.model_hr_holidays_employee_counter -msgid "hr.holidays.employee.counter" -msgstr "" - diff --git a/hr_holidays_usability/wizard/hr_holidays_post.py b/hr_holidays_usability/wizard/hr_holidays_post.py index f725a28..5ea79d7 100644 --- a/hr_holidays_usability/wizard/hr_holidays_post.py +++ b/hr_holidays_usability/wizard/hr_holidays_post.py @@ -30,7 +30,7 @@ class HrHolidaysPost(orm.TransientModel): _columns = { 'before_date': fields.date( - 'Select Holidays That Ended Before', required=True, + 'Select Leave Requests That Ended Before', required=True, help="The wizard will select the validated holidays " "that ended before that date (including holidays that " "ended on that date)."), @@ -82,7 +82,7 @@ class HrHolidaysPost(orm.TransientModel): if not wiz.holidays_to_post_ids: raise orm.except_orm( _('Error:'), - _('No for the number of days.')) + _('No leave request to post.')) hol_ids = self.read( cr, uid, ids[0], context=context)['holidays_to_post_ids'] self.pool['hr.holidays'].write(