Elabore/odoo-usability
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename fields and update translation

Browse Source
This commit is contained in:
Alexis de Lattre
2015-06-19 18:56:27 +02:00
parent b2a0e44121
commit b2a259308d
4 changed files with 56 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
hr_holidays_usability/i18n/fr.po
View File

@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-06-19 16:26+0000\n"
"PO-Revision-Date: 2015-06-19 16:26+0000\n"
"POT-Creation-Date: 2015-06-19 16:47+0000\n"
"PO-Revision-Date: 2015-06-19 16:47+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -182,7 +182,7 @@ msgstr "Compteurs"
#. module: hr_holidays_usability
#: model:ir.model,name:hr_holidays_usability.model_hr_holidays_employee_counter
msgid "Counters for holidays of employees"
msgstr "Compteurs pour les congés des employés"
msgstr "Counters for holidays of employees"
#. module: hr_holidays_usability
#: view:hr.holidays.mass.allocation:0
@@ -190,26 +190,15 @@ msgid "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 "Congés pris"
#. module: hr_holidays_usability
#: field:hr.holidays.employee.counter,current_leaves_taken_posted:0
msgid "Current Leaves Taken Posted"
msgstr "Congés pris comptabilisés"
#: field:hr.holidays.employee.counter,leaves_validated_current:0
msgid "Current Leaves Validated"
msgstr "Congés validés"
#. module: hr_holidays_usability
#: field:hr.holidays,current_remaining_leaves:0
#: field:hr.holidays.employee.counter,current_leaves_remaining:0
#: field:hr.holidays.employee.counter,leaves_remaining_current:0
msgid "Current Remaining Leaves"
msgstr "Congés restants"
#. module: hr_holidays_usability
#: field:hr.holidays.employee.counter,current_leaves_remaining_posted:0
msgid "Current Remaining Leaves Posted"
msgstr "Congés restants comptabilisés"
msgstr "Solde de congés"
#. module: hr_holidays_usability
#: field:res.company,mass_allocation_default_holiday_status_id:0
@@ -352,6 +341,11 @@ msgstr "Congés"
msgid "Leaves Calendar"
msgstr "Calendrier des absences"
#. module: hr_holidays_usability
#: field:hr.holidays.employee.counter,leaves_validated_posted:0
msgid "Leaves Posted"
msgstr "Congés comptabilisés"
#. module: hr_holidays_usability
#: 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
@@ -411,6 +405,11 @@ msgstr "Comptabiliser les congés"
msgid "Posted Date"
msgstr "Date de comptabilisation"
#. module: hr_holidays_usability
#: field:hr.holidays.employee.counter,leaves_remaining_posted:0
msgid "Posted Remaining Leaves"
msgstr "Solde de congés comptabilisés"
#. module: hr_holidays_usability
#: field:hr.holidays.post,before_date:0
msgid "Select Leave Requests That Ended Before"
@@ -491,13 +490,13 @@ msgstr "Total des congés pris"
#. module: hr_holidays_usability
#: view:hr.holidays.employee.counter:0
msgid "Total Remaining Leaves"
msgstr "Total des congés restants"
msgid "Total Posted Remaining Leaves"
msgstr "Total du solde de congés comptabilisés"
#. module: hr_holidays_usability
#: view:hr.holidays.employee.counter:0
msgid "Total Remaining and Posted Leaves"
msgstr "Total des congés restants comptabilisés"
msgid "Total Remaining Leaves"
msgstr "Total du solde de congés"
#. module: hr_holidays_usability
#: field:hr.holidays.status,vacation_compute_method:0
@@ -508,7 +507,7 @@ msgstr "Méthode de calcul des jours de congé"
#: code:addons/hr_holidays_usability/hr_holidays.py:346
#, python-format
msgid "Warning!"
msgstr "Attention !"
msgstr "Warning!"
#. module: hr_holidays_usability
#: model:ir.model,name:hr_holidays_usability.model_hr_holidays_mass_allocation

35
hr_holidays_usability/i18n/hr_holidays_usability.pot
View File

@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-06-19 16:24+0000\n"
"PO-Revision-Date: 2015-06-19 16:24+0000\n"
"POT-Creation-Date: 2015-06-19 16:47+0000\n"
"PO-Revision-Date: 2015-06-19 16:47+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -139,27 +139,16 @@ msgid "Create Allocations"
msgstr ""
#. 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 ""
#. module: hr_holidays_usability
#: field:hr.holidays.employee.counter,current_leaves_taken_posted:0
msgid "Current Leaves Taken Posted"
#: field:hr.holidays.employee.counter,leaves_validated_current:0
msgid "Current Leaves Validated"
msgstr ""
#. module: hr_holidays_usability
#: field:hr.holidays,current_remaining_leaves:0
#: field:hr.holidays.employee.counter,current_leaves_remaining:0
#: field:hr.holidays.employee.counter,leaves_remaining_current:0
msgid "Current Remaining Leaves"
msgstr ""
#. module: hr_holidays_usability
#: field:hr.holidays.employee.counter,current_leaves_remaining_posted:0
msgid "Current Remaining Leaves Posted"
msgstr ""
#. module: hr_holidays_usability
#: field:res.company,mass_allocation_default_holiday_status_id:0
msgid "Default Leave Type for Mass Allocation"
@@ -301,6 +290,11 @@ msgstr ""
msgid "Leaves Calendar"
msgstr ""
#. module: hr_holidays_usability
#: field:hr.holidays.employee.counter,leaves_validated_posted:0
msgid "Leaves Posted"
msgstr ""
#. module: hr_holidays_usability
#: 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
@@ -360,6 +354,11 @@ msgstr ""
msgid "Posted Date"
msgstr ""
#. module: hr_holidays_usability
#: field:hr.holidays.employee.counter,leaves_remaining_posted:0
msgid "Posted Remaining Leaves"
msgstr ""
#. module: hr_holidays_usability
#: field:hr.holidays.post,before_date:0
msgid "Select Leave Requests That Ended Before"
@@ -440,12 +439,12 @@ msgstr ""
#. module: hr_holidays_usability
#: view:hr.holidays.employee.counter:0
msgid "Total Remaining Leaves"
msgid "Total Posted Remaining Leaves"
msgstr ""
#. module: hr_holidays_usability
#: view:hr.holidays.employee.counter:0
msgid "Total Remaining and Posted Leaves"
msgid "Total Remaining Leaves"
msgstr ""
#. module: hr_holidays_usability

20
hr_holidays_usability/report/hr_holidays_employee_counter.py
View File

@@ -35,11 +35,11 @@ class HrHolidaysEmployeeCounter(orm.Model):
'employee_id': fields.many2one('hr.employee', "Employee"),
'holiday_status_id': fields.many2one(
"hr.holidays.status", "Leave Type"),
'current_leaves_taken': fields.float('Current Leaves Taken'),
'current_leaves_taken_posted': fields.float('Current Leaves Taken Posted'),
'current_leaves_remaining': fields.float('Current Remaining Leaves'),
'current_leaves_remaining_posted': fields.float('Current Remaining Leaves Posted'),
'total_allocated_leaves': fields.float('Total Allocated Leaves'),
'leaves_validated_current': fields.float('Current Leaves Validated'),
'leaves_validated_posted': fields.float('Leaves Posted'),
'leaves_remaining_current': fields.float('Current Remaining Leaves'),
'leaves_remaining_posted': fields.float('Posted Remaining Leaves'),
'allocated_leaves': fields.float('Allocated Leaves'),
}
def init(self, cr):
@@ -54,23 +54,23 @@ class HrHolidaysEmployeeCounter(orm.Model):
CASE WHEN hh.type='remove'
THEN hh.number_of_days * -1
ELSE 0
END) AS current_leaves_taken,
END) AS leaves_validated_current,
sum(
CASE WHEN hh.type='remove' AND hh.posted_date IS NOT null
THEN hh.number_of_days * -1
ELSE 0
END) AS current_leaves_taken_posted,
sum(hh.number_of_days) AS current_leaves_remaining,
END) AS leaves_validated_posted,
sum(hh.number_of_days) AS leaves_remaining_current,
sum(
CASE WHEN (hh.type='remove' AND hh.posted_date IS NOT null) OR hh.type='add'
THEN hh.number_of_days
ELSE 0
END) as current_leaves_remaining_posted,
END) as leaves_remaining_posted,
sum(
CASE WHEN hh.type = 'add'
THEN hh.number_of_days
ELSE 0
END) AS total_allocated_leaves
END) AS allocated_leaves
FROM
hr_holidays hh
JOIN hr_holidays_status hhs

12
hr_holidays_usability/report/hr_holidays_employee_counter_view.xml
View File

@@ -10,12 +10,12 @@
<field name="employee_id"
invisible="not context.get('hr_holidays_employee_counter_tree_main_view')"/>
<field name="holiday_status_id"/>
<field name="total_allocated_leaves"/>
<field name="current_leaves_taken"/>
<field name="current_leaves_taken_posted"/>
<field name="current_leaves_remaining" sum="Total Remaining Leaves"/>
<field name="current_leaves_remaining_posted"
sum="Total Remaining and Posted Leaves"/>
<field name="allocated_leaves"/>
<field name="leaves_validated_current"/>
<field name="leaves_validated_posted"/>
<field name="leaves_remaining_current"/>
<field name="leaves_remaining_posted"
sum="Total Posted Remaining Leaves"/>
</tree>
</field>
</record>