[MERGE] with trunk
[odoo/odoo.git] / addons / hr_payroll / wizard /
drwxr-xr-x   ..
-rwxr-xr-x 1176 __init__.py
-rwxr-xr-x 2802 hr_payroll_employees_detail.py
-rw-r--r-- 1764 hr_payroll_employees_detail.xml
-rwxr-xr-x 2968 hr_payroll_year_salary.py
-rw-r--r-- 1668 hr_payroll_year_salary.xml