« back to all changes in this revision
Viewing changes to hr_holidays_cci/hr_holidays_wizard.xml
- Committer: Daniel Reis
- Date: 2014-01-24 10:52:47 UTC
- mfrom: (304.1.9 6.1-modules-from-other-projects)
- Revision ID: dgreis@sapo.pt-20140124105247-r4ng9h78100nlfkc
[MRG] 6.1-modules-from-other-projects (hr_skill kept unchanged on conflict resolution)
- files added:
- hr_security_ext
- hr_security_ext/security
- files removed:
- hr_holidays_cci
- hr_holidays_cci/i18n
- hr_holidays_cci/report
- hr_holidays_cci/wizard
- files renamed:
- hr_change_password/__terp__.py => hr_change_password/__openerp__.py
- hr_contract_available/__terp__.py => hr_contract_available/__openerp__.py
- hr_contract_timesheet/__terp__.py => hr_contract_timesheet/__openerp__.py
- hr_holidays_evaluation/__terp__.py => hr_holidays_evaluation/__openerp__.py
- hr_holidays_request/__terp__.py => hr_holidays_request/__openerp__.py
- hr_holidays_type/__terp__.py => hr_holidays_type/__openerp__.py
- hr_interview/__terp__.py => hr_interview/__openerp__.py
- hr_payroll_declare/__terp__.py => hr_payroll_declare/__openerp__.py
- hr_performance/__terp__.py => hr_performance/__openerp__.py
- hr_timesheet_ical/__terp__.py => hr_timesheet_ical/__openerp__.py
- files modified:
- hr_change_password/__init__.py
added
removed
hr_holidays_cci/hr_holidays_wizard.xml
