From 1ca89e906dbb5ca09214a6271298ee75d2a9db27 Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Wed, 17 Mar 2010 18:32:09 +0530 Subject: [PATCH] [IMP] hr_holidays: search view for holiday per user and rename files bzr revid: mra@tinyerp.com-20100317130209-yyy28bbpj0pa0p8x --- addons/hr_holidays/__init__.py | 6 +++--- addons/hr_holidays/__terp__.py | 4 ++-- addons/hr_holidays/{hr.py => hr_holidays.py} | 0 addons/hr_holidays/{hr_view.xml => hr_holidays_view.xml} | 4 +++- .../{hr_workflow.xml => hr_holidays_workflow.xml} | 0 5 files changed, 8 insertions(+), 6 deletions(-) rename addons/hr_holidays/{hr.py => hr_holidays.py} (100%) rename addons/hr_holidays/{hr_view.xml => hr_holidays_view.xml} (99%) rename addons/hr_holidays/{hr_workflow.xml => hr_holidays_workflow.xml} (100%) diff --git a/addons/hr_holidays/__init__.py b/addons/hr_holidays/__init__.py index 441f7d252a9..9fc701068ef 100644 --- a/addons/hr_holidays/__init__.py +++ b/addons/hr_holidays/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,11 +15,11 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## -import hr +import hr_holidays import report import wizard # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py index 2a8f07c58bb..3ff2df69bf9 100644 --- a/addons/hr_holidays/__terp__.py +++ b/addons/hr_holidays/__terp__.py @@ -51,8 +51,8 @@ 'init_xml': [], 'update_xml': [ 'security/ir.model.access.csv', - 'hr_workflow.xml', - 'hr_view.xml', + 'hr_holidays_workflow.xml', + 'hr_holidays_view.xml', 'hr_holidays_report.xml', 'hr_holidays_wizard.xml', #'process/hr_holidays_process.xml' diff --git a/addons/hr_holidays/hr.py b/addons/hr_holidays/hr_holidays.py similarity index 100% rename from addons/hr_holidays/hr.py rename to addons/hr_holidays/hr_holidays.py diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_holidays_view.xml similarity index 99% rename from addons/hr_holidays/hr_view.xml rename to addons/hr_holidays/hr_holidays_view.xml index 4b8afe21a93..a01847cb7cc 100644 --- a/addons/hr_holidays/hr_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -173,7 +173,9 @@ - + + + diff --git a/addons/hr_holidays/hr_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml similarity index 100% rename from addons/hr_holidays/hr_workflow.xml rename to addons/hr_holidays/hr_holidays_workflow.xml