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

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>