From c51fc012869693c23bdd905dd74c8527e7b12386 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 7 Apr 2010 14:23:31 +0200 Subject: [PATCH 1/6] [IMP] HR misc bzr revid: fp@tinyerp.com-20100407122331-9qu8o6n1yz6bvex1 --- addons/hr/hr_view.xml | 2 +- addons/hr_expense/hr_expense_view.xml | 1 - addons/hr_holidays/hr_holidays_report.xml | 96 ++++--------------- .../hr_holidays/report/available_holidays.py | 33 ------- addons/hr_recruitment/hr_recruitment_view.xml | 22 ++--- 5 files changed, 29 insertions(+), 125 deletions(-) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 057d049af9c..69ce433e0af 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -332,7 +332,7 @@ - + diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index 49a7d83d239..95d6ce77ae3 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -67,7 +67,6 @@
- diff --git a/addons/hr_holidays/hr_holidays_report.xml b/addons/hr_holidays/hr_holidays_report.xml index 66669bd2f51..165b54c72f0 100644 --- a/addons/hr_holidays/hr_holidays_report.xml +++ b/addons/hr_holidays/hr_holidays_report.xml @@ -1,85 +1,23 @@ - - + + + + - - - - - - hr.holidays.report.tree - hr.holidays.report - tree - - - - - - - - - - - hr.holidays.report.form - hr.holidays.report - form - - - - - - - - - - hr.holiday.report.graph - hr.holidays.report - graph - - - - - - - - - - - Available Holidays - hr.holidays.report - form - tree,graph - - - - - - - tree - - - - - - - - graph - - - - - - - - - + diff --git a/addons/hr_holidays/report/available_holidays.py b/addons/hr_holidays/report/available_holidays.py index 259aea0dec9..e69de29bb2d 100644 --- a/addons/hr_holidays/report/available_holidays.py +++ b/addons/hr_holidays/report/available_holidays.py @@ -1,33 +0,0 @@ -from osv import fields,osv -import tools - -class hr_holidays_report(osv.osv): - _name = "hr.holidays.report" - _auto = False - _columns = { - 'employee_id': fields.many2one ('hr.employee', 'Employee', readonly=True), - 'holiday_status_id': fields.many2one('hr.holidays.status', 'Leave Type', readonly=True), - # 'max_leave': fields.float('Allocated Leaves', readonly=True), -# 'taken_leaves': fields.float('Taken Leaves', readonly=True), - 'remaining_leave': fields.float('Remaining Leaves',readonly=True), - } - def init(self, cr): - tools.drop_view_if_exists(cr, 'hr_holidays_report') - cr.execute(""" - create or replace view hr_holidays_report as ( - select - min(h.id) as id, - h.employee_id as employee_id, - h.holiday_status_id as holiday_status_id, - sum(number_of_days) as remaining_leave - from - hr_holidays h - left join hr_holidays_status s on (s.id = h.holiday_status_id) - where h.state = 'validate' - and h.employee_id is not null - and s.active <> 'f' - group by h.holiday_status_id, h.employee_id - )""") -hr_holidays_report() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 0d9fa7ec72d..83b71c05432 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -79,15 +79,15 @@