lp:~mrawi2/addons-hr-ng/7.0
- Get this branch:
- bzr branch lp:~mrawi2/addons-hr-ng/7.0
Branch merges
- Michael Telahun Makonnen: Pending requested
-
Diff: 13539 lines (+13052/-8)77 files modifiedhr_accrual/i18n/ar.po (+73/-0)
hr_accrual/i18n/en_US.po (+73/-0)
hr_accrual/i18n/hr_accrual.pot (+72/-0)
hr_contract_init/i18n/ar.po (+172/-0)
hr_contract_init/i18n/en_US.po (+172/-0)
hr_contract_init/i18n/hr_contract_init.pot (+171/-0)
hr_contract_reference/i18n/ar.po (+22/-0)
hr_contract_reference/i18n/en_US.po (+22/-0)
hr_contract_reference/i18n/hr_contract_reference.pot (+21/-0)
hr_contract_state/hr_contract_view.xml (+1/-1)
hr_contract_state/i18n/ar.po (+240/-0)
hr_contract_state/i18n/en_US.po (+240/-0)
hr_contract_state/i18n/hr_contract_state.pot (+229/-0)
hr_department_sequence/i18n/ar.po (+48/-0)
hr_department_sequence/i18n/en_US.po (+48/-0)
hr_department_sequence/i18n/hr_department_sequence.pot (+47/-0)
hr_emergency_contact/i18n/ar.po (+88/-0)
hr_emergency_contact/i18n/en_US.po (+88/-0)
hr_emergency_contact/i18n/hr_emergency_contact.pot (+87/-0)
hr_employee_education/i18n/ar.po (+140/-0)
hr_employee_education/i18n/en_US.po (+140/-0)
hr_employee_education/i18n/hr_employee_education.pot (+139/-0)
hr_employee_id/i18n/ar.po (+56/-0)
hr_employee_id/i18n/en_US.po (+56/-0)
hr_employee_id/i18n/hr_employee_id.pot (+55/-0)
hr_employee_legacy_id/i18n/ar.po (+28/-0)
hr_employee_legacy_id/i18n/en_US.po (+28/-0)
hr_employee_legacy_id/i18n/hr_employee_legacy_id.pot (+27/-0)
hr_employee_seniority/i18n/ar.po (+59/-0)
hr_employee_seniority/i18n/en_US.po (+59/-0)
hr_employee_seniority/i18n/hr_employee_seniority.pot (+55/-0)
hr_employee_state/hr_view.xml (+3/-3)
hr_employee_state/i18n/ar.po (+356/-0)
hr_employee_state/i18n/en_US.po (+357/-0)
hr_employee_state/i18n/hr_employee_state.pot (+349/-0)
hr_family/i18n/ar.po (+119/-0)
hr_family/i18n/en_US.po (+119/-0)
hr_family/i18n/hr_family.pot (+118/-0)
hr_holidays_extension/i18n/ar.po (+215/-0)
hr_holidays_extension/i18n/en_US.po (+215/-0)
hr_holidays_extension/i18n/hr_holidays_extension.pot (+196/-0)
hr_infraction/i18n/ar.po (+535/-0)
hr_infraction/i18n/en_US.po (+535/-0)
hr_infraction/i18n/hr_infraction.pot (+525/-0)
hr_job_categories/i18n/ar.po (+38/-0)
hr_job_categories/i18n/en_US.po (+38/-0)
hr_job_categories/i18n/hr_job_categories.pot (+37/-0)
hr_job_hierarchy/i18n/ar.po (+75/-0)
hr_job_hierarchy/i18n/en_US.po (+75/-0)
hr_job_hierarchy/i18n/hr_job_hierarchy.pot (+71/-0)
hr_labour_recruitment/i18n/ar.po (+343/-0)
hr_labour_recruitment/i18n/en_US.po (+350/-0)
hr_labour_recruitment/i18n/hr_labour_recruitment.pot (+341/-0)
hr_labour_union/i18n/hr_labour_union.pot (+38/-0)
hr_payroll_extension/i18n/hr_payroll_extension.pot (+126/-0)
hr_payroll_period/i18n/hr_payroll_period.pot (+1165/-0)
hr_payroll_register/i18n/hr_payroll_register.pot (+296/-0)
hr_payroll_register_report/i18n/hr_payroll_register_report.pot (+21/-0)
hr_payslip_amendment/i18n/hr_payslip_amendment.pot (+168/-0)
hr_policy_absence/i18n/hr_policy_absence.pot (+190/-0)
hr_policy_accrual/i18n/hr_policy_accrual.pot (+521/-0)
hr_policy_group/i18n/hr_policy_group.pot (+62/-0)
hr_policy_ot/i18n/hr_policy_ot.pot (+157/-0)
hr_policy_presence/i18n/hr_policy_presence.pot (+145/-0)
hr_public_holidays/i18n/hr_public_holidays.pot (+68/-0)
hr_report_manpower/i18n/hr_report_manpower.pot (+48/-0)
hr_report_payroll_attendance_summary/i18n/hr_report_payroll_attendance_summary.pot (+64/-0)
hr_report_payroll_net/i18n/hr_report_payroll_net.pot (+48/-0)
hr_report_turnover/i18n/hr_report_turnover.pot (+64/-0)
hr_schedule/hr_schedule_view.xml (+2/-3)
hr_schedule/i18n/hr_schedule.pot (+1301/-0)
hr_security/i18n/hr_security.pot (+47/-0)
hr_simplify/i18n/hr_simplify.pot (+44/-0)
hr_transfer/hr_transfer_view.xml (+1/-1)
hr_transfer/i18n/hr_transfer.pot (+216/-0)
hr_wage_increment/i18n/hr_wage_increment.pot (+433/-0)
hr_webcam/i18n/hr_webcam.pot (+61/-0)
Related source package recipes
Branch information
Recent revisions
- 148. By Mustafa Rawi
-
Moved statusbar out of sheet to its usual place.
Added some language templates and translations to en_US and ar_EG (ar.po) - 145. By Michael Telahun Makonnen
-
Oiy! Remove work in progress that was accidentally committed with a previous change.
- 144. By Michael Telahun Makonnen
-
hr_payroll_period: add a calculated field showing the number of payroll periods in a year for a given pay period type
- 143. By Michael Telahun Makonnen
-
hr_employee_
seniority: round length of employment to 2 decimal places - 142. By Michael Telahun Makonnen
-
hr_payroll_
register: modify summary to also include calculated salary; also, make it landscape orientation - 141. By Michael Telahun Makonnen
-
hr_payroll_
register_ report: use calculated basic salary in the salary column instead of contract.wage The calculated basic takes into account multiple, consecutive contracts with different wages and
the cases where an employee's contract applies only partially to the payroll period. In these
cases the calculated salary is the correct value to put in this column for the purposes of
calculating taxes, etc. - 140. By Michael Telahun Makonnen
-
hr_holidays: if we can't find a schedule for an employee don't insist on using midnight as the start/end time
Let the user edit it any way s/he wants.
- 139. By Michael Telahun Makonnen
-
Bugfix: hr_payroll_period: Use correct variables when calculating the duration of an employee's contracts within a payroll period
Because we were using the wrong variables (the current contract instead of the earliest and the latest)
we were using the start/end dates of the last contract created for the employee. This appeared to be
working up to now because in 99.999% of cases the last contract created is the one that usually applies.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:addons-hr-ng
