From e2d89cef3822bb9e54c1fd8045fa1c84839343ad Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Fri, 16 May 2025 12:02:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- soong_workflow/wizard/soong_workflow_comment_wizard.py | 2 +- yuthon_salary/models/yuthon_salary_year.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index 819048919..24a56a97e 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -126,7 +126,7 @@ class SoongWorkflowCommentWizard(models.TransientModel): record_id = self.env[self.res_model].search([('id', '=', self.res_id)]) for employee in self.employee_ids: action_id = self.env['ir.actions.act_window'].search([('res_model', '=', self.res_model)])[0] - url = f'https://oa.thtzjt.com/web?oauth_access_token={employee.user_id.oauth_access_token}&oauth_uid=18562027762#id={record_id.id}&cids=2&action={action_id.id}&model={record_id._name}&view_type=form'# &menu_id={menu_id.id} + url = f'https://oa.thtzjt.com/web?oauth_access_token={employee.user_id.oauth_access_token}&oauth_uid={employee.wecom_userid}#id={record_id.id}&cids=2&action={action_id.id}&model={record_id._name}&view_type=form'# &menu_id={menu_id.id} self.sudo().env["wecom.apps"].sync_send_message_textcard(category='oa', user_id=employee.wecom_userid, title=record_id._description, diff --git a/yuthon_salary/models/yuthon_salary_year.py b/yuthon_salary/models/yuthon_salary_year.py index 26dbcfffc..3dccfbce4 100644 --- a/yuthon_salary/models/yuthon_salary_year.py +++ b/yuthon_salary/models/yuthon_salary_year.py @@ -25,7 +25,7 @@ class YuthonSalaryYear(models.Model): # 综合 sum_salary = fields.Float("应发合计", compute='_compute_company_specific_sum', store=True) buckle_salary = fields.Float(string="扣个税", compute='_compute_buckle_salary', store=True) - solid_salary = fields.Float(string="实发年终奖", compute='_compute_solid_salary', store=True) + solid_salary = fields.Float(string="实发年终奖", compute='_compute_solid_salary', store=True, digits=(16, 2)) create_date = fields.Date(string="创建日期") company_id = fields.Many2one('res.company', related="employee_id.company_id", string="公司") personal_tax = fields.Many2one('yuthon.personal.rule', string="个人所得税规则")