lp://qastaging/~openerp-community/openerp-hr/7.0-modules-from-addons-hr-ng
- Get this branch:
- bzr branch lp://qastaging/~openerp-community/openerp-hr/7.0-modules-from-addons-hr-ng
Branch merges
- Maxime Chambreuil (http://www.savoirfairelinux.com): Approve (code review)
-
Diff: 27200 lines (+25658/-0)282 files modifiedhr_accrual/__init__.py (+22/-0)
hr_accrual/__openerp__.py (+54/-0)
hr_accrual/hr_accrual.py (+70/-0)
hr_accrual/hr_accrual_view.xml (+45/-0)
hr_accrual/security/ir.model.access.csv (+5/-0)
hr_contract_init/__init__.py (+22/-0)
hr_contract_init/__openerp__.py (+56/-0)
hr_contract_init/hr_contract.py (+252/-0)
hr_contract_init/hr_contract_init_workflow.xml (+61/-0)
hr_contract_init/hr_contract_view.xml (+127/-0)
hr_contract_init/security/ir.model.access.csv (+7/-0)
hr_contract_reference/__init__.py (+22/-0)
hr_contract_reference/__openerp__.py (+44/-0)
hr_contract_reference/hr_contract.py (+41/-0)
hr_contract_reference/hr_contract_sequence.xml (+15/-0)
hr_contract_reference/hr_contract_view.xml (+17/-0)
hr_contract_state/__init__.py (+22/-0)
hr_contract_state/__openerp__.py (+54/-0)
hr_contract_state/hr_contract.py (+247/-0)
hr_contract_state/hr_contract_cron.xml (+54/-0)
hr_contract_state/hr_contract_data.xml (+26/-0)
hr_contract_state/hr_contract_view.xml (+161/-0)
hr_contract_state/hr_contract_workflow.xml (+175/-0)
hr_contract_state/security/ir.model.access.csv (+3/-0)
hr_department_sequence/__init__.py (+21/-0)
hr_department_sequence/__openerp__.py (+45/-0)
hr_department_sequence/hr_department.py (+39/-0)
hr_department_sequence/hr_department_view.xml (+32/-0)
hr_emergency_contact/__init__.py (+22/-0)
hr_emergency_contact/__openerp__.py (+46/-0)
hr_emergency_contact/emergency_contact.py (+41/-0)
hr_emergency_contact/emergency_contact_view.xml (+62/-0)
hr_emergency_contact/hr.py (+50/-0)
hr_emergency_contact/hr_view.xml (+56/-0)
hr_employee_education/__init__.py (+23/-0)
hr_employee_education/__openerp__.py (+49/-0)
hr_employee_education/hr.py (+55/-0)
hr_employee_education/hr_view.xml (+81/-0)
hr_employee_education/wizard/__init__.py (+22/-0)
hr_employee_education/wizard/hr_employee_by_department.py (+95/-0)
hr_employee_education/wizard/hr_employee_by_department_view.xml (+60/-0)
hr_employee_id/__init__.py (+22/-0)
hr_employee_id/__openerp__.py (+47/-0)
hr_employee_id/hr_contract.py (+40/-0)
hr_employee_id/hr_contract_sequence.xml (+15/-0)
hr_employee_id/hr_contract_view.xml (+17/-0)
hr_employee_id/hr_employee_id.py (+93/-0)
hr_employee_id/hr_payroll_view.xml (+43/-0)
hr_employee_id/hr_view.xml (+64/-0)
hr_employee_legacy_id/__init__.py (+22/-0)
hr_employee_legacy_id/__openerp__.py (+49/-0)
hr_employee_legacy_id/hr.py (+32/-0)
hr_employee_legacy_id/hr_view.xml (+43/-0)
hr_employee_seniority/__init__.py (+22/-0)
hr_employee_seniority/__openerp__.py (+47/-0)
hr_employee_seniority/hr.py (+153/-0)
hr_employee_seniority/hr_view.xml (+38/-0)
hr_employee_state/__init__.py (+23/-0)
hr_employee_state/__openerp__.py (+54/-0)
hr_employee_state/hr.py (+436/-0)
hr_employee_state/hr_employee_data.xml (+31/-0)
hr_employee_state/hr_employee_termination_workflow.xml (+70/-0)
hr_employee_state/hr_employee_workflow.xml (+124/-0)
hr_employee_state/hr_view.xml (+175/-0)
hr_employee_state/security/ir.model.access.csv (+6/-0)
hr_employee_state/wizard/__init__.py (+22/-0)
hr_employee_state/wizard/end_contract.py (+88/-0)
hr_employee_state/wizard/end_contract_view.xml (+50/-0)
hr_family/__init__.py (+22/-0)
hr_family/__openerp__.py (+49/-0)
hr_family/hr.py (+51/-0)
hr_family/hr_view.xml (+79/-0)
hr_family/security/ir.model.access.csv (+2/-0)
hr_holidays_extension/__init__.py (+22/-0)
hr_holidays_extension/__openerp__.py (+64/-0)
hr_holidays_extension/hr_holidays.py (+313/-0)
hr_holidays_extension/hr_holidays_view.xml (+122/-0)
hr_holidays_extension/hr_holidays_workflow.xml (+119/-0)
hr_holidays_extension/security/ir.model.access.csv (+5/-0)
hr_holidays_extension/security/ir_rule.xml (+13/-0)
hr_holidays_extension/security/user_groups.xml (+15/-0)
hr_infraction/__init__.py (+23/-0)
hr_infraction/__openerp__.py (+53/-0)
hr_infraction/hr_infraction.py (+194/-0)
hr_infraction/hr_infraction_data.xml (+77/-0)
hr_infraction/hr_infraction_view.xml (+248/-0)
hr_infraction/hr_infraction_workflow.xml (+69/-0)
hr_infraction/security/ir.model.access.csv (+12/-0)
hr_infraction/wizard/__init__.py (+22/-0)
hr_infraction/wizard/action.py (+167/-0)
hr_infraction/wizard/action.xml (+51/-0)
hr_job_categories/__init__.py (+22/-0)
hr_job_categories/__openerp__.py (+51/-0)
hr_job_categories/hr.py (+118/-0)
hr_job_categories/hr_view.xml (+18/-0)
hr_job_hierarchy/__init__.py (+22/-0)
hr_job_hierarchy/__openerp__.py (+53/-0)
hr_job_hierarchy/hr.py (+209/-0)
hr_job_hierarchy/hr_view.xml (+27/-0)
hr_labour_recruitment/__init__.py (+22/-0)
hr_labour_recruitment/__openerp__.py (+52/-0)
hr_labour_recruitment/hr_recruitment.py (+291/-0)
hr_labour_recruitment/hr_recruitment_data.xml (+32/-0)
hr_labour_recruitment/hr_recruitment_view.xml (+145/-0)
hr_labour_recruitment/hr_recruitment_workflow.xml (+128/-0)
hr_labour_recruitment/security/ir.model.access.csv (+4/-0)
hr_labour_union/__init__.py (+22/-0)
hr_labour_union/__openerp__.py (+52/-0)
hr_labour_union/hr.py (+44/-0)
hr_labour_union/hr_labour_union_data.xml (+24/-0)
hr_labour_union/hr_labour_union_view.xml (+18/-0)
hr_payroll_extension/__init__.py (+22/-0)
hr_payroll_extension/__openerp__.py (+61/-0)
hr_payroll_extension/data/hr.salary.rule.csv (+13/-0)
hr_payroll_extension/data/hr_payroll_extension_data.xml (+546/-0)
hr_payroll_extension/data/leave_types.xml (+78/-0)
hr_payroll_extension/hr_payroll.py (+1514/-0)
hr_payroll_extension/hr_payroll_view.xml (+19/-0)
hr_payroll_extension/patches/hr_payroll-hr_payroll.py-patch (+32/-0)
hr_payroll_period/__init__.py (+24/-0)
hr_payroll_period/__openerp__.py (+68/-0)
hr_payroll_period/data/hr_payroll_period_data.xml (+79/-0)
hr_payroll_period/data/mail_group_data.xml (+12/-0)
hr_payroll_period/hr_attendance.py (+99/-0)
hr_payroll_period/hr_attendance_workflow.xml (+53/-0)
hr_payroll_period/hr_payroll_period.py (+808/-0)
hr_payroll_period/hr_payroll_period_cron.xml (+30/-0)
hr_payroll_period/hr_payroll_period_report.xml (+31/-0)
hr_payroll_period/hr_payroll_period_view.xml (+389/-0)
hr_payroll_period/hr_payroll_period_workflow.xml (+108/-0)
hr_payroll_period/security/ir.model.access.csv (+35/-0)
hr_payroll_period/security/ir_rule.xml (+23/-0)
hr_payroll_period/wizard/__init__.py (+22/-0)
hr_payroll_period/wizard/payroll_period_end.py (+1162/-0)
hr_payroll_period/wizard/payroll_period_end_view.xml (+155/-0)
hr_payroll_register/__init__.py (+24/-0)
hr_payroll_register/__openerp__.py (+50/-0)
hr_payroll_register/hr_payroll_register.py (+86/-0)
hr_payroll_register/hr_payroll_register_report.xml (+26/-0)
hr_payroll_register/hr_payroll_register_view.xml (+58/-0)
hr_payroll_register/report/__init__.py (+23/-0)
hr_payroll_register/report/payroll_register.py (+264/-0)
hr_payroll_register/report/payroll_summary.rml (+420/-0)
hr_payroll_register/report/payslip_report.rml (+303/-0)
hr_payroll_register/report/report_payroll_register.py (+478/-0)
hr_payroll_register/security/ir.model.access.csv (+3/-0)
hr_payroll_register/wizard/__init__.py (+22/-0)
hr_payroll_register/wizard/hr_payroll_register_run.py (+110/-0)
hr_payroll_register/wizard/hr_payroll_register_run_view.xml (+37/-0)
hr_payroll_register_report/__init__.py (+22/-0)
hr_payroll_register_report/__openerp__.py (+50/-0)
hr_payroll_register_report/hr_payroll_register_report.xml (+29/-0)
hr_payroll_register_report/report/__init__.py (+22/-0)
hr_payroll_register_report/report/payroll_register.py (+264/-0)
hr_payslip_amendment/__init__.py (+22/-0)
hr_payslip_amendment/__openerp__.py (+47/-0)
hr_payslip_amendment/hr_payslip_amendment.py (+67/-0)
hr_payslip_amendment/hr_payslip_amendment_view.xml (+61/-0)
hr_payslip_amendment/hr_payslip_amendment_workflow.xml (+80/-0)
hr_policy_absence/__init__.py (+22/-0)
hr_policy_absence/__openerp__.py (+54/-0)
hr_policy_absence/data/leave_types.xml (+99/-0)
hr_policy_absence/data/salary_rules_data.xml (+177/-0)
hr_policy_absence/hr_policy_absence.py (+99/-0)
hr_policy_absence/hr_policy_absence_view.xml (+106/-0)
hr_policy_absence/security/ir.model.access.csv (+7/-0)
hr_policy_accrual/__init__.py (+22/-0)
hr_policy_accrual/__openerp__.py (+57/-0)
hr_policy_accrual/hr_policy_accrual.py (+474/-0)
hr_policy_accrual/hr_policy_accrual_cron.xml (+18/-0)
hr_policy_accrual/hr_policy_accrual_view.xml (+208/-0)
hr_policy_accrual/security/ir.model.access.csv (+7/-0)
hr_policy_group/__init__.py (+22/-0)
hr_policy_group/__openerp__.py (+51/-0)
hr_policy_group/hr_policy_group.py (+66/-0)
hr_policy_group/hr_policy_group_view.xml (+91/-0)
hr_policy_group/security/ir.model.access.csv (+5/-0)
hr_policy_ot/__init__.py (+22/-0)
hr_policy_ot/__openerp__.py (+51/-0)
hr_policy_ot/hr_policy_ot.py (+119/-0)
hr_policy_ot/hr_policy_ot_view.xml (+117/-0)
hr_policy_ot/security/ir.model.access.csv (+9/-0)
hr_policy_presence/__init__.py (+22/-0)
hr_policy_presence/__openerp__.py (+52/-0)
hr_policy_presence/hr_policy_presence.py (+82/-0)
hr_policy_presence/hr_policy_presence_view.xml (+116/-0)
hr_policy_presence/security/ir.model.access.csv (+7/-0)
hr_public_holidays/__init__.py (+22/-0)
hr_public_holidays/__openerp__.py (+47/-0)
hr_public_holidays/hr_public_holidays.py (+83/-0)
hr_public_holidays/hr_public_holidays_view.xml (+55/-0)
hr_public_holidays/security/ir.model.access.csv (+5/-0)
hr_report_manpower/__init__.py (+23/-0)
hr_report_manpower/__openerp__.py (+49/-0)
hr_report_manpower/report/__init__.py (+22/-0)
hr_report_manpower/report/daily_manpower.py (+445/-0)
hr_report_manpower/reports.xml (+21/-0)
hr_report_manpower/wizard/__init__.py (+22/-0)
hr_report_manpower/wizard/daily_manpower.py (+44/-0)
hr_report_manpower/wizard/daily_manpower_view.xml (+41/-0)
hr_report_payroll_attendance_summary/__init__.py (+23/-0)
hr_report_payroll_attendance_summary/__openerp__.py (+51/-0)
hr_report_payroll_attendance_summary/report/__init__.py (+22/-0)
hr_report_payroll_attendance_summary/report/attendance_summary.py (+240/-0)
hr_report_payroll_attendance_summary/reports.xml (+21/-0)
hr_report_payroll_attendance_summary/wizard/__init__.py (+22/-0)
hr_report_payroll_attendance_summary/wizard/attendance_summary.py (+46/-0)
hr_report_payroll_attendance_summary/wizard/attendance_summary_view.xml (+47/-0)
hr_report_payroll_net/__init__.py (+23/-0)
hr_report_payroll_net/__openerp__.py (+49/-0)
hr_report_payroll_net/report/__init__.py (+22/-0)
hr_report_payroll_net/report/payroll_net.py (+260/-0)
hr_report_payroll_net/reports.xml (+21/-0)
hr_report_payroll_net/wizard/__init__.py (+22/-0)
hr_report_payroll_net/wizard/payroll_net.py (+43/-0)
hr_report_payroll_net/wizard/payroll_net_view.xml (+39/-0)
hr_report_turnover/__init__.py (+23/-0)
hr_report_turnover/__openerp__.py (+51/-0)
hr_report_turnover/report/__init__.py (+22/-0)
hr_report_turnover/report/employee_turnover.py (+134/-0)
hr_report_turnover/reports.xml (+21/-0)
hr_report_turnover/wizard/__init__.py (+22/-0)
hr_report_turnover/wizard/employee_turnover.py (+46/-0)
hr_report_turnover/wizard/employee_turnover_view.xml (+48/-0)
hr_schedule/__init__.py (+23/-0)
hr_schedule/__openerp__.py (+64/-0)
hr_schedule/alert_rule_data.xml (+70/-0)
hr_schedule/data/hr_schedule_data.xml (+41/-0)
hr_schedule/hr_schedule.py (+1717/-0)
hr_schedule/hr_schedule_cron.xml (+34/-0)
hr_schedule/hr_schedule_data.xml (+20/-0)
hr_schedule/hr_schedule_view.xml (+546/-0)
hr_schedule/hr_schedule_workflow.xml (+162/-0)
hr_schedule/security/ir.model.access.csv (+19/-0)
hr_schedule/security/ir_rule.xml (+22/-0)
hr_schedule/wizard/__init__.py (+25/-0)
hr_schedule/wizard/compute_alerts.py (+70/-0)
hr_schedule/wizard/compute_alerts_view.xml (+41/-0)
hr_schedule/wizard/generate_schedules.py (+91/-0)
hr_schedule/wizard/generate_schedules_view.xml (+39/-0)
hr_schedule/wizard/restday.py (+331/-0)
hr_schedule/wizard/restday_view.xml (+56/-0)
hr_schedule/wizard/validate_schedule.py (+65/-0)
hr_schedule/wizard/validate_schedule_view.xml (+37/-0)
hr_security/__init__.py (+20/-0)
hr_security/__openerp__.py (+51/-0)
hr_security/security/hr_security.xml (+33/-0)
hr_security/security/ir.model.access.csv (+2/-0)
hr_security/security/ir_rule.xml (+19/-0)
hr_simplify/__init__.py (+22/-0)
hr_simplify/__openerp__.py (+53/-0)
hr_simplify/hr_simplify.py (+162/-0)
hr_simplify/hr_simplify_view.xml (+24/-0)
hr_transfer/__init__.py (+22/-0)
hr_transfer/__openerp__.py (+52/-0)
hr_transfer/hr_transfer.py (+234/-0)
hr_transfer/hr_transfer_cron.xml (+18/-0)
hr_transfer/hr_transfer_data.xml (+26/-0)
hr_transfer/hr_transfer_view.xml (+66/-0)
hr_transfer/hr_transfer_workflow.xml (+100/-0)
hr_transfer/security/ir.model.access.csv (+3/-0)
hr_wage_increment/__init__.py (+23/-0)
hr_wage_increment/__openerp__.py (+47/-0)
hr_wage_increment/security/ir.model.access.csv (+7/-0)
hr_wage_increment/wage_adjustment_run_workflow.xml (+69/-0)
hr_wage_increment/wage_increment.py (+406/-0)
hr_wage_increment/wage_increment_view.xml (+269/-0)
hr_wage_increment/wage_increment_workflow.xml (+69/-0)
hr_wage_increment/wizard/__init__.py (+22/-0)
hr_wage_increment/wizard/wage_adjustment_by_employees.py (+90/-0)
hr_wage_increment/wizard/wage_adjustment_by_employees.xml (+35/-0)
hr_wage_increment/wizard/wage_increment.py (+71/-0)
hr_webcam/__init__.py (+22/-0)
hr_webcam/__openerp__.py (+60/-0)
hr_webcam/hr.py (+24/-0)
hr_webcam/hr_webcam.xml (+22/-0)
hr_webcam/hr_webcam_data.xml (+12/-0)
hr_webcam/hr_webcam_view.xml (+22/-0)
hr_webcam/static/src/css/hr_webcam.css (+97/-0)
hr_webcam/static/src/js/hr_webcam.js (+106/-0)
hr_webcam/static/src/js/jquery.webcam.js (+89/-0)
hr_webcam/static/src/xml/hr_webcam.xml (+13/-0)
Branch information
Recent revisions
- 67. By Maxime Chambreuil (http://www.savoirfairelinux.com)
-
[DEL] openobject-server patch
[REN] hr_payroll patch - 64. By Michael Telahun Makonnen
-
hr_schedule: add a field to schedules and schedule templates for the rest day(s)
- 63. By Michael Telahun Makonnen
-
hr_schedule: When generating schedules from the wizard, include the week number, like in the mass scheduler and the rest-day changer
- 62. By Michael Telahun Makonnen
-
hr_holiday_
extension: move declaration of leave approval group to the front of the list so it's available to the other data files - 61. By Michael Telahun Makonnen
-
hr_schedule: consolidate 'Days of the Week' list in one global array
- 60. By Michael Telahun Makonnen
-
hr_holidays_
extension: allow managers of employees and department managers to approve subordinates' leaves To achieve this I did:
o Add a new res.groups for Leave Approval rights
o Add ir.rule to allow managers to view subordinates leave requests
o New workflow that takes into account Leave Approval rightsTo allow a manager to approve subordinates' leaves you should:
o Give manager Leave Approval access rights
o Specify the employee as a department manager OR
Explicitly mark the manager as the employee's manager in the employee recordNOTE: A manager can approve anyone under him in the empoyee hierarcy. So if:
X is Y's manager and Y is Z's manager then both X and Y can approve Z's leaves - 58. By Michael Telahun Makonnen
-
Use the number of days configured in the 'initial contract values' object to calculate the trial period instead of hard-coding it
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/openerp-hr