diff --git a/soong_workflow/models/soong_workflow_entrust.py b/soong_workflow/models/soong_workflow_entrust.py index ac1100a9a..500fadba4 100644 --- a/soong_workflow/models/soong_workflow_entrust.py +++ b/soong_workflow/models/soong_workflow_entrust.py @@ -124,7 +124,7 @@ class SoongWorkflowEntrust(models.Model): class EntrustAll(models.Model): _name = "entrust.all" - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _description = "全部流程" name = fields.Char(string='name') diff --git a/yuthon_holiday/models/yuthon_fixes_approval.py b/yuthon_holiday/models/yuthon_fixes_approval.py index 9439b14d8..f160934a4 100644 --- a/yuthon_holiday/models/yuthon_fixes_approval.py +++ b/yuthon_holiday/models/yuthon_fixes_approval.py @@ -5,7 +5,7 @@ from odoo import models, fields, api class YuthonFixesApproval(models.Model): _name = 'yuthon.fixes.approval' _description = '假期修正审批' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] yuthon_company = fields.Selection(related='users_id.employee_id.yuthon_company', string="公司") name = fields.Char(string="标题") diff --git a/yuthon_hr_attendance/models/attendance_scheme.py b/yuthon_hr_attendance/models/attendance_scheme.py index e8497d113..48157e01a 100644 --- a/yuthon_hr_attendance/models/attendance_scheme.py +++ b/yuthon_hr_attendance/models/attendance_scheme.py @@ -4,7 +4,7 @@ from odoo import api, fields, models, tools class AttendanceScheme(models.Model): _name = 'attendance.scheme' _description = '考勤方案' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名称', required=True) employee_name = fields.Char(string='姓名', required=True) diff --git a/yuthon_hr_attendance/models/yuthon_abnormal_approval.py b/yuthon_hr_attendance/models/yuthon_abnormal_approval.py index 20adb7ead..75c3bcf21 100644 --- a/yuthon_hr_attendance/models/yuthon_abnormal_approval.py +++ b/yuthon_hr_attendance/models/yuthon_abnormal_approval.py @@ -5,7 +5,7 @@ from odoo.exceptions import UserError class YuthonAbnormalApproval(models.Model): _name = 'yuthon.abnormal.approval' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _description = '值班补卡审批' _rec_name = 'name' diff --git a/yuthon_hr_attendance/models/yuthon_adjustments_approval.py b/yuthon_hr_attendance/models/yuthon_adjustments_approval.py index cd9ec5940..3e66b7e61 100644 --- a/yuthon_hr_attendance/models/yuthon_adjustments_approval.py +++ b/yuthon_hr_attendance/models/yuthon_adjustments_approval.py @@ -5,7 +5,7 @@ from odoo.exceptions import UserError class YuthonAdjustmentsApproval(models.Model): _name = 'yuthon.adjustments.approval' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _description = '值班调休审批' _rec_name = 'name' diff --git a/yuthon_hr_attendance/models/yuthon_shift_approval.py b/yuthon_hr_attendance/models/yuthon_shift_approval.py index 9794621df..c8eb5d435 100644 --- a/yuthon_hr_attendance/models/yuthon_shift_approval.py +++ b/yuthon_hr_attendance/models/yuthon_shift_approval.py @@ -5,7 +5,7 @@ from odoo.exceptions import UserError class YuthonShiftApproval(models.Model): _name = 'yuthon.shift.approval' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _description = '值班换班审批' yuthon_company = fields.Selection(related='users_id.employee_id.yuthon_company', string="公司") diff --git a/yuthon_hr_employee_approval/__manifest__.py b/yuthon_hr_employee_approval/__manifest__.py index 8f948a7aa..c19e55ee2 100644 --- a/yuthon_hr_employee_approval/__manifest__.py +++ b/yuthon_hr_employee_approval/__manifest__.py @@ -11,7 +11,8 @@ 'license': 'LGPL-3', 'author': 'pengyuthon', 'website': 'https://www.pengyuthon.com', - 'depends': ['base', 'hr', 'yuthon_hr_employee', 'soong_workflow', 'documents', 'hr_recruitment', 'room','yuthon_issue'], + 'depends': ['base', 'hr', 'yuthon_hr_employee', 'soong_workflow', 'documents', 'hr_recruitment', + 'room', 'yuthon_issue', 'mail'], 'data': [ 'security/ir.model.access.csv', 'data/process_code_data.xml', diff --git a/yuthon_hr_employee_approval/models/yuthon_account_approval.py b/yuthon_hr_employee_approval/models/yuthon_account_approval.py index 327b247ad..8340934ce 100644 --- a/yuthon_hr_employee_approval/models/yuthon_account_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_account_approval.py @@ -4,7 +4,7 @@ from odoo import models, fields, api class YuthonAccountApproval(models.Model): _name = 'yuthon.account.approval' _description = '薪资核算申请表' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名称') code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_account_approval_code')) diff --git a/yuthon_hr_employee_approval/models/yuthon_appointment_approval.py b/yuthon_hr_employee_approval/models/yuthon_appointment_approval.py index f763e4d3e..06dcb5be8 100644 --- a/yuthon_hr_employee_approval/models/yuthon_appointment_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_appointment_approval.py @@ -5,7 +5,7 @@ from odoo.exceptions import UserError class YuthonAppointmentApproval(models.Model): _name = 'yuthon.appointment.approval' _description = '职称聘任申请表' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_appointment_approval_code')) diff --git a/yuthon_hr_employee_approval/models/yuthon_enrollment_approval.py b/yuthon_hr_employee_approval/models/yuthon_enrollment_approval.py index 791447b49..10322c58e 100644 --- a/yuthon_hr_employee_approval/models/yuthon_enrollment_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_enrollment_approval.py @@ -4,7 +4,7 @@ from odoo import models, fields, api class YuthonEnrollmentApproval(models.Model): _name = 'yuthon.enrollment.approval' _description = '参保方案申请表' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名称') diff --git a/yuthon_hr_employee_approval/models/yuthon_interview_approval.py b/yuthon_hr_employee_approval/models/yuthon_interview_approval.py index 852b114e4..8bddbfcaf 100644 --- a/yuthon_hr_employee_approval/models/yuthon_interview_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_interview_approval.py @@ -7,7 +7,7 @@ from odoo.exceptions import UserError class YuthonInterviewApproval(models.Model): _name = 'yuthon.interview.approval' _description = '面试信息表' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='标题') users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) diff --git a/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py b/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py index d8a023cce..ee0e410bc 100644 --- a/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py @@ -5,7 +5,7 @@ from odoo.exceptions import UserError class YuthonLeavingApproval(models.Model): _name = 'yuthon.leaving.approval' _description = '离职申请' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] 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_hr_employee_approval/models/yuthon_message_login.py b/yuthon_hr_employee_approval/models/yuthon_message_login.py index 0687e47f7..929a5a14a 100644 --- a/yuthon_hr_employee_approval/models/yuthon_message_login.py +++ b/yuthon_hr_employee_approval/models/yuthon_message_login.py @@ -21,7 +21,7 @@ class YuthonMessageLogin(models.Model): _name = 'yuthon.message.login' _description = "个人信息登记表" _rec_name = 'name' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] # 基本信息 name = fields.Char(string='标题', default="人员信息登记表") diff --git a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py index c390c461a..332c044a0 100644 --- a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py @@ -18,7 +18,7 @@ nation_list = [('a', '汉族'), ('b', '壮族'), ('v', '满族'), ('d', '回族' class YuthonOnboardApproval(models.Model): _name = 'yuthon.onboard.approval' _description = "入职申请表" - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string="标题") code = 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 66d7b31eb..bae8c1e82 100644 --- a/yuthon_hr_employee_approval/models/yuthon_prepare_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_prepare_approval.py @@ -5,7 +5,7 @@ from odoo.exceptions import UserError class YuthonPrepareApproval(models.Model): _name = 'yuthon.prepare.approval' _description = '编制调整需求表' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] 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_hr_employee_approval/models/yuthon_rank_approval.py b/yuthon_hr_employee_approval/models/yuthon_rank_approval.py index a2217fc2a..a250a17a2 100644 --- a/yuthon_hr_employee_approval/models/yuthon_rank_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_rank_approval.py @@ -4,7 +4,7 @@ from odoo import models, fields, api class YuthonRankApproval(models.Model): _name = 'yuthon.rank.approval' _description = '职级调整申请表' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] diff --git a/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py b/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py index 4760213e1..02929a621 100644 --- a/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py @@ -5,7 +5,7 @@ from odoo.exceptions import UserError class YuthonReassignmentApproval(models.Model): _name = 'yuthon.reassignment.approval' _description = '调岗申请' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] 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_hr_employee_approval/models/yuthon_recruitment_approval.py b/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py index 0a9499e2f..bb53c332d 100644 --- a/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py @@ -7,7 +7,7 @@ from odoo.exceptions import UserError class YuthonRecruitmentApproval(models.Model): _name = 'yuthon.recruitment.approval' _description = '招聘需求申请表' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='标题') users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) diff --git a/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py b/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py index fdcaa75b3..73f4816a5 100644 --- a/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py @@ -5,7 +5,7 @@ from odoo.exceptions import UserError class YuthonRegularizationPrepareApproval(models.Model): _name = 'yuthon.regularization.approval' _description = '转正申请表' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门") users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) diff --git a/yuthon_hr_employee_approval/models/yuthon_reward_approval.py b/yuthon_hr_employee_approval/models/yuthon_reward_approval.py index 94720755d..dc89c6b17 100644 --- a/yuthon_hr_employee_approval/models/yuthon_reward_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_reward_approval.py @@ -5,7 +5,7 @@ from odoo.exceptions import UserError class YuthonRewardApproval(models.Model): _name = 'yuthon.reward.approval' _description = '员工奖罚' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='标题') text = fields.Text(string='正文') diff --git a/yuthon_hr_employee_approval/models/yuthon_salary_approval.py b/yuthon_hr_employee_approval/models/yuthon_salary_approval.py index 66fb5c139..270a60459 100644 --- a/yuthon_hr_employee_approval/models/yuthon_salary_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_salary_approval.py @@ -4,7 +4,7 @@ from odoo import models, fields, api class YuthonSalaryApproval(models.Model): _name = 'yuthon.salary.approval' _description = '薪酬项目调整表' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名称') code = fields.Char(string="编号", diff --git a/yuthon_hr_employee_approval/models/yuthon_service_approval.py b/yuthon_hr_employee_approval/models/yuthon_service_approval.py index a6406f317..8abd79afe 100644 --- a/yuthon_hr_employee_approval/models/yuthon_service_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_service_approval.py @@ -5,7 +5,7 @@ from odoo.exceptions import UserError class YuthonServiceApproval(models.Model): _name = 'yuthon.service.approval' _description = '服务证明表' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='标题') code = fields.Char(string="编号", diff --git a/yuthon_hr_employee_approval/models/yuthon_system_approval.py b/yuthon_hr_employee_approval/models/yuthon_system_approval.py index eedce8c31..e8a94e2c4 100644 --- a/yuthon_hr_employee_approval/models/yuthon_system_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_system_approval.py @@ -4,7 +4,7 @@ from odoo import models, fields, api class YuthonSystemTitleApproval(models.Model): _name = 'yuthon.system.approval' _description = '制度调整申请表' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] diff --git a/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py b/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py index 1411f1b0c..9f7ebe517 100644 --- a/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py @@ -4,7 +4,7 @@ from odoo.exceptions import UserError class YutransferApproval(models.Model): _name = 'yuthon.transfer.approval' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _description = '工作移交' name = fields.Char(string="标题") diff --git a/yuthon_issue/models/issue_approval.py b/yuthon_issue/models/issue_approval.py index 4bee4d7d4..ab05677a7 100644 --- a/yuthon_issue/models/issue_approval.py +++ b/yuthon_issue/models/issue_approval.py @@ -5,7 +5,7 @@ from odoo import api, fields, models class IssueApproval(models.Model): _name = "issue.approval" _description = '议题审批' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _rec_name = 'name' name = fields.Text(string='标题', required=True) diff --git a/yuthon_issue/models/issue_meeting_minutes.py b/yuthon_issue/models/issue_meeting_minutes.py index f29512e1f..4eba4a2c6 100644 --- a/yuthon_issue/models/issue_meeting_minutes.py +++ b/yuthon_issue/models/issue_meeting_minutes.py @@ -6,7 +6,7 @@ from odoo.exceptions import UserError, ValidationError class IssueMeetingMinutes(models.Model): _name = 'issue.meeting.minutes' _description = '会议纪要' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名称') diff --git a/yuthon_lessee_service/models/property_report_repair.py b/yuthon_lessee_service/models/property_report_repair.py index fb8f4a970..e25a7d49f 100644 --- a/yuthon_lessee_service/models/property_report_repair.py +++ b/yuthon_lessee_service/models/property_report_repair.py @@ -6,7 +6,7 @@ from odoo import models, fields, api, exceptions, _ class PropertyRentRelief(models.Model): _name = 'property.report.repair' _description = '报事报修审批' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _rec_name = 'name' name = fields.Char(string='标题') diff --git a/yuthon_lessee_service/models/yuthon_lessee_notice.py b/yuthon_lessee_service/models/yuthon_lessee_notice.py index bfcee04ff..7e50619b1 100644 --- a/yuthon_lessee_service/models/yuthon_lessee_notice.py +++ b/yuthon_lessee_service/models/yuthon_lessee_notice.py @@ -5,7 +5,7 @@ from odoo.exceptions import ValidationError, UserError class YuthonLesseeNotice(models.Model): _name = "yuthon.lessee.notice" _description = '物业通知公告' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _rec_name = 'name' _order = "sequence desc" diff --git a/yuthon_notice/models/yuthon_notice.py b/yuthon_notice/models/yuthon_notice.py index dc665f794..0fb6f44b3 100644 --- a/yuthon_notice/models/yuthon_notice.py +++ b/yuthon_notice/models/yuthon_notice.py @@ -6,7 +6,7 @@ from odoo.exceptions import ValidationError, UserError class YuthonNotice(models.Model): _name = "yuthon.notice" _description = '通知公告' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _rec_name = 'name' _order = "sequence desc" diff --git a/yuthon_official/models/yuthon_offficial_incoming_party.py b/yuthon_official/models/yuthon_offficial_incoming_party.py index 5c5c86dec..5f403855d 100644 --- a/yuthon_official/models/yuthon_offficial_incoming_party.py +++ b/yuthon_official/models/yuthon_offficial_incoming_party.py @@ -6,7 +6,7 @@ from odoo.exceptions import ValidationError, UserError class YuthonOfficialIncomingParty(models.Model): _name = 'yuthon.official.incoming.party' _description = '党总支收文' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _rec_name = 'name' name = fields.Char(string="名称") diff --git a/yuthon_official/models/yuthon_official.py b/yuthon_official/models/yuthon_official.py index 12c69867a..67e93d8cb 100644 --- a/yuthon_official/models/yuthon_official.py +++ b/yuthon_official/models/yuthon_official.py @@ -6,7 +6,7 @@ from odoo.exceptions import ValidationError, UserError class YuthonOfficial(models.Model): _name = 'yuthon.official' _description = '行政发文' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _rec_name = 'name' name = fields.Char(string="标题") diff --git a/yuthon_official/models/yuthon_official_incoming_labor.py b/yuthon_official/models/yuthon_official_incoming_labor.py index a9b8eca2b..b31d83a18 100644 --- a/yuthon_official/models/yuthon_official_incoming_labor.py +++ b/yuthon_official/models/yuthon_official_incoming_labor.py @@ -6,7 +6,7 @@ from odoo.exceptions import ValidationError, UserError class YuthonOfficialIncomingLabor(models.Model): _name = 'yuthon.official.incoming.labor' _description = '工会收文' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _rec_name = 'name' name = fields.Char(string="名称") diff --git a/yuthon_official/models/yuthon_official_incoming_normal.py b/yuthon_official/models/yuthon_official_incoming_normal.py index d5e89d469..f1227854a 100644 --- a/yuthon_official/models/yuthon_official_incoming_normal.py +++ b/yuthon_official/models/yuthon_official_incoming_normal.py @@ -6,7 +6,7 @@ from odoo.exceptions import ValidationError, UserError class YuthonOfficialIncomingNormal(models.Model): _name = 'yuthon.official.incoming.normal' _description = '行政收文' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _rec_name = 'name' name = fields.Char(string="标题") diff --git a/yuthon_official/models/yuthon_official_labor.py b/yuthon_official/models/yuthon_official_labor.py index e0f7f5b20..d87a00f44 100644 --- a/yuthon_official/models/yuthon_official_labor.py +++ b/yuthon_official/models/yuthon_official_labor.py @@ -6,7 +6,7 @@ from odoo.exceptions import ValidationError, UserError class YuthonOfficialLabor(models.Model): _name = 'yuthon.official.labor' _description = '工会发文' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _rec_name = 'name' name = fields.Char(string="名称") diff --git a/yuthon_performance/__manifest__.py b/yuthon_performance/__manifest__.py index 99aebe12f..7d9f3a606 100644 --- a/yuthon_performance/__manifest__.py +++ b/yuthon_performance/__manifest__.py @@ -10,7 +10,7 @@ 'category': 'Human Resources/Attendances', 'version': '0.1', 'license': 'LGPL-3', - 'depends': ['hr', 'soong_workflow',], + 'depends': ['hr', 'soong_workflow', 'mail'], 'data': [ 'security/ir.model.access.csv', 'data/library_changes_data.xml', diff --git a/yuthon_performance/models/yuthon_Index_approval.py b/yuthon_performance/models/yuthon_Index_approval.py index 8a1cd31b9..b0e52c89e 100644 --- a/yuthon_performance/models/yuthon_Index_approval.py +++ b/yuthon_performance/models/yuthon_Index_approval.py @@ -5,7 +5,7 @@ class YuthonIndexApproval(models.Model): _name = 'yuthon.index.approval' _description = "组织指标库变更管理" _rec_name = 'name' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char('标题') creation_time = fields.Datetime(string='申请日期', default=lambda self: fields.Datetime.now()) diff --git a/yuthon_performance/models/yuthon_duty_management.py b/yuthon_performance/models/yuthon_duty_management.py index dd9aeb01a..ac0d86d41 100644 --- a/yuthon_performance/models/yuthon_duty_management.py +++ b/yuthon_performance/models/yuthon_duty_management.py @@ -6,7 +6,7 @@ class YuthonDutyManagement(models.Model): _name = 'yuthon.duty.management' _description = "组织绩效" _rec_name = 'name' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char('标题') cycle = fields.Selection([('monthly', '月度'), diff --git a/yuthon_performance/models/yuthon_employee_approval.py b/yuthon_performance/models/yuthon_employee_approval.py index b11dc674c..ecb70c55e 100644 --- a/yuthon_performance/models/yuthon_employee_approval.py +++ b/yuthon_performance/models/yuthon_employee_approval.py @@ -5,7 +5,7 @@ class YuthonEmployeeApproval(models.Model): _name = 'yuthon.employee.approval' _description = "员工指标库变更管理" _rec_name = 'name' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char('标题') users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) diff --git a/yuthon_performance/models/yuthon_tissue_duty_approval.py b/yuthon_performance/models/yuthon_tissue_duty_approval.py index 870e095b2..288c1cc5b 100644 --- a/yuthon_performance/models/yuthon_tissue_duty_approval.py +++ b/yuthon_performance/models/yuthon_tissue_duty_approval.py @@ -4,7 +4,7 @@ from odoo import models, fields, api, exceptions, _ class YuthonTissueDutyApproval(models.Model): _name = 'yuthon.tissue.duty.approval' _description = "组织绩效变更申请表" - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _rec_name = 'name' name = fields.Char('标题') diff --git a/yuthon_property_approval/models/property_approval.py b/yuthon_property_approval/models/property_approval.py index bcc434702..49f9f7cd2 100644 --- a/yuthon_property_approval/models/property_approval.py +++ b/yuthon_property_approval/models/property_approval.py @@ -6,7 +6,7 @@ from odoo import models, fields, api, exceptions, _ class PropertyApproval(models.Model): _name = 'property.approval' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _description = '新增物业审批' name = fields.Char(string='标题') diff --git a/yuthon_property_approval/models/property_billing_confirmation.py b/yuthon_property_approval/models/property_billing_confirmation.py index 6848766c1..c0727a859 100644 --- a/yuthon_property_approval/models/property_billing_confirmation.py +++ b/yuthon_property_approval/models/property_billing_confirmation.py @@ -7,7 +7,7 @@ from odoo import models, fields, api, exceptions, _ class PropertyBillingyConfirmation(models.Model): _name = 'property.billing.confirmation' _description = '账单确认单审批' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _rec_name = 'name' name = fields.Char(string='标题') diff --git a/yuthon_property_approval/models/property_business_confirm.py b/yuthon_property_approval/models/property_business_confirm.py index ecac51e66..204bb304b 100644 --- a/yuthon_property_approval/models/property_business_confirm.py +++ b/yuthon_property_approval/models/property_business_confirm.py @@ -7,7 +7,7 @@ from odoo import models, fields, api, exceptions, _ class PropertyBusinessConfirm(models.Model): _name = 'property.business.confirm' _description = '经营报表确认单审批' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _rec_name = 'name' name = fields.Char(string='标题') diff --git a/yuthon_property_approval/models/property_capacity.py b/yuthon_property_approval/models/property_capacity.py index 15ce5d5e3..2543b0148 100644 --- a/yuthon_property_approval/models/property_capacity.py +++ b/yuthon_property_approval/models/property_capacity.py @@ -7,7 +7,7 @@ from odoo import models, fields, api, exceptions, _ class PropertyCapacity(models.Model): _name = 'property.capacity' _description = '增容审批' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + _inherit =['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _rec_name = 'name' name = fields.Char(string='标题') diff --git a/yuthon_property_approval/models/property_collection_confirm.py b/yuthon_property_approval/models/property_collection_confirm.py index 230354439..71874e0f0 100644 --- a/yuthon_property_approval/models/property_collection_confirm.py +++ b/yuthon_property_approval/models/property_collection_confirm.py @@ -7,7 +7,7 @@ from odoo import models, fields, api, exceptions, _ class PropertyCollectionConfirm(models.Model): _name = 'property.collection.confirm' _description = '收款确认单审批' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _rec_name = 'name' name = fields.Char(string='标题') diff --git a/yuthon_property_approval/models/property_confirm.py b/yuthon_property_approval/models/property_confirm.py index 2509e5451..2dfa465ae 100644 --- a/yuthon_property_approval/models/property_confirm.py +++ b/yuthon_property_approval/models/property_confirm.py @@ -7,7 +7,7 @@ from odoo import models, fields, api, exceptions, _ class PropertyConfirm(models.Model): _name = 'property.confirm' _description = '物业成交确认审批' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _rec_name = 'name' name = fields.Char(string='标题') diff --git a/yuthon_property_approval/models/property_construction_work.py b/yuthon_property_approval/models/property_construction_work.py index 71f049e35..669dcbfa0 100644 --- a/yuthon_property_approval/models/property_construction_work.py +++ b/yuthon_property_approval/models/property_construction_work.py @@ -7,7 +7,7 @@ from odoo import models, fields, api, exceptions, _ class PropertyConstructionWork(models.Model): _name = 'property.construction.work' _description = '建设工程审批单' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名称') code = fields.Char(string="编号", diff --git a/yuthon_property_approval/models/property_contract_changes.py b/yuthon_property_approval/models/property_contract_changes.py index 4366bcd25..ab626e14a 100644 --- a/yuthon_property_approval/models/property_contract_changes.py +++ b/yuthon_property_approval/models/property_contract_changes.py @@ -7,7 +7,7 @@ from odoo import models, fields, api, exceptions, _ class PropertyContractChanges(models.Model): _name = 'property.contract.changes' _description = '租聘合同变更审批' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名称') code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_contract_changes_sequence')) diff --git a/yuthon_property_approval/models/property_early_quitting.py b/yuthon_property_approval/models/property_early_quitting.py index d84ed2e01..3aeec428b 100644 --- a/yuthon_property_approval/models/property_early_quitting.py +++ b/yuthon_property_approval/models/property_early_quitting.py @@ -7,7 +7,7 @@ from odoo import models, fields, api, exceptions, _ class PropertyEarlyQuitting(models.Model): _name = 'property.early.quitting' _description = '提前退租审批' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _rec_name = 'name' name = fields.Char(string='标题') diff --git a/yuthon_property_approval/models/property_eligibility.py b/yuthon_property_approval/models/property_eligibility.py index bd8ac2b1f..917f67317 100644 --- a/yuthon_property_approval/models/property_eligibility.py +++ b/yuthon_property_approval/models/property_eligibility.py @@ -7,7 +7,7 @@ from odoo import models, fields, api, exceptions, _ class PropertyEligibility(models.Model): _name = 'property.eligibility' _description = '承租资格审批' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _rec_name = 'name' name = fields.Char(string='标题') diff --git a/yuthon_property_approval/models/property_equity.py b/yuthon_property_approval/models/property_equity.py index 7d3faca65..fd8ae43c2 100644 --- a/yuthon_property_approval/models/property_equity.py +++ b/yuthon_property_approval/models/property_equity.py @@ -7,7 +7,7 @@ from odoo import models, fields, api, exceptions, _ class PropertyEquity(models.Model): _name = 'property.equity' _description = '物业产权变更' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名字') diff --git a/yuthon_property_approval/models/property_evaluate_application.py b/yuthon_property_approval/models/property_evaluate_application.py index 193185187..dea392ccc 100644 --- a/yuthon_property_approval/models/property_evaluate_application.py +++ b/yuthon_property_approval/models/property_evaluate_application.py @@ -4,7 +4,7 @@ from odoo import models, fields, api class PropertyEvaluateApplication(models.Model): _name = 'property.evaluate.application' _description = '物业评估申请' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='标题') diff --git a/yuthon_property_approval/models/property_fitment.py b/yuthon_property_approval/models/property_fitment.py index 17d53d98d..58d0c0de8 100644 --- a/yuthon_property_approval/models/property_fitment.py +++ b/yuthon_property_approval/models/property_fitment.py @@ -7,7 +7,7 @@ from odoo import models, fields, api, exceptions, _ class PropertyFitment(models.Model): _name = 'property.fitment' _description = '装修审批' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _rec_name = 'name' name = fields.Char(string='标题') diff --git a/yuthon_property_approval/models/property_handover.py b/yuthon_property_approval/models/property_handover.py index 88deeb4f2..577eed1f5 100644 --- a/yuthon_property_approval/models/property_handover.py +++ b/yuthon_property_approval/models/property_handover.py @@ -4,7 +4,7 @@ from odoo import models, fields, api, exceptions class PropertyHandover(models.Model): _name = 'property.handover' _description = '移交申请' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='标题') tip_description = fields.Html('正文') diff --git a/yuthon_property_approval/models/property_information.py b/yuthon_property_approval/models/property_information.py index f061f1b57..eeb2d1c2f 100644 --- a/yuthon_property_approval/models/property_information.py +++ b/yuthon_property_approval/models/property_information.py @@ -7,7 +7,7 @@ from odoo import models, fields, api, exceptions, _ class PropertyInformation(models.Model): _name = 'property.information' _description = '物业信息审批' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _rec_name = 'name' name = fields.Char(string='标题') diff --git a/yuthon_property_approval/models/property_intention_approval.py b/yuthon_property_approval/models/property_intention_approval.py index 348b0d447..beb83b57b 100644 --- a/yuthon_property_approval/models/property_intention_approval.py +++ b/yuthon_property_approval/models/property_intention_approval.py @@ -6,7 +6,7 @@ from odoo.exceptions import UserError class PropertyIntentionApproval(models.Model): _name = 'property.intention.approval' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _description = '意向客户审批' name = fields.Char(string="标题") diff --git a/yuthon_property_approval/models/property_inventory_table.py b/yuthon_property_approval/models/property_inventory_table.py index 635bba135..63ca6e6a2 100644 --- a/yuthon_property_approval/models/property_inventory_table.py +++ b/yuthon_property_approval/models/property_inventory_table.py @@ -7,7 +7,7 @@ from odoo import models, fields, api, exceptions, _ class PropertyInventoryTable(models.Model): _name = 'property.inventory.table' _description = '盘点表审批' - _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _rec_name = 'name' name = fields.Char(string='标题') diff --git a/yuthon_property_approval/models/property_merge_approval.py b/yuthon_property_approval/models/property_merge_approval.py index f33110b93..a4ccd0482 100644 --- a/yuthon_property_approval/models/property_merge_approval.py +++ b/yuthon_property_approval/models/property_merge_approval.py @@ -3,7 +3,7 @@ from odoo import models, fields, api, exceptions, _ class PropertyMergeApproval(models.Model): _name = 'property.merge.approval' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _description = '物业合并审批' name = fields.Char(string='标题') diff --git a/yuthon_property_approval/models/property_split_approval.py b/yuthon_property_approval/models/property_split_approval.py index b47d5d652..8f29a86d8 100644 --- a/yuthon_property_approval/models/property_split_approval.py +++ b/yuthon_property_approval/models/property_split_approval.py @@ -3,7 +3,7 @@ from odoo import models, fields, api, exceptions, _ class PropertySplitApproval(models.Model): _name = 'property.split.approval' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _description = '物业拆分审批' code = fields.Char(string="编号", diff --git a/yuthon_property_approval/models/property_transfer_approval.py b/yuthon_property_approval/models/property_transfer_approval.py index ed72eb538..062bf2486 100644 --- a/yuthon_property_approval/models/property_transfer_approval.py +++ b/yuthon_property_approval/models/property_transfer_approval.py @@ -6,7 +6,7 @@ from odoo.exceptions import UserError class PropertyTransferApproval(models.Model): _name = 'property.transfer.approval' - _inherit = 'soong.workflow.mixin' + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] _description = '物业交接审批' name = fields.Char(string="标题") diff --git a/yuthon_trade/models/yuthon_none.py b/yuthon_trade/models/yuthon_none.py index a58b10631..4f148f121 100644 --- a/yuthon_trade/models/yuthon_none.py +++ b/yuthon_trade/models/yuthon_none.py @@ -4,6 +4,6 @@ from odoo import models, fields, api class YuthonNone(models.Model): _name = 'yuthon.none' _description = '借支流程' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名称') diff --git a/yuthon_trade/models/yuthon_personal_condolences.py b/yuthon_trade/models/yuthon_personal_condolences.py index d8f102638..3ddad899e 100644 --- a/yuthon_trade/models/yuthon_personal_condolences.py +++ b/yuthon_trade/models/yuthon_personal_condolences.py @@ -4,7 +4,7 @@ from odoo import models, fields, api class YuthonPersonalCondolences(models.Model): _name = 'yuthon.personal.condolences' _description = '个人节日慰问' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名称') code = fields.Char(string="编号", diff --git a/yuthon_trade/models/yuthon_trade_activities.py b/yuthon_trade/models/yuthon_trade_activities.py index e49c97c5e..968f0d90e 100644 --- a/yuthon_trade/models/yuthon_trade_activities.py +++ b/yuthon_trade/models/yuthon_trade_activities.py @@ -4,7 +4,7 @@ from odoo import models, fields, api class YuthonTradeActivities(models.Model): _name = 'yuthon.trade.activities' _description = '工会活动' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名称') code = fields.Char(string="编号", diff --git a/yuthon_trade/models/yuthon_trade_borrowing.py b/yuthon_trade/models/yuthon_trade_borrowing.py index d586e005c..78ec2ab78 100644 --- a/yuthon_trade/models/yuthon_trade_borrowing.py +++ b/yuthon_trade/models/yuthon_trade_borrowing.py @@ -4,7 +4,7 @@ from odoo import models, fields, api class YuthonTradeBorrowing(models.Model): _name = 'yuthon.trade.borrowing' _description = '借支流程' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名称', required=True) code = fields.Char(string="编号", diff --git a/yuthon_trade/models/yuthon_trade_contract.py b/yuthon_trade/models/yuthon_trade_contract.py index 50ba43f2b..827160108 100644 --- a/yuthon_trade/models/yuthon_trade_contract.py +++ b/yuthon_trade/models/yuthon_trade_contract.py @@ -4,7 +4,7 @@ from odoo import models, fields, api class YuthonTradeContract(models.Model): _name = 'yuthon.trade.contract' _description = '合同审批' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名称', required=True) code = fields.Char(string="编号", diff --git a/yuthon_trade/models/yuthon_trade_pay.py b/yuthon_trade/models/yuthon_trade_pay.py index 52fa0df8d..8c833b543 100644 --- a/yuthon_trade/models/yuthon_trade_pay.py +++ b/yuthon_trade/models/yuthon_trade_pay.py @@ -4,7 +4,7 @@ from odoo import models, fields, api class YuthonTradePay(models.Model): _name = 'yuthon.trade.pay' _description = '付款流程' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名称', required=True) code = fields.Char(string="编号", diff --git a/yuthon_trade/models/yuthon_trade_policy.py b/yuthon_trade/models/yuthon_trade_policy.py index 510e3eeee..52a27c859 100644 --- a/yuthon_trade/models/yuthon_trade_policy.py +++ b/yuthon_trade/models/yuthon_trade_policy.py @@ -4,7 +4,7 @@ from odoo import models, fields, api class YuthonTradePolicy(models.Model): _name = 'yuthon.trade.policy' _description = '保单列表' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名称', required=True) code = fields.Char(string="编号", diff --git a/yuthon_trade/models/yuthon_trade_premium.py b/yuthon_trade/models/yuthon_trade_premium.py index ceb590e71..07bf6c106 100644 --- a/yuthon_trade/models/yuthon_trade_premium.py +++ b/yuthon_trade/models/yuthon_trade_premium.py @@ -4,7 +4,7 @@ from odoo import models, fields, api class YuthonTradePremium(models.Model): _name = 'yuthon.trade.premium' _description = '缴保申请表' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名称', required=True) code = fields.Char(string="编号", diff --git a/yuthon_trade/models/yuthon_trade_purchase.py b/yuthon_trade/models/yuthon_trade_purchase.py index 2cd492605..82dd7a4bb 100644 --- a/yuthon_trade/models/yuthon_trade_purchase.py +++ b/yuthon_trade/models/yuthon_trade_purchase.py @@ -3,7 +3,7 @@ from odoo import models, fields, api class YuthonTradePurchase(models.Model): _name = 'yuthon.trade.purchase' _description = '采购' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名称') code = fields.Char(string="编号", diff --git a/yuthon_trade/models/yuthon_trade_refund.py b/yuthon_trade/models/yuthon_trade_refund.py index 273bd4f0d..8e29991e0 100644 --- a/yuthon_trade/models/yuthon_trade_refund.py +++ b/yuthon_trade/models/yuthon_trade_refund.py @@ -4,7 +4,7 @@ from odoo import models, fields, api class YuthonTradeRefund(models.Model): _name = 'yuthon.trade.refund' _description = '退款流程' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名称', required=True) code = fields.Char(string="编号", diff --git a/yuthon_trade/models/yuthon_trade_reimbursed.py b/yuthon_trade/models/yuthon_trade_reimbursed.py index 0c76f2562..ee33cc47c 100644 --- a/yuthon_trade/models/yuthon_trade_reimbursed.py +++ b/yuthon_trade/models/yuthon_trade_reimbursed.py @@ -4,7 +4,7 @@ from odoo import models, fields, api class YuthonTradeReimbursed(models.Model): _name = 'yuthon.trade.reimbursed' _description = '报销流程' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名称') code = fields.Char(string="编号", diff --git a/yuthon_trade/models/yuthon_trade_supportive.py b/yuthon_trade/models/yuthon_trade_supportive.py index 5f3efe59b..be262fcdf 100644 --- a/yuthon_trade/models/yuthon_trade_supportive.py +++ b/yuthon_trade/models/yuthon_trade_supportive.py @@ -4,7 +4,7 @@ from odoo import models, fields, api class YuthonTradeSupportive(models.Model): _name = 'yuthon.trade.supportive' _description = '互助申请表' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名称') code = fields.Char(string="编号", diff --git a/yuthon_trade/models/yuthon_work_condolences.py b/yuthon_trade/models/yuthon_work_condolences.py index 3d844e067..3f0b5b968 100644 --- a/yuthon_trade/models/yuthon_work_condolences.py +++ b/yuthon_trade/models/yuthon_work_condolences.py @@ -4,7 +4,7 @@ from odoo import models, fields, api class YuthonWorkCondolences(models.Model): _name = 'yuthon.work.condolences' _description = '节日慰问' - _inherit = ['soong.workflow.mixin'] + _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin'] name = fields.Char(string='名称') code = fields.Char(string="编号",