Skip to content

Commit

Permalink
Merge 49dee7a into 5d4f752
Browse files Browse the repository at this point in the history
  • Loading branch information
mikevhe18 committed Nov 3, 2020
2 parents 5d4f752 + 49dee7a commit db8b110
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 18 deletions.
4 changes: 2 additions & 2 deletions hr_career_transition/__openerp__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# pylint: disable=locally-disabled, manifest-required-author
{
"name": "Career Transition",
"version": "8.0.3.0.0",
"version": "8.0.4.0.0",
"category": "Human Resource",
"website": "https://opensynergy-indonesia.com",
"author": "OpenSynergy Indonesia, PT. Simetri Sinergi Indonesia",
Expand All @@ -14,7 +14,7 @@
"depends": [
"hr_career_administration_configuration_page",
"hr_contract_additional_field",
"base_sequence_configurator",
"hr_contract_sequence_configurator",
"base_workflow_policy",
"base_multiple_approval",
],
Expand Down
37 changes: 21 additions & 16 deletions hr_career_transition/models/hr_career_transition.py
Original file line number Diff line number Diff line change
Expand Up @@ -624,27 +624,32 @@ def onchange_reason_id(self):
def _prepare_new_contract(self):
self.ensure_one()
return {
# "name": "-",
"employee_id": self.employee_id.id,
"job_id": self.new_job_id and \
self.new_job_id.id or \
False,
"job_id": self.new_job_id and self.new_job_id.id or False,
"type_id": self.contract_type_id.id,
"date_start": self.contract_start_date,
"date_end": self.contract_end_date,
"working_hours": self.new_working_hour_id and \
self.new_working_hour_id.id or \
False,
"working_hours": (
self.new_working_hour_id and
self.new_working_hour_id.id or
False
),
"wage": self.new_wage,
"contract_department_id": self.new_department_id and \
self.new_department_id.id or \
False,
"parent_id": self.new_manager_id and \
self.new_manager_id.id or \
False,
"company_id": self.new_company_id and \
self.new_company_id.id or \
False,
"contract_department_id": (
self.new_department_id and
self.new_department_id.id or
False
),
"parent_id": (
self.new_manager_id and
self.new_manager_id.id or
False
),
"company_id": (
self.new_company_id and
self.new_company_id.id or
False
),
}

@api.multi
Expand Down

0 comments on commit db8b110

Please sign in to comment.