Merge lp://qastaging/~gs.clearcorp/openerp-ccorp-addons/7.0_hr_attendance_importer into lp://qastaging/openerp-ccorp-addons/7.0
Proposed by
Glen Sojo
| Status: | Merged |
|---|---|
| Merged at revision: | 860 |
| Proposed branch: | lp://qastaging/~gs.clearcorp/openerp-ccorp-addons/7.0_hr_attendance_importer |
| Merge into: | lp://qastaging/openerp-ccorp-addons/7.0 |
| Diff against target: |
2412 lines (+2283/-0) 21 files modified
hr_attendance_importer/__init__.py (+26/-0) hr_attendance_importer/__openerp__.py (+63/-0) hr_attendance_importer/data/hr_attendance_importer_data.xml (+13/-0) hr_attendance_importer/example/template.csv (+9/-0) hr_attendance_importer/hr_attendance_importer.py (+33/-0) hr_attendance_importer/i18n/es.po (+385/-0) hr_attendance_importer/i18n/hr_attendance_importer.pot (+357/-0) hr_attendance_importer/res_company.py (+37/-0) hr_attendance_importer/res_config.py (+155/-0) hr_attendance_importer/view/hr_attendance_importer_menu.xml (+11/-0) hr_attendance_importer/view/hr_attendance_importer_view.xml (+44/-0) hr_attendance_importer/view/res_config_view.xml (+52/-0) hr_attendance_importer/wizard/__init__.py (+1/-0) hr_attendance_importer/wizard/file_import_wizard.py (+666/-0) hr_attendance_importer/wizard/wizard_view.xml (+59/-0) hr_attendance_payslip/__init__.py (+23/-0) hr_attendance_payslip/__openerp__.py (+61/-0) hr_attendance_payslip/hr_attendance_payslip.py (+177/-0) hr_attendance_payslip/i18n/es.po (+43/-0) hr_attendance_payslip/i18n/hr_attendance_payslip.pot (+43/-0) hr_attendance_payslip/view/hr_attendance_payslip_view.xml (+25/-0) |
| To merge this branch: | bzr merge lp://qastaging/~gs.clearcorp/openerp-ccorp-addons/7.0_hr_attendance_importer |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| ClearCorp drivers | Pending | ||
|
Review via email:
|
|||
Description of the change
[ADD] - Added two new modules hr_attendance_
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
