diff options
| author | mra (Open ERP) <mra@tinyerp.com> | 2010-05-24 10:10:02 +0530 |
|---|---|---|
| committer | mra (Open ERP) <mra@tinyerp.com> | 2010-05-24 10:10:02 +0530 |
| commit | dd874eb878144e42c75603eb1e7fecf68d714f05 (patch) | |
| tree | 4880a7ea4cc55cd87e85ecd603544d44969b3898 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | b00423ca931b04141e632eb3fb5387fd81f08e84 (diff) | |
| parent | 96c656ba20a953324b1361d42182846cccde06f8 (diff) | |
[MERGE] Merge with trunk addons branch (Remove conflicts for hr_holidays report, project and hr_timesheet_sheet report)
bzr revid: mra@tinyerp.com-20100524044002-3r81xso5ljy1qkkw
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions