Merge lp://qastaging/~rr.clearcorp/openerp-costa-rica/7.0-l10n_cr_hr_payroll into lp://qastaging/openerp-costa-rica
Proposed by
Ronald Rubi
| Status: | Merged |
|---|---|
| Merged at revision: | 247 |
| Proposed branch: | lp://qastaging/~rr.clearcorp/openerp-costa-rica/7.0-l10n_cr_hr_payroll |
| Merge into: | lp://qastaging/openerp-costa-rica |
| Diff against target: |
1690 lines (+784/-470) 16 files modified
l10n_cr_hr_payroll/__openerp__.py (+5/-1) l10n_cr_hr_payroll/i18n/es_CR.po (+179/-256) l10n_cr_hr_payroll/l10n_cr_hr_payroll.py (+5/-2) l10n_cr_hr_payroll/l10n_cr_hr_payroll_view.xml (+2/-4) l10n_cr_hr_payroll/report/__init__.py (+1/-0) l10n_cr_hr_payroll/report/payroll_report.mako (+117/-138) l10n_cr_hr_payroll/report/payroll_report_for_month.mako (+69/-62) l10n_cr_hr_payroll/report/report.xml (+15/-5) l10n_cr_hr_payroll/report/report_employee_by_periods.mako (+116/-0) l10n_cr_hr_payroll/report/report_employee_by_periods.py (+167/-0) l10n_cr_hr_payroll/report_menus.xml (+6/-2) l10n_cr_hr_payroll/security/ir.model.access.csv (+3/-0) l10n_cr_hr_payroll/wizard/__init__.py (+1/-0) l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard.py (+6/-0) l10n_cr_hr_payroll/wizard/report_employee_by_periods_wizard.py (+55/-0) l10n_cr_hr_payroll/wizard/report_employee_by_periods_wizard_view.xml (+37/-0) |
| To merge this branch: | bzr merge lp://qastaging/~rr.clearcorp/openerp-costa-rica/7.0-l10n_cr_hr_payroll |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| ClearCorp drivers | Pending | ||
|
Review via email:
|
|||
Description of the change
[IMP] Add report_
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
