fix some bugs
This commit is contained in:
parent
ffd9da8577
commit
df76cf96cf
|
|
@ -265,7 +265,7 @@ class EmployeesAppraisal(models.Model):
|
||||||
item.totals_great_level = 0
|
item.totals_great_level = 0
|
||||||
item.totals_level_achieved = 0
|
item.totals_level_achieved = 0
|
||||||
item.totals_level_achieved_percentage = 0
|
item.totals_level_achieved_percentage = 0
|
||||||
item.totals_appraisal_result = 0
|
item.totals_appraisal_result = False
|
||||||
for element in item.appraisal_id:
|
for element in item.appraisal_id:
|
||||||
count_elment = 0
|
count_elment = 0
|
||||||
appraisal_result_list = []
|
appraisal_result_list = []
|
||||||
|
|
|
||||||
|
|
@ -162,6 +162,8 @@ class Employee(models.Model):
|
||||||
employee.leave_date_to = leave_data.get(employee.id, {}).get('leave_date_to')
|
employee.leave_date_to = leave_data.get(employee.id, {}).get('leave_date_to')
|
||||||
employee.current_leave_state = leave_data.get(employee.id, {}).get('current_leave_state')
|
employee.current_leave_state = leave_data.get(employee.id, {}).get('current_leave_state')
|
||||||
employee.current_leave_id = leave_data.get(employee.id, {}).get('current_leave_id')
|
employee.current_leave_id = leave_data.get(employee.id, {}).get('current_leave_id')
|
||||||
|
# Assign is_absent for compatibility with standard hr_holidays module
|
||||||
|
employee.is_absent = leave_data.get(employee.id) and leave_data.get(employee.id).get('current_leave_state') == 'validate'
|
||||||
|
|
||||||
def _compute_leaves_count(self):
|
def _compute_leaves_count(self):
|
||||||
leaves = self.env['hr.holidays'].read_group([
|
leaves = self.env['hr.holidays'].read_group([
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -9,7 +9,7 @@ from datetime import datetime, date, time
|
||||||
|
|
||||||
class HrSalaryAdvance(models.Model):
|
class HrSalaryAdvance(models.Model):
|
||||||
_name = 'hr.loan.salary.advance'
|
_name = 'hr.loan.salary.advance'
|
||||||
_rec_name = 'employee_id'
|
_rec_name = 'code'
|
||||||
_description = 'Employee Loan'
|
_description = 'Employee Loan'
|
||||||
_inherit = ['mail.thread', 'mail.activity.mixin']
|
_inherit = ['mail.thread', 'mail.activity.mixin']
|
||||||
_order = 'date DESC'
|
_order = 'date DESC'
|
||||||
|
|
|
||||||
|
|
@ -122,11 +122,6 @@
|
||||||
</notebook>
|
</notebook>
|
||||||
</sheet>
|
</sheet>
|
||||||
<chatter reload_on_follower="True" />
|
<chatter reload_on_follower="True" />
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</form>
|
</form>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
|
||||||
|
|
@ -54,8 +54,7 @@
|
||||||
</page>
|
</page>
|
||||||
</notebook>
|
</notebook>
|
||||||
</sheet>
|
</sheet>
|
||||||
<chatter reload_on_follower="True"/>
|
<chatter />
|
||||||
<!-- <chatter/>-->
|
|
||||||
</form>
|
</form>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue