[IMP] hr_holidays: search view for holiday per user and rename files
bzr revid: mra@tinyerp.com-20100317130209-yyy28bbpj0pa0p8x
This commit is contained in:
parent
91d8a3fe19
commit
1ca89e906d
|
@ -1,6 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
##############################################################################
|
||||
#
|
||||
#
|
||||
# OpenERP, Open Source Management Solution
|
||||
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
|
||||
#
|
||||
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
import hr
|
||||
import hr_holidays
|
||||
import report
|
||||
import wizard
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -173,7 +173,9 @@
|
|||
<search string="Search Holiday Per User">
|
||||
<group col='8' colspan='4'>
|
||||
<field name="employee_id" select='1' widget="selection"/>
|
||||
<field name="user_id" select="1" widget="selection"/>
|
||||
<field name="user_id" select="1" widget="selection">
|
||||
<filter icon="terp-partner" help="My Holidays" domain="[('user_id','=',uid)]"/>
|
||||
</field>
|
||||
<field name="holiday_status" select="1" widget="selection"/>
|
||||
</group>
|
||||
<newline/>
|
Loading…
Reference in New Issue