[MERGE]: merging from the trunk latest code
[odoo/odoo.git] / addons / hr /
drwxr-xr-x   ..
-rw-r--r-- 1122 __init__.py
-rwxr-xr-x 2050 __openerp__.py
-rw-r--r-- 1870 board_hr_view.xml
-rw-r--r-- 7572 hr.py
-rw-r--r-- 770 hr_data.xml
-rw-r--r-- 3020 hr_demo.xml
-rw-r--r-- 8484 hr_department.py
-rw-r--r-- 4217 hr_department_demo.xml
-rw-r--r-- 5461 hr_department_view.xml
-rw-r--r-- 3034 hr_installer.xml
-rw-r--r-- 19990 hr_view.xml
drwxr-xr-x - i18n
drwxr-xr-x - image
-rw-r--r-- 2935 installer.py
drwxr-xr-x - process
drwxr-xr-x - security
drwxr-xr-x - test