devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1866 from expsa/bakry_hr 

fix promotion
This commit is contained in:
bakry 2024-12-02 12:31:47 +03:00 committed by GitHub
parent 8ac246cca7 fa1d98476f
commit 6010827372
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
odex25_hr/exp_payroll_promotion/models/hr_payroll_raise.py
View File

@ -85,7 +85,7 @@ class HrPayrollRaise(models.Model):
self.next_raise_date = ndate
if self.percentage_bonus==True:
self.new_salary= round((self.current_salary*self.percentage_raises)/100+self.current_salary,0)
self.new_salary= (self.current_salary*self.percentage_raises)/100+self.current_salary
if self.employee_appraisal:
self.percentage_raises = self.employee_appraisal.level_achieved_percentage*self.scale_id.Percentage_increase

3
odex25_hr/exp_payroll_promotion/views/hr_payroll_promotion_view.xml
View File

@ -30,8 +30,7 @@
<xpath expr="//field[@name='new_degree']" position="after">
<field name="new_basic_salary" string="New Basic Salary" attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="new_salary" string="New Salary" readonly="1" force_save="1"/>
<field name="promotion_job_id" force_save="1" attrs="{'readonly':[('state','!=','draft')]}"
widget="selection"/>
<field name="promotion_job_id" force_save="1" attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="changed_job_id" readonly="1" force_save="1"
attrs="{'invisible':[('promotion_job_id', '=', False)]}"/>
<field name="promotion_seniority" attrs="{'readonly':[('state','!=','draft')]}"/>