[MERGE] merge with payroll branch
[odoo/odoo.git] / addons / analytic /
drwxr-xr-x   ..
-rw-r--r-- 1072 __init__.py
-rw-r--r-- 1841 __openerp__.py
-rw-r--r-- 14610 analytic.py
drwxr-xr-x - i18n
drwxr-xr-x - security