From 38cbbf1e2bd2b241f98df67c334f2d5bd4f53e23 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Thu, 22 May 2025 14:56:16 +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 --- .../models/soong_workflow_inspector.py | 2 +- .../wizard/soong_workflow_comment_wizard.py | 33 +++++++++++++++---- .../soong_workflow_comment_wizard_view.xml | 3 +- .../models/yuthon_fixes_approval.py | 2 +- yuthon_hr_attendance/models/card_approval.py | 2 +- .../models/remove_holiday_approval.py | 2 +- .../models/yuthon_abnormal_approval.py | 2 +- .../models/yuthon_adjustments_approval.py | 2 +- .../models/yuthon_customer_approval.py | 2 +- .../models/yuthon_shift_approval.py | 2 +- .../models/yuthon_special_approval.py | 2 +- .../models/yuthon_onboard_approval.py | 2 +- .../models/yuthon_prepare_approval.py | 2 +- .../models/yuthon_recruitment_approval.py | 2 +- .../models/yuthon_transfer_approval.py | 2 +- .../models/yuthon_employee_approval.py | 2 +- .../models/yuthon_index_approval.py | 2 +- .../models/yuthon_plan_approval.py | 2 +- .../models/yuthon_tissue_duty_approval.py | 2 +- .../models/perperty_claim_approval.py | 2 +- .../models/property_borrowing_approval.py | 2 +- .../models/property_construction_approval.py | 2 +- .../models/property_eligibility.py | 2 +- .../models/property_intention_approval.py | 2 +- .../models/property_lease_extension.py | 2 +- .../models/property_merge_approval.py | 2 +- .../models/property_penalty_relief.py | 2 +- .../models/property_rent_relief.py | 2 +- .../models/property_rental_form.py | 2 +- .../models/property_split_approval.py | 2 +- .../models/property_transaction_confirmed.py | 2 +- .../models/property_transfer_approval.py | 2 +- .../models/yuthon_office_supplies.py | 2 +- .../models/yuthon_business_approval.py | 2 +- .../models/yuthon_care_condolences.py | 2 +- .../models/yuthon_work_condolences.py | 2 +- .../views/yuthon_business_approval_viwes.xml | 2 +- .../views/yuthon_seals_approval_views.xml | 8 ++--- yuthon_will_task/models/yuthon_will_task.py | 2 +- 39 files changed, 68 insertions(+), 48 deletions(-) diff --git a/soong_workflow/models/soong_workflow_inspector.py b/soong_workflow/models/soong_workflow_inspector.py index d6a607b9d..31f60f08e 100644 --- a/soong_workflow/models/soong_workflow_inspector.py +++ b/soong_workflow/models/soong_workflow_inspector.py @@ -12,7 +12,7 @@ class SoongWorkflowInspector(models.Model): name = fields.Char(string="标题") start_data = fields.Date(string="督办日期") end_data = fields.Date(string="完成日期") - reason = fields.Html(string="正文") + reason = fields.Text(string="正文") user_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user) department_id = fields.Many2one(related='user_id.department_id', string="部门") code = fields.Char(string="督办编号", default=lambda self: self.env['ir.sequence'].next_by_code('inspector_code')) diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index 9dd784b8d..ff17e6b54 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -45,6 +45,25 @@ class SoongWorkflowCommentWizard(models.TransientModel): string="督办人员", store=True) is_automatic = fields.Boolean('是否自动匹配') + employee_ids1 = fields.Many2many( + 'hr.employee', + 'employee_ids1_rel', + 'custom_id1', + 'employee_id1', + string="转交人员", + store=True + ) + + @api.onchange('employee_ids') + def _onchange_employee_ids(self): + if len(self.employee_ids) == 1: + self.employee_ids1 = self.employee_ids + + @api.constrains('employee_ids1') + def _check_employee_ids1(self): + if not self.employee_ids1: + raise ValidationError("必须有转交人员") + @api.depends('comment_note_id', 'comment_note') def _compute_comment(self): for record in self: @@ -85,15 +104,15 @@ class SoongWorkflowCommentWizard(models.TransientModel): if '转交' not in next_list: raise UserError('配置错误，请配置当前{}的转交按钮'.format(btn.name)) else: - if btn.is_automatic: - employee_user_role_id = self.env['hr.employee'].search( - [('user_role_id', '=', btn.users_role_id.id), - ('department_id', '=', record_id.department_id.id)]) + employee_user_role_id = self.env['hr.employee'].search( + [('user_role_id', '=', btn.users_role_id.id), + ('department_id', '=', record_id.department_id.id)]) + if employee_user_role_id: self.employee_ids = employee_user_role_id else: - employee_user_role_ids = self.env['hr.employee'].search( - [('user_role_id', '=', btn.users_role_id.id)]) - self.employee_ids = employee_user_role_ids + raise UserError('下一个流程节点没有匹配的人员，请联系管理员配置') + if btn.is_automatic: + self.employee_ids1 = employee_user_role_id @api.onchange('trans_link_id') def onchange_trans_employee_ids(self): diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml index cf6e0e92b..2cf82bc7c 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml +++ b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml @@ -48,7 +48,8 @@ - + +

当前流程是否结束，请确认

diff --git a/yuthon_holiday/models/yuthon_fixes_approval.py b/yuthon_holiday/models/yuthon_fixes_approval.py index 86d5d5c1b..694fb15d0 100644 --- a/yuthon_holiday/models/yuthon_fixes_approval.py +++ b/yuthon_holiday/models/yuthon_fixes_approval.py @@ -20,7 +20,7 @@ class YuthonFixesApproval(models.Model): is_issues = fields.Boolean(string='是否上会') issues_result = fields.Html(string="会议结果") related_issues_id = fields.Many2one('issue.library', string="关联议题") - reason_application = fields.Html(string="申请事由") + reason_application = fields.Text(string="申请事由") documents_ids = fields.Many2many('ir.attachment', string="附件") leave_id = fields.Many2one('hr.leave.allocation') active = fields.Boolean('Active', default=True, tracking=True) diff --git a/yuthon_hr_attendance/models/card_approval.py b/yuthon_hr_attendance/models/card_approval.py index 9cd257597..390a3b6cc 100644 --- a/yuthon_hr_attendance/models/card_approval.py +++ b/yuthon_hr_attendance/models/card_approval.py @@ -22,7 +22,7 @@ class CardApprovals(models.Model): is_issues = fields.Boolean(string='是否上会') issues_result = fields.Html(string="会议结果") related_issues_id = fields.Many2one('issue.library', string="关联议题") - reason_application = fields.Html(string="申请事由") + reason_application = fields.Text(string="申请事由") documents_ids = fields.Many2many('ir.attachment', string="附件") attendance_id = fields.Many2one('hr.attendance', string="补卡日期") attendance = fields.Char(string="补卡日期") diff --git a/yuthon_hr_attendance/models/remove_holiday_approval.py b/yuthon_hr_attendance/models/remove_holiday_approval.py index c8dec8da4..7174dbc65 100644 --- a/yuthon_hr_attendance/models/remove_holiday_approval.py +++ b/yuthon_hr_attendance/models/remove_holiday_approval.py @@ -18,7 +18,7 @@ class RemoveHolidayApprovals(models.Model): statu = fields.Selection([('drft', '草稿'), ('going', '执行中'), ('cancel', '已取消'), ('done', '已完成')], string="状态", default='drft') role_id = fields.Many2one('yuthon.user.role', string="岗位") - reason_application = fields.Html(string="申请事由") + reason_application = fields.Text(string="申请事由") is_issues = fields.Boolean(string='是否上会') issues_result = fields.Html(string="会议结果") related_issues_id = fields.Many2one('issue.library', string="关联议题") diff --git a/yuthon_hr_attendance/models/yuthon_abnormal_approval.py b/yuthon_hr_attendance/models/yuthon_abnormal_approval.py index 8ef62a839..e53235d73 100644 --- a/yuthon_hr_attendance/models/yuthon_abnormal_approval.py +++ b/yuthon_hr_attendance/models/yuthon_abnormal_approval.py @@ -16,7 +16,7 @@ class YuthonAbnormalApproval(models.Model): is_issues = fields.Boolean(string='是否上会') issues_result = fields.Html(string="会议结果") related_issues_id = fields.Many2one('issue.library', string="关联议题") - reason_application = fields.Html(string="申请事由") + reason_application = fields.Text(string="申请事由") documents_ids = fields.Many2many('ir.attachment', string="附件") active = fields.Boolean('Active', default=True, tracking=True) urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', diff --git a/yuthon_hr_attendance/models/yuthon_adjustments_approval.py b/yuthon_hr_attendance/models/yuthon_adjustments_approval.py index d5a93ed81..553a2fb85 100644 --- a/yuthon_hr_attendance/models/yuthon_adjustments_approval.py +++ b/yuthon_hr_attendance/models/yuthon_adjustments_approval.py @@ -16,7 +16,7 @@ class YuthonAdjustmentsApproval(models.Model): is_issues = fields.Boolean(string='是否上会') issues_result = fields.Html(string="会议结果") related_issues_id = fields.Many2one('issue.library', string="关联议题") - reason_application = fields.Html(string="申请事由") + reason_application = fields.Text(string="申请事由") replacement_data = fields.Date(string="值班时间") documents_ids = fields.Many2many('ir.attachment', string="附件") active = fields.Boolean('Active', default=True, tracking=True) diff --git a/yuthon_hr_attendance/models/yuthon_customer_approval.py b/yuthon_hr_attendance/models/yuthon_customer_approval.py index f97094033..aa7935283 100644 --- a/yuthon_hr_attendance/models/yuthon_customer_approval.py +++ b/yuthon_hr_attendance/models/yuthon_customer_approval.py @@ -17,7 +17,7 @@ class YuthonCustomerApproval(models.Model): is_issues = fields.Boolean(string='是否上会') issues_result = fields.Html(string="会议结果") related_issues_id = fields.Many2one('issue.library', string="关联议题") - reason_application = fields.Html(string="申请事由") + reason_application = fields.Text(string="申请事由") documents_ids = fields.Many2many('ir.attachment', string="附件") active = fields.Boolean('Active', default=True, tracking=True) urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', diff --git a/yuthon_hr_attendance/models/yuthon_shift_approval.py b/yuthon_hr_attendance/models/yuthon_shift_approval.py index dad9fdc49..7364c248f 100644 --- a/yuthon_hr_attendance/models/yuthon_shift_approval.py +++ b/yuthon_hr_attendance/models/yuthon_shift_approval.py @@ -25,7 +25,7 @@ class YuthonShiftApproval(models.Model): is_issues = fields.Boolean(string='是否上会') issues_result = fields.Html(string="会议结果") related_issues_id = fields.Many2one('issue.library', string="关联议题") - reason_application = fields.Html(string="申请事由") + reason_application = fields.Text(string="申请事由") documents_ids = fields.Many2many('ir.attachment', string="附件") active = fields.Boolean('Active', default=True, tracking=True) urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', diff --git a/yuthon_hr_attendance/models/yuthon_special_approval.py b/yuthon_hr_attendance/models/yuthon_special_approval.py index c62eb1605..bde5691de 100644 --- a/yuthon_hr_attendance/models/yuthon_special_approval.py +++ b/yuthon_hr_attendance/models/yuthon_special_approval.py @@ -10,7 +10,7 @@ class YuthonSpecialApproval(models.Model): users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) name = fields.Char(string="标题", readonly=False, default=lambda self: self.env.user.employee_id.resource_id.name) - reason_application = fields.Html(string="申请事由") + reason_application = fields.Text(string="申请事由") company_id = fields.Many2one('res.company', string="公司", default=lambda self: self.env.user.company_id.id) code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('special_approval')) resource_id = fields.Many2one('resource.resource', string="发起人", diff --git a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py index d7b92af3e..ac7696cb8 100644 --- a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py @@ -27,7 +27,7 @@ class YuthonOnboardApproval(models.Model): users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门") account = fields.Char(string='账号') - reason = fields.Html(string="正文") + reason = fields.Text(string="正文") work_end = fields.Boolean(string="结束") employee_id = fields.Many2one('hr.employee', string="员工姓名") bank = fields.Char(string='开户行') diff --git a/yuthon_hr_employee_approval/models/yuthon_prepare_approval.py b/yuthon_hr_employee_approval/models/yuthon_prepare_approval.py index 8cc655b77..eed44ba41 100644 --- a/yuthon_hr_employee_approval/models/yuthon_prepare_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_prepare_approval.py @@ -11,7 +11,7 @@ class YuthonPrepareApproval(models.Model): department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门") code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_prepare_approval_code')) name = fields.Char(string='标题') - reason = fields.Html(string="正文") + reason = fields.Text(string="正文") is_issues = fields.Boolean(string='是否上会') issues_result = fields.Html(string="会议结果") related_issues_id = fields.Many2one('issue.library', string="关联议题") diff --git a/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py b/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py index 70deba906..ad7132439 100644 --- a/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py @@ -12,7 +12,7 @@ class YuthonRecruitmentApproval(models.Model): name = fields.Char(string='标题') users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_recruitment_approval_code')) - reason = fields.Html(string="正文") + reason = fields.Text(string="正文") recruitment_ids = fields.One2many('hr.job', 'recruitment_approval_id', string="招聘申请") is_issues = fields.Boolean(string='是否上会') issues_result = fields.Html(string="会议结果") diff --git a/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py b/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py index 4f67a758c..e758af965 100644 --- a/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py @@ -27,7 +27,7 @@ class YutransferApproval(models.Model): notification_change_id = fields.Many2one("hr.employee", string="告知人员") handover_reason = fields.Text(string="移交原因") notice_documents_id = fields.Many2one('ir.attachment', string="附件") - reason = fields.Html(string="正文") + reason = fields.Text(string="正文") is_issues = fields.Boolean(string='是否上会') issues_result = fields.Html(string="会议结果") related_issues_id = fields.Many2one('issue.library', string="关联议题") diff --git a/yuthon_performance/models/yuthon_employee_approval.py b/yuthon_performance/models/yuthon_employee_approval.py index a4916b278..c518fb5ac 100644 --- a/yuthon_performance/models/yuthon_employee_approval.py +++ b/yuthon_performance/models/yuthon_employee_approval.py @@ -13,7 +13,7 @@ class YuthonEmployeeApproval(models.Model): dimension = fields.Char('评价维度', required=True) creation_time = fields.Datetime(string='申请日期', default=lambda self: fields.Datetime.now()) job_id = fields.Many2one('hr.job', string="岗位") - reason_text = fields.Html(string='申请事由') + reason_text = fields.Text(string='申请事由') code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('library_changes_personal_code')) change_employee_library_ids = fields.One2many("yuthon.index.employee",'change_employee_library_id',string="员工指标库库变更明细") diff --git a/yuthon_performance/models/yuthon_index_approval.py b/yuthon_performance/models/yuthon_index_approval.py index ae9a4706d..aad04c9c6 100644 --- a/yuthon_performance/models/yuthon_index_approval.py +++ b/yuthon_performance/models/yuthon_index_approval.py @@ -10,7 +10,7 @@ class YuthonIndexApproval(models.Model): name = fields.Char('标题') creation_time = fields.Datetime(string='申请日期', default=lambda self: fields.Datetime.now()) job_id = fields.Many2one('hr.job', string="岗位") - reason_text = fields.Html(string='申请事由') + reason_text = fields.Text(string='申请事由') code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('library_changes_organize_code')) change_index_library_ids = fields.One2many("yuthon.index.management",'change_index_library_id',string="组织指标库变更明细") diff --git a/yuthon_performance/models/yuthon_plan_approval.py b/yuthon_performance/models/yuthon_plan_approval.py index ee6a76ac5..2713a9914 100644 --- a/yuthon_performance/models/yuthon_plan_approval.py +++ b/yuthon_performance/models/yuthon_plan_approval.py @@ -7,6 +7,6 @@ class YuthonPlanApproval(models.Model): name = fields.Char('标题') creation_time = fields.Datetime(string='申请日期', default=lambda self: fields.Datetime.now()) job_id = fields.Many2one('hr.job', string="岗位") - reason_text = fields.Html(string='申请事由') + reason_text = fields.Text(string='申请事由') # change_plan_ids = fields.One2many("yuthon.plan.management.line",'change_plan_id',string="个人计划变更明细") diff --git a/yuthon_performance/models/yuthon_tissue_duty_approval.py b/yuthon_performance/models/yuthon_tissue_duty_approval.py index 0465313ad..f2389577a 100644 --- a/yuthon_performance/models/yuthon_tissue_duty_approval.py +++ b/yuthon_performance/models/yuthon_tissue_duty_approval.py @@ -13,7 +13,7 @@ class YuthonTissueDutyApproval(models.Model): creation_time = fields.Datetime(string='申请日期', default=lambda self: fields.Datetime.now()) code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('duty_approval_code')) job_id = fields.Many2one('hr.job', string="岗位") - reason_text = fields.Html(string='申请事由') + reason_text = fields.Text(string='申请事由') # 指标变更 change_duty_kpi_ids = fields.One2many('yuthon.kpi.line', 'change_duty_kpi_id', string="原KPI明细") diff --git a/yuthon_property_approval/models/perperty_claim_approval.py b/yuthon_property_approval/models/perperty_claim_approval.py index 197334181..7dcef8d22 100644 --- a/yuthon_property_approval/models/perperty_claim_approval.py +++ b/yuthon_property_approval/models/perperty_claim_approval.py @@ -14,7 +14,7 @@ class PropertyClaimApproval(models.Model): department_id = fields.Many2one('hr.department', string="部门") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') - reason = fields.Html(string="事由") + reason = fields.Text(string="事由") total_received = fields.Float(string='总额') work_fee = fields.Float(string='办公费') manage_fee = fields.Float(string='管理费') diff --git a/yuthon_property_approval/models/property_borrowing_approval.py b/yuthon_property_approval/models/property_borrowing_approval.py index b71aaec77..cd43f99a8 100644 --- a/yuthon_property_approval/models/property_borrowing_approval.py +++ b/yuthon_property_approval/models/property_borrowing_approval.py @@ -13,7 +13,7 @@ class PropertyBorrowingApproval(models.Model): users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) department_id = fields.Many2one('hr.department', string="部门") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') - reason = fields.Html(string="事由") + reason = fields.Text(string="事由") pay_tissue = fields.Char(string="付款组织") collection_account = fields.Char(string="收款账号") total_received = fields.Float(string='总额') diff --git a/yuthon_property_approval/models/property_construction_approval.py b/yuthon_property_approval/models/property_construction_approval.py index c46148b39..8a82345cb 100644 --- a/yuthon_property_approval/models/property_construction_approval.py +++ b/yuthon_property_approval/models/property_construction_approval.py @@ -19,7 +19,7 @@ class PropertyConstructionApproval(models.Model): project_content = fields.Char(string="工程内容") company_b_id = fields.Many2one('property.construction.unit', string="乙方") property_id = fields.Many2one('yuthon.property', string='物业') - reason = fields.Html(string="正文") + reason = fields.Text(string="正文") image = fields.Binary(string="开工前图片") contract_id = fields.Many2one('ir.attachment', string="合同") start_date = fields.Date(string="开始日期") diff --git a/yuthon_property_approval/models/property_eligibility.py b/yuthon_property_approval/models/property_eligibility.py index e5d6f42cd..8b39c260e 100644 --- a/yuthon_property_approval/models/property_eligibility.py +++ b/yuthon_property_approval/models/property_eligibility.py @@ -21,7 +21,7 @@ class PropertyEligibility(models.Model): is_issues = fields.Boolean(string='是否上会') issues_result = fields.Html(string="会议结果") related_issues_id = fields.Many2one('issue.library', string="关联议题") - reason = fields.Html(string="事由") + reason = fields.Text(string="事由") notice_documents_ids = fields.Many2many('ir.attachment', string="附件") active = fields.Boolean('Active', default=True, tracking=True) urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', diff --git a/yuthon_property_approval/models/property_intention_approval.py b/yuthon_property_approval/models/property_intention_approval.py index 1d154e4eb..12942e906 100644 --- a/yuthon_property_approval/models/property_intention_approval.py +++ b/yuthon_property_approval/models/property_intention_approval.py @@ -16,7 +16,7 @@ class PropertyIntentionApproval(models.Model): is_issues = fields.Boolean(string='是否上会') issues_result = fields.Html(string="会议结果") related_issues_id = fields.Many2one('issue.library', string="关联议题") - reason = fields.Html(string="事由") + reason = fields.Text(string="事由") notice_documents_ids = fields.Many2many('ir.attachment', string="附件") active = fields.Boolean('Active', default=True, tracking=True) intention_customer_ids = fields.One2many('property.intention.customer.line', 'property_intention_id', string="关联意向客户明细行") diff --git a/yuthon_property_approval/models/property_lease_extension.py b/yuthon_property_approval/models/property_lease_extension.py index 16b624db9..bf46cacaa 100644 --- a/yuthon_property_approval/models/property_lease_extension.py +++ b/yuthon_property_approval/models/property_lease_extension.py @@ -12,7 +12,7 @@ class PropertyLeaseExtension(models.Model): _rec_name = 'name' name = fields.Char(string='标题') - reason = fields.Html(string="正文") + reason = fields.Text(string="正文") users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门") code = fields.Char(string="编号", diff --git a/yuthon_property_approval/models/property_merge_approval.py b/yuthon_property_approval/models/property_merge_approval.py index b32e3dd6d..957ba1c6f 100644 --- a/yuthon_property_approval/models/property_merge_approval.py +++ b/yuthon_property_approval/models/property_merge_approval.py @@ -8,7 +8,7 @@ class PropertyMergeApproval(models.Model): _description = '物业合并审批' name = fields.Char(string='标题') - reason = fields.Html(string="正文") + reason = fields.Text(string="正文") notice_documents_ids = fields.Many2many('ir.attachment', string="附件") users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门") diff --git a/yuthon_property_approval/models/property_penalty_relief.py b/yuthon_property_approval/models/property_penalty_relief.py index 58764e25f..62c1ca85b 100644 --- a/yuthon_property_approval/models/property_penalty_relief.py +++ b/yuthon_property_approval/models/property_penalty_relief.py @@ -12,7 +12,7 @@ class PropertyPenaltyRelief(models.Model): _rec_name = 'name' name = fields.Char(string='标题') - reason = fields.Html(string="正文") + reason = fields.Text(string="正文") users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) department_id = fields.Many2one('hr.department', string="部门", related='users_id.employee_id.department_id') code = fields.Char(string="编号", diff --git a/yuthon_property_approval/models/property_rent_relief.py b/yuthon_property_approval/models/property_rent_relief.py index b35edb500..5fbb56e08 100644 --- a/yuthon_property_approval/models/property_rent_relief.py +++ b/yuthon_property_approval/models/property_rent_relief.py @@ -11,7 +11,7 @@ class PropertyRentRelief(models.Model): _rec_name = 'name' name = fields.Char(string='标题') - reason = fields.Html(string="正文") + reason = fields.Text(string="正文") code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_penalty_relief_code')) users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) diff --git a/yuthon_property_approval/models/property_rental_form.py b/yuthon_property_approval/models/property_rental_form.py index 49f6598a9..3ae26b273 100644 --- a/yuthon_property_approval/models/property_rental_form.py +++ b/yuthon_property_approval/models/property_rental_form.py @@ -8,7 +8,7 @@ class PropertyRentalForm(models.Model): _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] name = fields.Char(string="名称", required=True) - reason = fields.Html(string="正文") + reason = fields.Text(string="正文") documents_ids = fields.Many2many('ir.attachment', string="附件") listing_method = fields.Selection([('enterprise', '企业自挂牌'), ('makeup', '广交所挂牌')], string="挂牌方式") users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) diff --git a/yuthon_property_approval/models/property_split_approval.py b/yuthon_property_approval/models/property_split_approval.py index 3d137ddeb..433245222 100644 --- a/yuthon_property_approval/models/property_split_approval.py +++ b/yuthon_property_approval/models/property_split_approval.py @@ -21,7 +21,7 @@ class PropertySplitApproval(models.Model): issues_result = fields.Html(string="会议结果") related_issues_id = fields.Many2one('issue.library', string="关联议题") name = fields.Char(string='标题') - reason = fields.Html(string="正文") + reason = fields.Text(string="正文") notice_documents_ids = fields.Many2many('ir.attachment', string="附件") property_split_approval_line_ids = fields.One2many('property.split.approval.line', 'property_split_approval_id', string='关联物业拆分明细行') split_quantity = fields.Integer(string='拆分数量', default=2) diff --git a/yuthon_property_approval/models/property_transaction_confirmed.py b/yuthon_property_approval/models/property_transaction_confirmed.py index ae846abfc..4fc70f963 100644 --- a/yuthon_property_approval/models/property_transaction_confirmed.py +++ b/yuthon_property_approval/models/property_transaction_confirmed.py @@ -15,7 +15,7 @@ class PropertyTransactionConfirmed(models.Model): lessee_id = fields.Many2one('property.tenant.information', string='承租方') entity_type = fields.Selection([('person', '个人'), ('enterprise', '企业')], string='实体类型') details = fields.Text(string='详情') #这里可以完善承租方信息，为租赁合同服务 - reason = fields.Html(string="正文") + reason = fields.Text(string="正文") documents_ids = fields.Many2many('ir.attachment', string="附件") users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门") diff --git a/yuthon_property_approval/models/property_transfer_approval.py b/yuthon_property_approval/models/property_transfer_approval.py index 01ddbe38a..d6310ee93 100644 --- a/yuthon_property_approval/models/property_transfer_approval.py +++ b/yuthon_property_approval/models/property_transfer_approval.py @@ -17,7 +17,7 @@ class PropertyTransferApproval(models.Model): is_issues = fields.Boolean(string='是否上会') issues_result = fields.Html(string="会议结果") related_issues_id = fields.Many2one('issue.library', string="关联议题") - reason = fields.Html(string="事由") + reason = fields.Text(string="事由") notice_documents_ids = fields.Many2many('ir.attachment', string="附件") active = fields.Boolean('Active', default=True, tracking=True) rental_address = fields.Char(string="租赁地址") diff --git a/yuthon_sps_approval/models/yuthon_office_supplies.py b/yuthon_sps_approval/models/yuthon_office_supplies.py index 831805f47..fd8d0f2f5 100644 --- a/yuthon_sps_approval/models/yuthon_office_supplies.py +++ b/yuthon_sps_approval/models/yuthon_office_supplies.py @@ -13,7 +13,7 @@ class YuthonOfficeSupplies(models.Model): issues_result = fields.Html(string="会议结果") users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) department_id = fields.Many2one('hr.department', string="部门", related='users_id.employee_id.department_id') - reason_application = fields.Html(string="事由") + reason_application = fields.Text(string="事由") date = fields.Date(string="申请日期", default=fields.Date.today()) related_issues_id = fields.Many2one('issue.library', string="关联议题") office_supplies_ids = fields.One2many('yuthon.office.supplies.line', 'supplies_id', string="关联办公用品申请明细") diff --git a/yuthon_trade/models/yuthon_business_approval.py b/yuthon_trade/models/yuthon_business_approval.py index 482cfe0a7..463783ef2 100644 --- a/yuthon_trade/models/yuthon_business_approval.py +++ b/yuthon_trade/models/yuthon_business_approval.py @@ -18,7 +18,7 @@ class YuthonBusinessApproval(models.Model): is_issues = fields.Boolean(string='是否上会') issues_result = fields.Html(string="会议结果") related_issues_id = fields.Many2one('issue.library', string="关联议题") - reason = fields.Html(string="正文") + reason = fields.Text(string="正文") document_ids = fields.Many2many('ir.attachment', string="附件") active = fields.Boolean('Active', default=True, tracking=True) work_end = fields.Boolean(string="结束") diff --git a/yuthon_trade/models/yuthon_care_condolences.py b/yuthon_trade/models/yuthon_care_condolences.py index 3a2f06e9b..93830faf1 100644 --- a/yuthon_trade/models/yuthon_care_condolences.py +++ b/yuthon_trade/models/yuthon_care_condolences.py @@ -14,7 +14,7 @@ class YuthonCareCondolences(models.Model): default=lambda self: self.env['ir.sequence'].next_by_code('property_care_reward_code_sequence')) date = fields.Date(string='日期') fees = fields.Float(string='费用') - reason = fields.Html(string="正文") + reason = fields.Text(string="正文") marriage_cate_id = fields.Many2one('ir.attachment', string="结婚证明") marriage_date = fields.Date(string="结婚时间") born_cate_id = fields.Many2one('ir.attachment', string="出生证明") diff --git a/yuthon_trade/models/yuthon_work_condolences.py b/yuthon_trade/models/yuthon_work_condolences.py index dbee1d540..acf6a61f8 100644 --- a/yuthon_trade/models/yuthon_work_condolences.py +++ b/yuthon_trade/models/yuthon_work_condolences.py @@ -14,7 +14,7 @@ class YuthonWorkCondolences(models.Model): default=lambda self: self.env['ir.sequence'].next_by_code('property_work_condolences_code_sequence')) date = fields.Date(string='日期') fees = fields.Float(string='费用') - reason = fields.Html(string="正文") + reason = fields.Text(string="正文") scheme_id = fields.Many2one('ir.attachment', string="方案") meeting_id = fields.Many2one('ir.attachment', string="会议纪要") work_end = fields.Boolean(string="结束") diff --git a/yuthon_trade/views/yuthon_business_approval_viwes.xml b/yuthon_trade/views/yuthon_business_approval_viwes.xml index 5a3c784a8..3aad4f120 100644 --- a/yuthon_trade/views/yuthon_business_approval_viwes.xml +++ b/yuthon_trade/views/yuthon_business_approval_viwes.xml @@ -45,7 +45,7 @@ - + d diff --git a/yuthon_trade/views/yuthon_seals_approval_views.xml b/yuthon_trade/views/yuthon_seals_approval_views.xml index 42763f387..a2ebb5c2d 100644 --- a/yuthon_trade/views/yuthon_seals_approval_views.xml +++ b/yuthon_trade/views/yuthon_seals_approval_views.xml @@ -38,10 +38,10 @@ - - - - + + + + diff --git a/yuthon_will_task/models/yuthon_will_task.py b/yuthon_will_task/models/yuthon_will_task.py index 771c3499b..6d193a4a3 100644 --- a/yuthon_will_task/models/yuthon_will_task.py +++ b/yuthon_will_task/models/yuthon_will_task.py @@ -28,7 +28,7 @@ class YuthonWillTask(models.Model): user_role_ids = fields.Many2many('soong.user.role', string='角色', store=True, index=True) task_time_ids = fields.Many2many('yuthon.task.time', string='提醒') address = fields.Char(string='地点') - start_time = fields.Datetime(string='开始时间',default=lambda self: datetime.combine(datetime.now().date(), time(1, 0, 0))) + start_time = fields.Datetime(string='开始时间', default=fields.Datetime.now) end_time = fields.Datetime(string='结束时间') task_state = fields.Selection([('will', '待办'), ('done', '已办'), ('cancel', '取消')], default='will', string='状态', store=True)