pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!4279 !4278 添加功能

Browse Source 
Merge pull request !4279 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-08-04 03:25:49 +00:00
committed by Gitee
parent edb420b921 6409cc5436
commit d776f7ed29
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/models/hr_attendance_month.py
+12 -12
View File
@@ -104,26 +104,26 @@ class HrAttendanceMonthDetail(models.Model):
required_attendance_days = fields.Integer(string="应出勤天数")
actual_attendance_days = fields.Integer(string="实际出勤天数")
compensatory_leave = fields.Integer(string="调休")
leave_of_absence = fields.Integer(string="事假")
leave_of_absence = fields.Integer(string="事假", digits=(16, 3))
statutory_leave = fields.Integer(string="法定假")
work_overtime = fields.Integer(string="加班")
entry_date = fields.Date(related='employee_id.entry_date', string="入职日期")
expected_date = fields.Date(string="离职日期")
cop_leave = fields.Float(string='补休')
annual_leave = fields.Float(string='年假')
duty_off_leave = fields.Float(string='值班调休')
marriage_leave = fields.Float(string='婚假')
general_off_leave = fields.Float(string='调休')
maternity_leave = fields.Float(string='产假')
paternity_leave = fields.Float(string='陪产假')
family_planning_leave = fields.Float(string='计生假')
cop_leave = fields.Float(string='补休', digits=(16, 3))
annual_leave = fields.Float(string='年假', digits=(16, 3))
duty_off_leave = fields.Integer(string='值班调休')
marriage_leave = fields.Integer(string='婚假')
general_off_leave = fields.Integer(string='调休')
maternity_leave = fields.Integer(string='产假')
paternity_leave = fields.Integer(string='陪产假')
family_planning_leave = fields.Integer(string='计生假')
bereavement_leave = fields.Float(string='丧假')
home_visit_leave = fields.Float(string='探亲假')
parents_meeting_leave = fields.Float(string='家长会假')
home_visit_leave = fields.Integer(string='探亲假')
parents_meeting_leave = fields.Integer(string='家长会假')
general_sick_leave = fields.Float(string='病假(普通)')
hospital_sick_leave = fields.Float(string='病假(住院期)')
recovery_sick_leave = fields.Float(string='病假(出院恢复期)')
exam_leave = fields.Float(string='考试假')
exam_leave = fields.Integer(string='考试假')
holiday_id = fields.Many2one('hr.leave.type', string="假期种类")
active = fields.Boolean('Active', default=True, tracking=True)
# todo 需要什么字段往上加什么
yuthon_hr_attendance/views/hr_attendance_month_views.xml
+7 -7
View File
@@ -291,11 +291,11 @@
<field name="state">code</field>
<field name="code">action = model.button_all_put()</field>
</record>
<record id="all_data_attendance_month_compute" model="ir.actions.server">
<field name="name">批量计算</field>
<field name="model_id" ref="yuthon_hr_attendance.model_hr_attendance_month_detail"/>
<field name="binding_model_id" ref="yuthon_hr_attendance.model_hr_attendance_month_detail"/>
<field name="state">code</field>
<field name="code">action = model.button_compute_all()</field>
</record>
<!-- <record id="all_data_attendance_month_compute" model="ir.actions.server">-->
<!-- <field name="name">批量计算</field>-->
<!-- <field name="model_id" ref="yuthon_hr_attendance.model_hr_attendance_month_detail"/>-->
<!-- <field name="binding_model_id" ref="yuthon_hr_attendance.model_hr_attendance_month_detail"/>-->
<!-- <field name="state">code</field>-->
<!-- <field name="code">action = model.button_compute_all()</field>-->
<!-- </record>-->
</odoo>