Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
pengyuthon
2026-02-08 22:49:10 +08:00
@@ -9,8 +9,10 @@ class YuthonMedicalManage(models.Model):
_description = '体检费管理'
employee_id = fields.Many2one('hr.employee', string="员工姓名")
start_date = fields.Date(string='开始日期')
year = fields.Char(string="年份")
current_year_remaining = fields.Float(string="本年剩余", compute="_compute_current_year_remaining")
remainder_the_year = fields.Float(string="本年剩余")
last_year_quota = fields.Float(string="去年额度")
last_year_used = fields.Float(string="去年使用", compute="_compute_last_year_used")
last_year_remaining = fields.Float(string="去年剩余")
@@ -26,6 +28,14 @@ class YuthonMedicalManage(models.Model):
for record in self:
record.current_year_remaining = record.this_year_quota + record.last_year_balance - record.this_year_usage
def update_remainder_the_year(self):
soong_ids = self.env["yuthon.medical.manage"].browse(
self._context.get('active_ids', self._context.get('active_id')))
for soong_id in soong_ids:
soong_id.remainder_the_year = soong_id.this_year_quota + soong_id.last_year_balance - soong_id.this_year_usage
if soong_id.year:
soong_id.start_date = f"{soong_id.year}-01-01"
@api.depends('employee_id', 'year')
def _compute_last_year_used(self):
if not self:
@@ -119,6 +129,8 @@ class YuthonMedicalManage(models.Model):
this_year_quota = self._calculate_medical_quota(employee, current_year)
medical_manage_rec.write({'this_year_quota': this_year_quota,
})
medical_manage_rec.remainder_the_year = medical_manage_rec.this_year_quota + medical_manage_rec.last_year_balance - medical_manage_rec.this_year_usage
medical_manage_rec.start_date = current_date
# 回填上年数据
last_year_rec = self.env['yuthon.medical.manage'].search([