From 2340e236006b907b52d95c794c15f2873284449d Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Fri, 28 Feb 2025 10:29:04 +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 --- yuthon_hr_attendance/models/card_approval.py | 1 + yuthon_hr_attendance/models/duty_approval.py | 1 + yuthon_hr_attendance/models/go_approval.py | 1 + .../models/hr_attendance_month.py | 1 + yuthon_hr_attendance/models/leave_approval.py | 1 + .../models/overtime_approval.py | 1 + .../models/remove_holiday_approval.py | 1 + .../models/yuthon_customer_approval.py | 1 + .../models/yuthon_shift_approval.py | 1 + .../models/yuthon_account_approval.py | 1 + .../models/yuthon_appointment_approval.py | 2 ++ .../models/yuthon_enrollment_approval.py | 3 ++- .../models/yuthon_interview_approval.py | 2 ++ .../models/yuthon_leaving_approval.py | 1 + .../models/yuthon_message_login.py | 1 + .../models/yuthon_onboard_approval.py | 1 + .../models/yuthon_prepare_approval.py | 1 + .../models/yuthon_rank_approval.py | 1 + .../models/yuthon_reassignment_approval.py | 1 + .../models/yuthon_recruitment_approval.py | 1 + .../models/yuthon_regularization_approval.py | 1 + .../models/yuthon_retired_approval.py | 1 + .../models/yuthon_reward_approval.py | 1 + .../models/yuthon_salary_approval.py | 1 + .../models/yuthon_service_approval.py | 1 + .../models/yuthon_social_files_approval.py | 1 + .../models/yuthon_system_approval.py | 1 + .../models/yuthon_transfer_approval.py | 1 + yuthon_issue/models/issue_approval.py | 8 +++++++ yuthon_issue/models/issue_library.py | 8 +++++++ yuthon_issue/views/issue_approval_views.xml | 21 +++++++++++++++++-- yuthon_issue/views/issue_library_views.xml | 21 +++++++++++++++++-- yuthon_notice/models/yuthon_notice.py | 1 + .../models/yuthon_offficial_incoming_party.py | 1 + yuthon_official/models/yuthon_official.py | 1 + .../models/yuthon_official_incoming_labor.py | 1 + .../models/yuthon_official_incoming_normal.py | 1 + .../models/yuthon_official_labor.py | 1 + .../models/yuthon_official_party.py | 1 + .../models/yuthon_duty_management.py | 8 +++++++ .../models/yuthon_employee_approval.py | 7 +++++++ .../models/yuthon_tissue_duty_approval.py | 8 +++++++ .../models/perperty_claim_approval.py | 1 + .../models/property_accounting_approval.py | 1 + .../models/property_approval.py | 1 + .../models/property_billing_confirmation.py | 1 + .../models/property_borrowing_approval.py | 1 + .../models/property_business_confirm.py | 1 + .../models/property_capacity.py | 1 + .../models/property_collection_confirm.py | 3 ++- .../models/property_confirm.py | 1 + .../models/property_construction_approval.py | 1 + .../models/property_construction_work.py | 1 + .../models/property_contract_changes.py | 2 +- .../models/property_delegated_agent.py | 1 + .../models/property_design_approval.py | 1 + .../models/property_early_quitting.py | 1 + .../models/property_equity.py | 2 +- .../models/property_evaluate_application.py | 1 + .../models/property_fitment.py | 1 + .../models/property_handover.py | 1 + .../models/property_information.py | 1 + .../models/property_inventory_table.py | 3 ++- .../models/property_lease_alter.py | 3 ++- .../models/property_lease_contract.py | 1 + .../models/property_lease_extension.py | 1 + .../models/property_lease_renewal.py | 3 ++- .../models/property_lessee_change.py | 1 + .../models/property_management.py | 2 +- .../models/property_management_fee.py | 1 + .../models/property_material_procurement.py | 3 ++- .../models/property_merge_approval.py | 1 + .../models/property_move.py | 2 +- .../models/property_offline_registration.py | 1 + .../models/property_open_rent.py | 1 + .../models/property_penalty_proportion.py | 1 + .../models/property_penalty_relief.py | 1 + .../models/property_project_approval.py | 1 + .../models/property_project_works.py | 1 + .../models/property_record.py | 1 + .../models/property_reimbursement_form.py | 1 + .../models/property_renamed.py | 1 + .../models/property_rent_relief.py | 1 + .../models/property_rental_conditions.py | 1 + .../models/property_rental_form.py | 1 + .../models/property_split_approval.py | 1 + .../models/property_sporadic_works.py | 1 + .../models/property_supervising_approval.py | 1 + .../models/property_transaction_confirmed.py | 1 + .../models/property_transfer_approval.py | 1 + .../models/property_utility_bills.py | 3 ++- 91 files changed, 170 insertions(+), 15 deletions(-) diff --git a/yuthon_hr_attendance/models/card_approval.py b/yuthon_hr_attendance/models/card_approval.py index 6844217d0..344ae09ee 100644 --- a/yuthon_hr_attendance/models/card_approval.py +++ b/yuthon_hr_attendance/models/card_approval.py @@ -29,6 +29,7 @@ class CardApprovals(models.Model): active = fields.Boolean('Active', default=True) urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_attendance/models/duty_approval.py b/yuthon_hr_attendance/models/duty_approval.py index 7aff86754..6affb34b5 100644 --- a/yuthon_hr_attendance/models/duty_approval.py +++ b/yuthon_hr_attendance/models/duty_approval.py @@ -22,6 +22,7 @@ class DutyApprovals(models.Model): related_issues_id = fields.Many2one('issue.library', string="关联议题") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_attendance/models/go_approval.py b/yuthon_hr_attendance/models/go_approval.py index c30a165ee..b8e4bff85 100644 --- a/yuthon_hr_attendance/models/go_approval.py +++ b/yuthon_hr_attendance/models/go_approval.py @@ -31,6 +31,7 @@ class GoApprovals(models.Model): hours = fields.Integer(string="小时") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_attendance/models/hr_attendance_month.py b/yuthon_hr_attendance/models/hr_attendance_month.py index 29c29bfac..143909123 100644 --- a/yuthon_hr_attendance/models/hr_attendance_month.py +++ b/yuthon_hr_attendance/models/hr_attendance_month.py @@ -115,6 +115,7 @@ class HrAttendanceMonthDetail(models.Model): recovery_sick_leave = fields.Float(string='病假(出院恢复期)') exam_leave = fields.Float(string='考试假') holiday_id = fields.Many2one('hr.leave.type', string="假期种类") + active = fields.Boolean('Active', default=True, tracking=True) # todo 需要什么字段往上加什么 # 打卡 come_late = fields.Integer(string="迟到") diff --git a/yuthon_hr_attendance/models/leave_approval.py b/yuthon_hr_attendance/models/leave_approval.py index 44b639efc..d666515be 100644 --- a/yuthon_hr_attendance/models/leave_approval.py +++ b/yuthon_hr_attendance/models/leave_approval.py @@ -18,6 +18,7 @@ class LeaveApprovals(models.Model): default='drft') urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_attendance/models/overtime_approval.py b/yuthon_hr_attendance/models/overtime_approval.py index c96d296e4..2beb407cd 100644 --- a/yuthon_hr_attendance/models/overtime_approval.py +++ b/yuthon_hr_attendance/models/overtime_approval.py @@ -30,6 +30,7 @@ class OvertimeApprovals(models.Model): string="加班类型", compute="_compute_overtime_type") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_attendance/models/remove_holiday_approval.py b/yuthon_hr_attendance/models/remove_holiday_approval.py index 101b55f5a..0d2cf82cf 100644 --- a/yuthon_hr_attendance/models/remove_holiday_approval.py +++ b/yuthon_hr_attendance/models/remove_holiday_approval.py @@ -27,6 +27,7 @@ class RemoveHolidayApprovals(models.Model): related_issues_id = fields.Many2one('issue.library', string="关联议题") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_attendance/models/yuthon_customer_approval.py b/yuthon_hr_attendance/models/yuthon_customer_approval.py index 05367d52d..d51b3eaf4 100644 --- a/yuthon_hr_attendance/models/yuthon_customer_approval.py +++ b/yuthon_hr_attendance/models/yuthon_customer_approval.py @@ -22,6 +22,7 @@ class YuthonCustomerApproval(models.Model): active = fields.Boolean('Active', default=True, tracking=True) urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_attendance/models/yuthon_shift_approval.py b/yuthon_hr_attendance/models/yuthon_shift_approval.py index 6331c8c21..3612bece5 100644 --- a/yuthon_hr_attendance/models/yuthon_shift_approval.py +++ b/yuthon_hr_attendance/models/yuthon_shift_approval.py @@ -29,6 +29,7 @@ class YuthonShiftApproval(models.Model): active = fields.Boolean('Active', default=True, tracking=True) urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_employee_approval/models/yuthon_account_approval.py b/yuthon_hr_employee_approval/models/yuthon_account_approval.py index 8340934ce..42edc2d70 100644 --- a/yuthon_hr_employee_approval/models/yuthon_account_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_account_approval.py @@ -8,3 +8,4 @@ class YuthonAccountApproval(models.Model): name = fields.Char(string='名称') code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_account_approval_code')) + active = fields.Boolean('Active', default=True, tracking=True) \ No newline at end of file diff --git a/yuthon_hr_employee_approval/models/yuthon_appointment_approval.py b/yuthon_hr_employee_approval/models/yuthon_appointment_approval.py index 895abe7fb..7085a7148 100644 --- a/yuthon_hr_employee_approval/models/yuthon_appointment_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_appointment_approval.py @@ -23,6 +23,8 @@ class YuthonAppointmentApproval(models.Model): judge_team_member = fields.Many2one('hr.employee', string="评审小组成员") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) + def _get_default_name_title(self): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) diff --git a/yuthon_hr_employee_approval/models/yuthon_enrollment_approval.py b/yuthon_hr_employee_approval/models/yuthon_enrollment_approval.py index 10322c58e..3df446f39 100644 --- a/yuthon_hr_employee_approval/models/yuthon_enrollment_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_enrollment_approval.py @@ -9,4 +9,5 @@ class YuthonEnrollmentApproval(models.Model): name = fields.Char(string='名称') code = fields.Char(string="编号", - default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_enrollment_approval_code')) \ No newline at end of file + default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_enrollment_approval_code')) + active = fields.Boolean('Active', default=True, tracking=True) \ No newline at end of file diff --git a/yuthon_hr_employee_approval/models/yuthon_interview_approval.py b/yuthon_hr_employee_approval/models/yuthon_interview_approval.py index 19462492c..6a2345429 100644 --- a/yuthon_hr_employee_approval/models/yuthon_interview_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_interview_approval.py @@ -23,6 +23,8 @@ class YuthonInterviewApproval(models.Model): yuthon_company = fields.Selection([('thtz', '天河投资集团'), ('thwg', '天河物管'), ('thlc', '天河粮储')], string="公司") related_issues_id = fields.Many2one('issue.library', string="关联议题") + active = fields.Boolean('Active', default=True, tracking=True) + def _get_default_name_title(self): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) diff --git a/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py b/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py index 2e9df9d1b..68dfd9860 100644 --- a/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py @@ -34,6 +34,7 @@ class YuthonLeavingApproval(models.Model): def _get_default_name_title(self): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) + active = fields.Boolean('Active', default=True, tracking=True) class HrJobType(models.Model): _name = "hr.job.type" diff --git a/yuthon_hr_employee_approval/models/yuthon_message_login.py b/yuthon_hr_employee_approval/models/yuthon_message_login.py index f056911c3..a1e3c6186 100644 --- a/yuthon_hr_employee_approval/models/yuthon_message_login.py +++ b/yuthon_hr_employee_approval/models/yuthon_message_login.py @@ -87,6 +87,7 @@ class YuthonMessageLogin(models.Model): login_document_id = fields.Many2one('ir.attachment', string="简历附件") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py index b6bd8314c..28d42f7df 100644 --- a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py @@ -54,6 +54,7 @@ class YuthonOnboardApproval(models.Model): is_office = fields.Boolean(string='是否领用办公物品', default=False) urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_employee_approval/models/yuthon_prepare_approval.py b/yuthon_hr_employee_approval/models/yuthon_prepare_approval.py index 8e9602de3..4df050969 100644 --- a/yuthon_hr_employee_approval/models/yuthon_prepare_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_prepare_approval.py @@ -20,6 +20,7 @@ class YuthonPrepareApproval(models.Model): prepare_approval_line_ids = fields.One2many('new.prepare.approval.line', 'prepare_approval_id', string="关联编制调整需求表行") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_employee_approval/models/yuthon_rank_approval.py b/yuthon_hr_employee_approval/models/yuthon_rank_approval.py index a250a17a2..046662045 100644 --- a/yuthon_hr_employee_approval/models/yuthon_rank_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_rank_approval.py @@ -11,3 +11,4 @@ class YuthonRankApproval(models.Model): name = fields.Char(string='名称') code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_rank_approval_code')) + active = fields.Boolean('Active', default=True, tracking=True) \ No newline at end of file diff --git a/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py b/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py index cb06a8f56..f66ffb0af 100644 --- a/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py @@ -29,6 +29,7 @@ class YuthonReassignmentApproval(models.Model): related_issues_id = fields.Many2one('issue.library', string="关联议题") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py b/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py index 8bff90cda..9e553198a 100644 --- a/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py @@ -23,6 +23,7 @@ class YuthonRecruitmentApproval(models.Model): department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py b/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py index c7902fabe..3106c0f8b 100644 --- a/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py @@ -44,6 +44,7 @@ class YuthonRegularizationPrepareApproval(models.Model): regularization_rules = fields.Char(string="转正规则") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_employee_approval/models/yuthon_retired_approval.py b/yuthon_hr_employee_approval/models/yuthon_retired_approval.py index 37b77b1b4..23e4bc975 100644 --- a/yuthon_hr_employee_approval/models/yuthon_retired_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_retired_approval.py @@ -30,6 +30,7 @@ class YuthonRetiredApproval(models.Model): goods_line_ids = fields.One2many('yuthon.goods.line', 'retired_id', string="物品交接") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_employee_approval/models/yuthon_reward_approval.py b/yuthon_hr_employee_approval/models/yuthon_reward_approval.py index 519a1a9f0..01fbe73fd 100644 --- a/yuthon_hr_employee_approval/models/yuthon_reward_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_reward_approval.py @@ -23,6 +23,7 @@ class YuthonRewardApproval(models.Model): reward_results_ids = fields.One2many('yuthon.reward.punishment.details', 'reward_punishment_id', string="奖罚明细") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_employee_approval/models/yuthon_salary_approval.py b/yuthon_hr_employee_approval/models/yuthon_salary_approval.py index 270a60459..416119b83 100644 --- a/yuthon_hr_employee_approval/models/yuthon_salary_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_salary_approval.py @@ -9,3 +9,4 @@ class YuthonSalaryApproval(models.Model): name = fields.Char(string='名称') code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_salary_approval_code')) + active = fields.Boolean('Active', default=True, tracking=True) \ No newline at end of file diff --git a/yuthon_hr_employee_approval/models/yuthon_service_approval.py b/yuthon_hr_employee_approval/models/yuthon_service_approval.py index 96c401e63..0e28fcc9b 100644 --- a/yuthon_hr_employee_approval/models/yuthon_service_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_service_approval.py @@ -24,6 +24,7 @@ class YuthonServiceApproval(models.Model): related_issues_id = fields.Many2one('issue.library', string="关联议题") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_employee_approval/models/yuthon_social_files_approval.py b/yuthon_hr_employee_approval/models/yuthon_social_files_approval.py index 6614395a3..21a78100e 100644 --- a/yuthon_hr_employee_approval/models/yuthon_social_files_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_social_files_approval.py @@ -33,6 +33,7 @@ class YuthonSocialFilesApproval(models.Model): social_group = fields.Char(string="社保组") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_hr_employee_approval/models/yuthon_system_approval.py b/yuthon_hr_employee_approval/models/yuthon_system_approval.py index e8a94e2c4..4e4be888c 100644 --- a/yuthon_hr_employee_approval/models/yuthon_system_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_system_approval.py @@ -11,3 +11,4 @@ class YuthonSystemTitleApproval(models.Model): name = fields.Char(string='名称') code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_system_approval_code')) + active = fields.Boolean('Active', default=True, tracking=True) \ No newline at end of file diff --git a/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py b/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py index d2656f76d..0249025ea 100644 --- a/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py @@ -35,6 +35,7 @@ class YutransferApproval(models.Model): transfer_ids = fields.One2many('yuthon.transfer.infor.detail.lines', 'transfer_id') urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_issue/models/issue_approval.py b/yuthon_issue/models/issue_approval.py index ab05677a7..74fc8d765 100644 --- a/yuthon_issue/models/issue_approval.py +++ b/yuthon_issue/models/issue_approval.py @@ -29,6 +29,14 @@ class IssueApproval(models.Model): issue_display = fields.Char(string="议题事项", default='{"template": "yuthon_issue.html_issue_demo"}') decision_display = fields.Char(string="决策清单", default='{"template": "yuthon_issue.html_decision_demo"}') is_parent_unit = fields.Boolean(string="上级单位") + active = fields.Boolean('Active', default=True, tracking=True) + urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', + default='normal') + + def _get_default_name_title(self): + return self._description if self._description else self._name + + name_title = fields.Char(default=_get_default_name_title) class IssueApprovalLine(models.Model): diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py index db47a928d..8a232e146 100644 --- a/yuthon_issue/models/issue_library.py +++ b/yuthon_issue/models/issue_library.py @@ -42,6 +42,14 @@ class IssueLibrary(models.Model): approval_name = fields.Char(string="审批标题") meeting_place = fields.Char(string="会议地点") meeting_name = fields.Char(string="会议名称") + active = fields.Boolean('Active', default=True, tracking=True) + urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', + default='normal') + + def _get_default_name_title(self): + return self._description if self._description else self._name + + name_title = fields.Char(default=_get_default_name_title) @api.onchange('issue_library_line_ids') def onchange_approval_decision_sequence(self): diff --git a/yuthon_issue/views/issue_approval_views.xml b/yuthon_issue/views/issue_approval_views.xml index 5cd8a7802..e562d6afc 100644 --- a/yuthon_issue/views/issue_approval_views.xml +++ b/yuthon_issue/views/issue_approval_views.xml @@ -22,9 +22,26 @@
- - + + + + + + + + + + + +
+

+ +

+
diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml index 2efb39289..9f8660627 100644 --- a/yuthon_issue/views/issue_library_views.xml +++ b/yuthon_issue/views/issue_library_views.xml @@ -38,9 +38,26 @@ - - + + + + + + + + + + + +
+

+ +

+
diff --git a/yuthon_notice/models/yuthon_notice.py b/yuthon_notice/models/yuthon_notice.py index 6e88b115c..44cbebe5a 100644 --- a/yuthon_notice/models/yuthon_notice.py +++ b/yuthon_notice/models/yuthon_notice.py @@ -37,6 +37,7 @@ class YuthonNotice(models.Model): users_ids = fields.Many2many('res.users', string='用户') urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): diff --git a/yuthon_official/models/yuthon_offficial_incoming_party.py b/yuthon_official/models/yuthon_offficial_incoming_party.py index 8c3d20db2..e21756574 100644 --- a/yuthon_official/models/yuthon_offficial_incoming_party.py +++ b/yuthon_official/models/yuthon_offficial_incoming_party.py @@ -35,6 +35,7 @@ class YuthonOfficialIncomingParty(models.Model): official_documents_ids = fields.Many2many('ir.attachment', string="附件") is_issues = fields.Boolean(string="是否上会") related_issues_id = fields.Many2one('issue.library', string="关联议题") + active = fields.Boolean('Active', default=True, tracking=True) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_official/models/yuthon_official.py b/yuthon_official/models/yuthon_official.py index 7e4f2a31a..83e1e8d5b 100644 --- a/yuthon_official/models/yuthon_official.py +++ b/yuthon_official/models/yuthon_official.py @@ -32,6 +32,7 @@ class YuthonOfficial(models.Model): official_statu = fields.Selection([('done', '办结'), ('approval', '审核')], string="公文环节") is_meet = fields.Boolean(string="是否上会") is_official_incoming = fields.Boolean(string="是否收文") + active = fields.Boolean('Active', default=True, tracking=True) red_suit = fields.Char(string="套红") official_documents_ids = fields.Many2many('ir.attachment', string="附件") diff --git a/yuthon_official/models/yuthon_official_incoming_labor.py b/yuthon_official/models/yuthon_official_incoming_labor.py index 5288fbb20..31ff868d6 100644 --- a/yuthon_official/models/yuthon_official_incoming_labor.py +++ b/yuthon_official/models/yuthon_official_incoming_labor.py @@ -35,6 +35,7 @@ class YuthonOfficialIncomingLabor(models.Model): official_documents_ids = fields.Many2many('ir.attachment', string="附件") is_issues = fields.Boolean(string="是否上会") related_issues_id = fields.Many2one('issue.library', string="关联议题") + active = fields.Boolean('Active', default=True, tracking=True) @api.onchange('is_issues') def _onchange_is_issues(self): diff --git a/yuthon_official/models/yuthon_official_incoming_normal.py b/yuthon_official/models/yuthon_official_incoming_normal.py index f7d8f75b7..5759552ff 100644 --- a/yuthon_official/models/yuthon_official_incoming_normal.py +++ b/yuthon_official/models/yuthon_official_incoming_normal.py @@ -31,6 +31,7 @@ class YuthonOfficialIncomingNormal(models.Model): department_data = fields.Html(string="拟办意见") red_suit = fields.Char(string="套红") official_statu = fields.Selection([('done', '办结'), ('approval', '审核')], string="公文环节") + active = fields.Boolean('Active', default=True, tracking=True) is_issues = fields.Boolean(string="是否上会") is_supervising = fields.Boolean(string="是否督办") diff --git a/yuthon_official/models/yuthon_official_labor.py b/yuthon_official/models/yuthon_official_labor.py index 8fbd6c831..5ae8fcecc 100644 --- a/yuthon_official/models/yuthon_official_labor.py +++ b/yuthon_official/models/yuthon_official_labor.py @@ -26,3 +26,4 @@ class YuthonOfficialLabor(models.Model): deadline = fields.Date(string="办理期限") red_suit = fields.Char(string="套红") official_documents_ids = fields.Many2many('ir.attachment', string="附件") + active = fields.Boolean('Active', default=True, tracking=True) diff --git a/yuthon_official/models/yuthon_official_party.py b/yuthon_official/models/yuthon_official_party.py index c32a5d4f7..ea0119d71 100644 --- a/yuthon_official/models/yuthon_official_party.py +++ b/yuthon_official/models/yuthon_official_party.py @@ -33,3 +33,4 @@ class YuthonOfficialParty(models.Model): deadline = fields.Date(string="办理期限") red_suit = fields.Char(string="套红") official_documents_ids = fields.Many2many('documents.document', string="公文相关文件") + active = fields.Boolean('Active', default=True, tracking=True) diff --git a/yuthon_performance/models/yuthon_duty_management.py b/yuthon_performance/models/yuthon_duty_management.py index ac0d86d41..e8e2f632a 100644 --- a/yuthon_performance/models/yuthon_duty_management.py +++ b/yuthon_performance/models/yuthon_duty_management.py @@ -27,6 +27,14 @@ class YuthonDutyManagement(models.Model): start_index_time = fields.Date('指标生效时间') end_index_time = fields.Date('指标失效时间') total_weights = fields.Float('总权重') + urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', + default='normal') + active = fields.Boolean('Active', default=True, tracking=True) + + def _get_default_name_title(self): + return self._description if self._description else self._name + + name_title = fields.Char(default=_get_default_name_title) # 绩效考核 performance_kpi_ids = fields.One2many('yuthon.kpi.line', 'performance_kpi_id', string="KPI") performance_gs_ids = fields.One2many('yuthon.gs.line', 'performance_gs_id', string="GS") diff --git a/yuthon_performance/models/yuthon_employee_approval.py b/yuthon_performance/models/yuthon_employee_approval.py index ecb70c55e..5810a59e7 100644 --- a/yuthon_performance/models/yuthon_employee_approval.py +++ b/yuthon_performance/models/yuthon_employee_approval.py @@ -21,7 +21,14 @@ class YuthonEmployeeApproval(models.Model): change_employee_library_ids = fields.One2many("yuthon.index.employee",'change_employee_library_id',string="员工指标库库变更明细") new_change_employee_library_ids = fields.One2many("new.employee.library.line",'new_change_employee_library_id',string="新员工指标库变更明细") users_role_ids = fields.Many2many('soong.user.role', string='被考核角色', domain=[('user_type', '!=', 'lv_role')]) + active = fields.Boolean('Active', default=True, tracking=True) + urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', + default='normal') + def _get_default_name_title(self): + return self._description if self._description else self._name + + name_title = fields.Char(default=_get_default_name_title) @api.onchange('change_employee_library_ids') def _onchange_change_employee_library_ids(self): new_lines = [] diff --git a/yuthon_performance/models/yuthon_tissue_duty_approval.py b/yuthon_performance/models/yuthon_tissue_duty_approval.py index 288c1cc5b..cddfd31fa 100644 --- a/yuthon_performance/models/yuthon_tissue_duty_approval.py +++ b/yuthon_performance/models/yuthon_tissue_duty_approval.py @@ -24,6 +24,14 @@ class YuthonTissueDutyApproval(models.Model): new_gs_duty_approval_ids = fields.One2many('new.gs.duty.approval', 'yuthon_tissue_duty_approval_id', string="关联新组织绩效GS变更明细") is_kpi = fields.Boolean('是否KPI') is_gs = fields.Boolean('是否GS') + active = fields.Boolean('Active', default=True, tracking=True) + urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', + default='normal') + + def _get_default_name_title(self): + return self._description if self._description else self._name + + name_title = fields.Char(default=_get_default_name_title) @api.onchange('change_duty_kpi_ids') def onchange_change_index_library_ids(self): diff --git a/yuthon_property_approval/models/perperty_claim_approval.py b/yuthon_property_approval/models/perperty_claim_approval.py index e3081ba4f..ce4dc36cb 100644 --- a/yuthon_property_approval/models/perperty_claim_approval.py +++ b/yuthon_property_approval/models/perperty_claim_approval.py @@ -24,6 +24,7 @@ class PropertyClaimApproval(models.Model): contract_id = fields.Many2one('property.lease.contract', string="关联合同流程") borrowing_approval_id = fields.Many2one('property.borrowing.approval', string="关联借支流程") claim_line_ids = fields.One2many('property.claim.line', 'claim_id', string="报销明细") + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) diff --git a/yuthon_property_approval/models/property_accounting_approval.py b/yuthon_property_approval/models/property_accounting_approval.py index 2711603f1..1b2527e03 100644 --- a/yuthon_property_approval/models/property_accounting_approval.py +++ b/yuthon_property_approval/models/property_accounting_approval.py @@ -31,6 +31,7 @@ class PropertyAccountingApproval(models.Model): accounting_way_ids = fields.One2many('accounting.way.line', 'accounting_id', string="关联支付方式明细行") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_approval.py b/yuthon_property_approval/models/property_approval.py index 0abefde6c..af86d8a0b 100644 --- a/yuthon_property_approval/models/property_approval.py +++ b/yuthon_property_approval/models/property_approval.py @@ -23,6 +23,7 @@ class PropertyApproval(models.Model): property_massage_ids = fields.One2many('property.approval.line', 'property_approval_id', string="审批信息") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_billing_confirmation.py b/yuthon_property_approval/models/property_billing_confirmation.py index c0727a859..4d57ab666 100644 --- a/yuthon_property_approval/models/property_billing_confirmation.py +++ b/yuthon_property_approval/models/property_billing_confirmation.py @@ -14,3 +14,4 @@ class PropertyBillingyConfirmation(models.Model): code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_business_confirm_code')) property_documents_ids = fields.Many2many('documents.document', string="账单确认单文件") + active = fields.Boolean('Active', default=True, tracking=True) diff --git a/yuthon_property_approval/models/property_borrowing_approval.py b/yuthon_property_approval/models/property_borrowing_approval.py index 32db5d362..44cd69b7b 100644 --- a/yuthon_property_approval/models/property_borrowing_approval.py +++ b/yuthon_property_approval/models/property_borrowing_approval.py @@ -23,6 +23,7 @@ class PropertyBorrowingApproval(models.Model): def _get_default_name_title(self): return self._description if self._description else self._name name_title = fields.Char(default=_get_default_name_title) + active = fields.Boolean('Active', default=True, tracking=True) class YuthonBorrowingLine(models.Model): diff --git a/yuthon_property_approval/models/property_business_confirm.py b/yuthon_property_approval/models/property_business_confirm.py index 204bb304b..17c74adfd 100644 --- a/yuthon_property_approval/models/property_business_confirm.py +++ b/yuthon_property_approval/models/property_business_confirm.py @@ -14,3 +14,4 @@ class PropertyBusinessConfirm(models.Model): code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_billing_confirmation_code')) property_documents_ids = fields.Many2many('documents.document', string="经营报表确认单文件") + active = fields.Boolean('Active', default=True, tracking=True) diff --git a/yuthon_property_approval/models/property_capacity.py b/yuthon_property_approval/models/property_capacity.py index f85038f91..0aa7e8dd0 100644 --- a/yuthon_property_approval/models/property_capacity.py +++ b/yuthon_property_approval/models/property_capacity.py @@ -25,6 +25,7 @@ class PropertyCapacity(models.Model): is_electricity = fields.Boolean(string="电") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_collection_confirm.py b/yuthon_property_approval/models/property_collection_confirm.py index 71874e0f0..72ca55d90 100644 --- a/yuthon_property_approval/models/property_collection_confirm.py +++ b/yuthon_property_approval/models/property_collection_confirm.py @@ -13,4 +13,5 @@ class PropertyCollectionConfirm(models.Model): name = fields.Char(string='标题') code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_collection_confirm_code')) - property_documents_ids = fields.Many2many('documents.document', string="收款确认单文件") \ No newline at end of file + property_documents_ids = fields.Many2many('documents.document', string="收款确认单文件") + active = fields.Boolean('Active', default=True, tracking=True) \ No newline at end of file diff --git a/yuthon_property_approval/models/property_confirm.py b/yuthon_property_approval/models/property_confirm.py index 2dfa465ae..8ffe5fc0f 100644 --- a/yuthon_property_approval/models/property_confirm.py +++ b/yuthon_property_approval/models/property_confirm.py @@ -14,6 +14,7 @@ class PropertyConfirm(models.Model): code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_confirm_code')) property_documents_ids = fields.Many2many('documents.document', string="物业成交确认文件") lessee = fields.Char(string="承租方") + active = fields.Boolean('Active', default=True, tracking=True) diff --git a/yuthon_property_approval/models/property_construction_approval.py b/yuthon_property_approval/models/property_construction_approval.py index 1d09c3279..7f1e9675d 100644 --- a/yuthon_property_approval/models/property_construction_approval.py +++ b/yuthon_property_approval/models/property_construction_approval.py @@ -31,6 +31,7 @@ class PropertyConstructionApproval(models.Model): construction_way_ids = fields.One2many('construction.way.line', 'construction_id', string="关联支付方式") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_construction_work.py b/yuthon_property_approval/models/property_construction_work.py index 669dcbfa0..e5450d277 100644 --- a/yuthon_property_approval/models/property_construction_work.py +++ b/yuthon_property_approval/models/property_construction_work.py @@ -12,3 +12,4 @@ class PropertyConstructionWork(models.Model): name = fields.Char(string='名称') code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_construction_work_sequence')) + active = fields.Boolean('Active', default=True, tracking=True) \ No newline at end of file diff --git a/yuthon_property_approval/models/property_contract_changes.py b/yuthon_property_approval/models/property_contract_changes.py index ab626e14a..7ad1b6f0b 100644 --- a/yuthon_property_approval/models/property_contract_changes.py +++ b/yuthon_property_approval/models/property_contract_changes.py @@ -11,6 +11,6 @@ class PropertyContractChanges(models.Model): name = fields.Char(string='名称') code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_contract_changes_sequence')) - + active = fields.Boolean('Active', default=True, tracking=True) diff --git a/yuthon_property_approval/models/property_delegated_agent.py b/yuthon_property_approval/models/property_delegated_agent.py index dfd395310..241eab075 100644 --- a/yuthon_property_approval/models/property_delegated_agent.py +++ b/yuthon_property_approval/models/property_delegated_agent.py @@ -21,6 +21,7 @@ class PropertyDelegatedAgent(models.Model): quotations_list_id = fields.Many2one('ir.attachment', string="报价清单") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_design_approval.py b/yuthon_property_approval/models/property_design_approval.py index 23c062dea..c6acffc3d 100644 --- a/yuthon_property_approval/models/property_design_approval.py +++ b/yuthon_property_approval/models/property_design_approval.py @@ -27,6 +27,7 @@ class PropertyDesignApproval(models.Model): design_way_ids = fields.One2many('design.way.line', 'design_id', string="关联支付方式") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_early_quitting.py b/yuthon_property_approval/models/property_early_quitting.py index e9999fd6a..c3c2a0321 100644 --- a/yuthon_property_approval/models/property_early_quitting.py +++ b/yuthon_property_approval/models/property_early_quitting.py @@ -29,6 +29,7 @@ class PropertyEarlyQuitting(models.Model): reason = fields.Text(string="退租原因") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_equity.py b/yuthon_property_approval/models/property_equity.py index 9ea7fc77c..00899fc93 100644 --- a/yuthon_property_approval/models/property_equity.py +++ b/yuthon_property_approval/models/property_equity.py @@ -28,7 +28,7 @@ class PropertyEquity(models.Model): new_owner = fields.Char(string='新权属人') urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') - + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_evaluate_application.py b/yuthon_property_approval/models/property_evaluate_application.py index 552c31eb3..f59816333 100644 --- a/yuthon_property_approval/models/property_evaluate_application.py +++ b/yuthon_property_approval/models/property_evaluate_application.py @@ -22,6 +22,7 @@ class PropertyEvaluateApplication(models.Model): evaluate_application_ids = fields.One2many('evaluate.application.line', 'property_message_id', string='物业信息明细行') urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_fitment.py b/yuthon_property_approval/models/property_fitment.py index 1136ade41..39f29e489 100644 --- a/yuthon_property_approval/models/property_fitment.py +++ b/yuthon_property_approval/models/property_fitment.py @@ -30,6 +30,7 @@ class PropertyFitment(models.Model): property_documents_ids = fields.Many2many('documents.document', string="装修文件") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_handover.py b/yuthon_property_approval/models/property_handover.py index 57c4e38da..4eded2d3f 100644 --- a/yuthon_property_approval/models/property_handover.py +++ b/yuthon_property_approval/models/property_handover.py @@ -20,6 +20,7 @@ class PropertyHandover(models.Model): property_handover_ids = fields.One2many('property.handover.line', 'property_handover_id', string="移交申请") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_information.py b/yuthon_property_approval/models/property_information.py index 03c5f8e84..3e0634279 100644 --- a/yuthon_property_approval/models/property_information.py +++ b/yuthon_property_approval/models/property_information.py @@ -26,6 +26,7 @@ class PropertyInformation(models.Model): property_id = fields.Char(string="物业ID") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_inventory_table.py b/yuthon_property_approval/models/property_inventory_table.py index 63ca6e6a2..f7dceb584 100644 --- a/yuthon_property_approval/models/property_inventory_table.py +++ b/yuthon_property_approval/models/property_inventory_table.py @@ -13,4 +13,5 @@ class PropertyInventoryTable(models.Model): name = fields.Char(string='标题') code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_inventory_table_code')) - property_documents_ids = fields.Many2many('documents.document', string="盘点表文件") \ No newline at end of file + property_documents_ids = fields.Many2many('documents.document', string="盘点表文件") + active = fields.Boolean('Active', default=True, tracking=True) \ No newline at end of file diff --git a/yuthon_property_approval/models/property_lease_alter.py b/yuthon_property_approval/models/property_lease_alter.py index af1d13b53..12662e317 100644 --- a/yuthon_property_approval/models/property_lease_alter.py +++ b/yuthon_property_approval/models/property_lease_alter.py @@ -13,4 +13,5 @@ class PropertyLeaseAlter(models.Model): name = fields.Char(string='标题') code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_lease_alter_code')) - property_documents_ids = fields.Many2many('documents.document', string="续租审批文件") \ No newline at end of file + property_documents_ids = fields.Many2many('documents.document', string="续租审批文件") + active = fields.Boolean('Active', default=True, tracking=True) \ No newline at end of file diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py index 5314d44a3..5c3f22b29 100644 --- a/yuthon_property_approval/models/property_lease_contract.py +++ b/yuthon_property_approval/models/property_lease_contract.py @@ -52,6 +52,7 @@ class PropertyLeaseContract(models.Model): industry_id = fields.Many2one(related='lessee_id.industry_id', string="行业") address_for_delivery = fields.Char(string="送达地址") precinct_id = fields.Many2one('yuthon.precinct.message', string="所属片区") + active = fields.Boolean('Active', default=True, tracking=True) lease_term = fields.Float(string="租期") lease_term_year = fields.Integer(string="租期(年)") diff --git a/yuthon_property_approval/models/property_lease_extension.py b/yuthon_property_approval/models/property_lease_extension.py index 3cd731705..78f8d9265 100644 --- a/yuthon_property_approval/models/property_lease_extension.py +++ b/yuthon_property_approval/models/property_lease_extension.py @@ -29,6 +29,7 @@ class PropertyLeaseExtension(models.Model): related_issues_id = fields.Many2one('issue.library', string="关联议题") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_lease_renewal.py b/yuthon_property_approval/models/property_lease_renewal.py index 447223376..ffea052f4 100644 --- a/yuthon_property_approval/models/property_lease_renewal.py +++ b/yuthon_property_approval/models/property_lease_renewal.py @@ -13,4 +13,5 @@ class PropertyLeaseRenewal(models.Model): name = fields.Char(string='标题') code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_lease_renewal_code')) - property_documents_ids = fields.Many2many('documents.document', string="租赁合同变更文件") \ No newline at end of file + property_documents_ids = fields.Many2many('documents.document', string="租赁合同变更文件") + active = fields.Boolean('Active', default=True, tracking=True) \ No newline at end of file diff --git a/yuthon_property_approval/models/property_lessee_change.py b/yuthon_property_approval/models/property_lessee_change.py index 388ed94d1..c88c5ee32 100644 --- a/yuthon_property_approval/models/property_lessee_change.py +++ b/yuthon_property_approval/models/property_lessee_change.py @@ -16,3 +16,4 @@ class PropertyLesseeChange(models.Model): new_lessee = fields.Char(string="新承租方") reason = fields.Text(string="变更原因") renaming_materials_ids = fields.Many2many('documents.document', string="更名材料") + active = fields.Boolean('Active', default=True, tracking=True) diff --git a/yuthon_property_approval/models/property_management.py b/yuthon_property_approval/models/property_management.py index d61d328d3..1a9b074de 100644 --- a/yuthon_property_approval/models/property_management.py +++ b/yuthon_property_approval/models/property_management.py @@ -19,7 +19,7 @@ class PropertyManagement(models.Model): new_property_ids = fields.One2many('property.information.detail.lines', 'new_property_id', string="新物业信息") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') - + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_management_fee.py b/yuthon_property_approval/models/property_management_fee.py index e7058078e..623363766 100644 --- a/yuthon_property_approval/models/property_management_fee.py +++ b/yuthon_property_approval/models/property_management_fee.py @@ -19,6 +19,7 @@ class PropertyManagementFee(models.Model): start_date = fields.Date(string="生效日期") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_material_procurement.py b/yuthon_property_approval/models/property_material_procurement.py index f21e57bcf..f635b9089 100644 --- a/yuthon_property_approval/models/property_material_procurement.py +++ b/yuthon_property_approval/models/property_material_procurement.py @@ -13,4 +13,5 @@ class PropertyMaterialProcurement(models.Model): name = fields.Char(string='标题') code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_material_procurement_code')) - property_documents_ids = fields.Many2many('documents.document', string="物资配件采购单文件") \ No newline at end of file + property_documents_ids = fields.Many2many('documents.document', string="物资配件采购单文件") + active = fields.Boolean('Active', default=True, tracking=True) \ No newline at end of file diff --git a/yuthon_property_approval/models/property_merge_approval.py b/yuthon_property_approval/models/property_merge_approval.py index cd533ea75..246768f01 100644 --- a/yuthon_property_approval/models/property_merge_approval.py +++ b/yuthon_property_approval/models/property_merge_approval.py @@ -26,6 +26,7 @@ class PropertyMergeApproval(models.Model): is_issues = fields.Boolean(string='是否上会') urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_move.py b/yuthon_property_approval/models/property_move.py index a722ce69a..c23aff744 100644 --- a/yuthon_property_approval/models/property_move.py +++ b/yuthon_property_approval/models/property_move.py @@ -13,7 +13,7 @@ class PropertyMove(models.Model): name = fields.Char(string='标题') code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_move_code')) property_documents_ids = fields.Many2many('documents.document', string="物业调拨文件") - + active = fields.Boolean('Active', default=True, tracking=True) diff --git a/yuthon_property_approval/models/property_offline_registration.py b/yuthon_property_approval/models/property_offline_registration.py index 8fd3681d2..e36d5403c 100644 --- a/yuthon_property_approval/models/property_offline_registration.py +++ b/yuthon_property_approval/models/property_offline_registration.py @@ -26,6 +26,7 @@ class PropertyOfflineRegistration(models.Model): related_issues_id = fields.Many2one('issue.library', string="关联议题") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_open_rent.py b/yuthon_property_approval/models/property_open_rent.py index c04071d2c..e677a280d 100644 --- a/yuthon_property_approval/models/property_open_rent.py +++ b/yuthon_property_approval/models/property_open_rent.py @@ -17,6 +17,7 @@ class PropertyOpenRent(models.Model): upset = fields.Float(string="底价") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_penalty_proportion.py b/yuthon_property_approval/models/property_penalty_proportion.py index 89be4b6d1..539f94ffb 100644 --- a/yuthon_property_approval/models/property_penalty_proportion.py +++ b/yuthon_property_approval/models/property_penalty_proportion.py @@ -20,6 +20,7 @@ class PropertyPenaltyProportion(models.Model): date_payment = fields.Date(string='付款日期') urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_penalty_relief.py b/yuthon_property_approval/models/property_penalty_relief.py index aa6235b4a..4688d818e 100644 --- a/yuthon_property_approval/models/property_penalty_relief.py +++ b/yuthon_property_approval/models/property_penalty_relief.py @@ -27,6 +27,7 @@ class PropertyPenaltyRelief(models.Model): penalty_relief_line_ids = fields.One2many('property.penalty.relief.line', 'penalty_relief_id', string="违约金列表") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_project_approval.py b/yuthon_property_approval/models/property_project_approval.py index f6ec3e821..f3605cdd5 100644 --- a/yuthon_property_approval/models/property_project_approval.py +++ b/yuthon_property_approval/models/property_project_approval.py @@ -20,6 +20,7 @@ class PropertyProjectApproval(models.Model): end_date = fields.Date(string="结束日期") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_project_works.py b/yuthon_property_approval/models/property_project_works.py index d3628200b..3a26a8587 100644 --- a/yuthon_property_approval/models/property_project_works.py +++ b/yuthon_property_approval/models/property_project_works.py @@ -21,6 +21,7 @@ class PropertyProjectWorks(models.Model): not_paid = fields.Float(string="未付") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_record.py b/yuthon_property_approval/models/property_record.py index 551a59c76..3b680734f 100644 --- a/yuthon_property_approval/models/property_record.py +++ b/yuthon_property_approval/models/property_record.py @@ -27,6 +27,7 @@ class PropertyRecord(models.Model): string='关联物业信息明细行') urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_reimbursement_form.py b/yuthon_property_approval/models/property_reimbursement_form.py index adf6fc7ee..6d3821291 100644 --- a/yuthon_property_approval/models/property_reimbursement_form.py +++ b/yuthon_property_approval/models/property_reimbursement_form.py @@ -24,6 +24,7 @@ class PropertyReimbursementForm(models.Model): physical_line_ids = fields.One2many('property.physical.line', 'reimbursement_id', string="体检费明细") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_renamed.py b/yuthon_property_approval/models/property_renamed.py index c3336c799..19fb8e2ee 100644 --- a/yuthon_property_approval/models/property_renamed.py +++ b/yuthon_property_approval/models/property_renamed.py @@ -23,6 +23,7 @@ class PropertyRenamed(models.Model): renamed_invoicing_type = fields.Selection([('spot', '专票'), ('cape', '普票')], string="开票类型") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_rent_relief.py b/yuthon_property_approval/models/property_rent_relief.py index 8a84778eb..0152bec1d 100644 --- a/yuthon_property_approval/models/property_rent_relief.py +++ b/yuthon_property_approval/models/property_rent_relief.py @@ -26,6 +26,7 @@ class PropertyRentRelief(models.Model): property_rent_relief_ids = fields.One2many('property.rent.relief.line', 'property_rent_relief_id', string="租金列表") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_rental_conditions.py b/yuthon_property_approval/models/property_rental_conditions.py index 2ec11d3ff..2fbf24556 100644 --- a/yuthon_property_approval/models/property_rental_conditions.py +++ b/yuthon_property_approval/models/property_rental_conditions.py @@ -21,6 +21,7 @@ class PropertyRentalConditions(models.Model): related_issues_id = fields.Many2one('issue.library', string="关联议题") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_rental_form.py b/yuthon_property_approval/models/property_rental_form.py index cfedc1a11..ac424a670 100644 --- a/yuthon_property_approval/models/property_rental_form.py +++ b/yuthon_property_approval/models/property_rental_form.py @@ -19,6 +19,7 @@ class PropertyRentalForm(models.Model): default=lambda self: self.env['ir.sequence'].next_by_code('property_rental_form_code')) urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_split_approval.py b/yuthon_property_approval/models/property_split_approval.py index 4a103af9a..138944620 100644 --- a/yuthon_property_approval/models/property_split_approval.py +++ b/yuthon_property_approval/models/property_split_approval.py @@ -26,6 +26,7 @@ class PropertySplitApproval(models.Model): split_quantity = fields.Integer(string='拆分数量', default=2) urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_sporadic_works.py b/yuthon_property_approval/models/property_sporadic_works.py index de899c1d8..039c9a420 100644 --- a/yuthon_property_approval/models/property_sporadic_works.py +++ b/yuthon_property_approval/models/property_sporadic_works.py @@ -20,6 +20,7 @@ class PropertySporadicWorks(models.Model): payment_methods_line_ids = fields.One2many('payment.methods.line', 'payment_methods_id', string="付款方式明细行") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_supervising_approval.py b/yuthon_property_approval/models/property_supervising_approval.py index afa7a2365..4fb2348ec 100644 --- a/yuthon_property_approval/models/property_supervising_approval.py +++ b/yuthon_property_approval/models/property_supervising_approval.py @@ -27,6 +27,7 @@ class PropertySupervisingApproval(models.Model): supervising_way_ids = fields.One2many('supervising.way.line', 'supervising_id', string="关联支付方式") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_transaction_confirmed.py b/yuthon_property_approval/models/property_transaction_confirmed.py index e7eec8d60..f6b63809b 100644 --- a/yuthon_property_approval/models/property_transaction_confirmed.py +++ b/yuthon_property_approval/models/property_transaction_confirmed.py @@ -23,6 +23,7 @@ class PropertyTransactionConfirmed(models.Model): related_issues_id = fields.Many2one('issue.library', string="关联议题") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_transfer_approval.py b/yuthon_property_approval/models/property_transfer_approval.py index 2be61de9d..217f95be9 100644 --- a/yuthon_property_approval/models/property_transfer_approval.py +++ b/yuthon_property_approval/models/property_transfer_approval.py @@ -35,6 +35,7 @@ class PropertyTransferApproval(models.Model): transfer_remark = fields.Html(string="备注") urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', default='normal') + active = fields.Boolean('Active', default=True, tracking=True) def _get_default_name_title(self): return self._description if self._description else self._name diff --git a/yuthon_property_approval/models/property_utility_bills.py b/yuthon_property_approval/models/property_utility_bills.py index 3b4a84157..e0d48cadc 100644 --- a/yuthon_property_approval/models/property_utility_bills.py +++ b/yuthon_property_approval/models/property_utility_bills.py @@ -13,4 +13,5 @@ class PropertyUtilityBills(models.Model): name = fields.Char(string='标题') code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_utility_bills_code')) - property_documents_ids = fields.Many2many('documents.document', string="水电费文件") \ No newline at end of file + property_documents_ids = fields.Many2many('documents.document', string="水电费文件") + active = fields.Boolean('Active', default=True, tracking=True) \ No newline at end of file