diff --git a/tianhe_approvals/__manifest__.py b/tianhe_approvals/__manifest__.py index 44c256984..b48730d06 100644 --- a/tianhe_approvals/__manifest__.py +++ b/tianhe_approvals/__manifest__.py @@ -29,14 +29,6 @@ 'views/tianhe_rental_receipt_approval.xml', 'views/tianhe_official_receipt.xml', 'views/tianhe_meeting_file.xml', - 'views/generic_forms_replacement_card.xml', - 'views/generic_forms_overtime.xml', - 'views/generic_forms_outing.xml', - 'views/generic_forms_remove_holiday.xml', - 'views/tianhe_dimission_approval.xml', - 'views/tianhe_tryout_official_approval.xml', - 'views/tianhe_exercitation_tryout_approval.xml', - 'views/generic_forms_reassignment.xml', ], 'application': True, 'installable': True, diff --git a/tianhe_approvals/data/approval_category_type_data.xml b/tianhe_approvals/data/approval_category_type_data.xml index 6d0bcb81f..16d93656c 100644 --- a/tianhe_approvals/data/approval_category_type_data.xml +++ b/tianhe_approvals/data/approval_category_type_data.xml @@ -92,45 +92,5 @@ 天河投资租赁合同收款单 rental_receipt - - - 补卡 - generic_forms_replacement_card - - - - 加班 - generic_forms_overtime - - - - 外出 - generic_forms_outing - - - - 销假 - generic_forms_remove_holiday - - - - 离职表 - dimission - - - - 试用期转正式员工 - tryout_official - - - - 实习期转试用期 - exercitation_tryout - - - - 调岗 - generic_forms_reassignment - diff --git a/tianhe_approvals/models/__init__.py b/tianhe_approvals/models/__init__.py index d467dc1ba..bf61e9a3f 100644 --- a/tianhe_approvals/models/__init__.py +++ b/tianhe_approvals/models/__init__.py @@ -9,11 +9,3 @@ from . import tianhe_contentious_matter_approval from . import tianhe_document_processing_approval from . import tianhe_property_submission_approval from . import tianhe_rental_receipt_approval -from . import generic_forms_replacement_card -from . import generic_forms_overtime -from . import generic_forms_outing -from . import generic_forms_remove_holiday -from . import tianhe_dimission_approval -from . import tianhe_tryout_official_approval -from . import tianhe_exercitation_tryout_approval -from . import generic_forms_reassignment diff --git a/tianhe_approvals/models/generic_forms_outing.py b/tianhe_approvals/models/generic_forms_outing.py deleted file mode 100644 index cba7f04d3..000000000 --- a/tianhe_approvals/models/generic_forms_outing.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import api, fields, models, tools -from odoo.exceptions import ValidationError - - -class GenericFormsOuting(models.Model): - _inherit = "approval.request" - _description = '公司通用表单——外出' - - missed_meal_charges = fields.Char(string="误餐费") - apply_unit = fields.Char(string="申请单位") - - diff --git a/tianhe_approvals/models/generic_forms_overtime.py b/tianhe_approvals/models/generic_forms_overtime.py deleted file mode 100644 index 918dd9a76..000000000 --- a/tianhe_approvals/models/generic_forms_overtime.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import api, fields, models, tools -from odoo.exceptions import ValidationError - - -class GenericFormsOvertime(models.Model): - _inherit = "approval.request" - _description = '公司通用表单——加班' - - type_overtime = fields.Char(string="加班类型") - compensation_mode = fields.Char(string="补偿方式") - overtime_meal_pay = fields.Char(string="加班餐费") - diff --git a/tianhe_approvals/models/generic_forms_reassignment.py b/tianhe_approvals/models/generic_forms_reassignment.py deleted file mode 100644 index 6b873c75a..000000000 --- a/tianhe_approvals/models/generic_forms_reassignment.py +++ /dev/null @@ -1,14 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import api, fields, models, tools -from odoo.exceptions import ValidationError - - -class GenericFormsReassignment(models.Model): - _inherit = "approval.request" - _description = '公司通用表单——调岗' - - change_department = fields.Char(string="调岗部门") - change_post = fields.Char(string="调岗岗位") - timing_reassignments = fields.Char(string="调岗时间") - - diff --git a/tianhe_approvals/models/generic_forms_remove_holiday.py b/tianhe_approvals/models/generic_forms_remove_holiday.py deleted file mode 100644 index 2561db3b7..000000000 --- a/tianhe_approvals/models/generic_forms_remove_holiday.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import api, fields, models, tools -from odoo.exceptions import ValidationError - - -class GenericFormsRemoveHoliday(models.Model): - _inherit = "approval.request" - _description = '公司通用表单——销假' - - entry_time = fields.Datetime(string="入职时间") - type_remove_holiday = fields.Char(string="销假类型") - - diff --git a/tianhe_approvals/models/generic_forms_replacement_card.py b/tianhe_approvals/models/generic_forms_replacement_card.py deleted file mode 100644 index 90eb2e9ee..000000000 --- a/tianhe_approvals/models/generic_forms_replacement_card.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import api, fields, models, tools -from odoo.exceptions import ValidationError - - -class GenericFormsReplacementCard(models.Model): - _inherit = "approval.request" - _description = '公司通用表单——补卡' - - type_application = fields.Selection([ - ('replacement_card', '补卡'), - ('overtime', '加班'), - ('outing', '外出'), - ('cancellation_of_fakes', '销假'), - ('Reassignment', '调岗'), - ('dimission', '离职'), - ('onboarding', '入职'), - ('regularization', '转正'), - ], string="申请类型") - replacement_time = fields.Datetime(string="补卡时间") - real_go_work_time = fields.Datetime(string="全天上班") - real_get_off_work_time = fields.Datetime(string="全天下班") - type_of_exception = fields.Char(string="异常类型") diff --git a/tianhe_approvals/models/inherit_approval_category.py b/tianhe_approvals/models/inherit_approval_category.py index 7afd27e7a..b0a8c7088 100644 --- a/tianhe_approvals/models/inherit_approval_category.py +++ b/tianhe_approvals/models/inherit_approval_category.py @@ -25,12 +25,4 @@ class ApprovalCategory(models.Model): ('document_processing', '文件处理表'), ('property_submission', '物业部业务呈批表'), ('rental_receipt', '租赁合同收款单'), - ('generic_forms_replacement_card', '公司通用表单——补卡'), - ('generic_forms_overtime', '公司通用表单——加班'), - ('generic_forms_outing', '公司通用表单——外出'), - ('generic_forms_remove_holiday', '公司通用表单——销假'), - ('dimission', '离职表'), - ('tryout_official', '试用期转正式员工'), - ('exercitation_tryout', '实习期转试用期'), - ('generic_forms_reassignment', '公司通用表单——调岗'), ]) diff --git a/tianhe_approvals/models/inherit_approval_request.py b/tianhe_approvals/models/inherit_approval_request.py index a5bb5c948..ad3be0505 100644 --- a/tianhe_approvals/models/inherit_approval_request.py +++ b/tianhe_approvals/models/inherit_approval_request.py @@ -32,19 +32,6 @@ class ApprovalRequest(models.Model): lessee = fields.Char(string="承租方") contract_id = fields.Char(string="合同编号") servings_number = fields.Integer(string="份数") - duration = fields.Char(string="时长") - post = fields.Many2one('yuthon.user.role', string="岗位") - date_start = fields.Datetime(string="开始时间") - date_end = fields.Datetime(string="结束时间") - form_employment = fields.Selection([('exercitation', '实习'), - ('expatriate', '外派'), - ('tryout', '试用'), - ('official', '正式'), - ], string="聘用形式") - approval_sex = fields.Selection([('girl', '女'), ('boy', '男')], string="性别") - Position_level = fields.Many2one('yuthon.job.lv', string="岗位级档") - entry_time = fields.Datetime(string="入职时间") - reason_application = fields.Char(string="申请事由") class ApprovalRequestLine(models.Model): @@ -53,4 +40,3 @@ class ApprovalRequestLine(models.Model): approval_request_id = fields.Many2one('approval.request') topic = fields.Char(string='议题') - diff --git a/tianhe_approvals/models/tianhe_dimission_approval.py b/tianhe_approvals/models/tianhe_dimission_approval.py deleted file mode 100644 index e49c7f33d..000000000 --- a/tianhe_approvals/models/tianhe_dimission_approval.py +++ /dev/null @@ -1,11 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import api, fields, models, tools, _ -from odoo.exceptions import ValidationError - - -class TianHeDimissionApproval(models.Model): - _inherit = "approval.request" - _description = '离职表' - - expected_time = fields.Datetime(string="期望离职时间") - regularization_state = fields.Char(string="转正状态") \ No newline at end of file diff --git a/tianhe_approvals/models/tianhe_exercitation_tryout_approval.py b/tianhe_approvals/models/tianhe_exercitation_tryout_approval.py deleted file mode 100644 index 72d8c237e..000000000 --- a/tianhe_approvals/models/tianhe_exercitation_tryout_approval.py +++ /dev/null @@ -1,14 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import api, fields, models, tools, _ -from odoo.exceptions import ValidationError - - -class TianHeExercitationTryoutApproval(models.Model): - _inherit = "approval.request" - _description = '实习期转试用期' - - employment_contracts_time = fields.Datetime(string="劳动合同终止时间") - employment_contracts_main = fields.Many2one('res.company',string="劳动合同签定主体") - regularization_date = fields.Char(string="转正日期") - construction_no = fields.Char(string="工号") - turn_official_date = fields.Date(string="转正式日期") \ No newline at end of file diff --git a/tianhe_approvals/models/tianhe_tryout_official_approval.py b/tianhe_approvals/models/tianhe_tryout_official_approval.py deleted file mode 100644 index 30eb68030..000000000 --- a/tianhe_approvals/models/tianhe_tryout_official_approval.py +++ /dev/null @@ -1,12 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import api, fields, models, tools, _ -from odoo.exceptions import ValidationError - - -class TianHeDimissionApproval(models.Model): - _inherit = "approval.request" - _description = '离职表' - - regular_assessment = fields.Char(string="转正考核表") - assessment_ratings = fields.Char(string="考核评级") - regularization_date = fields.Date(string="转正日期") diff --git a/tianhe_approvals/views/generic_forms_outing.xml b/tianhe_approvals/views/generic_forms_outing.xml deleted file mode 100644 index 96cacb545..000000000 --- a/tianhe_approvals/views/generic_forms_outing.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - approvals.category.type.code.generic.forms.outing - approval.request - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tianhe_approvals/views/generic_forms_overtime.xml b/tianhe_approvals/views/generic_forms_overtime.xml deleted file mode 100644 index a59684733..000000000 --- a/tianhe_approvals/views/generic_forms_overtime.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - approvals.category.type.code.generic.forms.overtime - approval.request - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tianhe_approvals/views/generic_forms_reassignment.xml b/tianhe_approvals/views/generic_forms_reassignment.xml deleted file mode 100644 index f300928d3..000000000 --- a/tianhe_approvals/views/generic_forms_reassignment.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - approvals.category.type.code.generic.forms.reassignment - approval.request - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tianhe_approvals/views/generic_forms_remove_holiday.xml b/tianhe_approvals/views/generic_forms_remove_holiday.xml deleted file mode 100644 index b9d78d5a8..000000000 --- a/tianhe_approvals/views/generic_forms_remove_holiday.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - approvals.category.type.code.generic_forms_remove_holiday - approval.request - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tianhe_approvals/views/generic_forms_replacement_card.xml b/tianhe_approvals/views/generic_forms_replacement_card.xml deleted file mode 100644 index d6bfa546a..000000000 --- a/tianhe_approvals/views/generic_forms_replacement_card.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - approvals.category.type.code.generic.forms.replacement.card - approval.request - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tianhe_approvals/views/tianhe_contentious_matter_approval.xml b/tianhe_approvals/views/tianhe_contentious_matter_approval.xml index bb0a4a296..fa64cc7c9 100644 --- a/tianhe_approvals/views/tianhe_contentious_matter_approval.xml +++ b/tianhe_approvals/views/tianhe_contentious_matter_approval.xml @@ -1,7 +1,7 @@ - approvals.category.type.code.contentious.matter.approval + approvals.category.type.code.construction.business.approval approval.request diff --git a/tianhe_approvals/views/tianhe_dimission_approval.xml b/tianhe_approvals/views/tianhe_dimission_approval.xml deleted file mode 100644 index d51a2c948..000000000 --- a/tianhe_approvals/views/tianhe_dimission_approval.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - approvals.category.type.code.dimission.approval - approval.request - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tianhe_approvals/views/tianhe_exercitation_tryout_approval.xml b/tianhe_approvals/views/tianhe_exercitation_tryout_approval.xml deleted file mode 100644 index e71abee6c..000000000 --- a/tianhe_approvals/views/tianhe_exercitation_tryout_approval.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - approvals.category.type.code.exercitation.tryout.approval - approval.request - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tianhe_approvals/views/tianhe_general_party_branch_post.xml b/tianhe_approvals/views/tianhe_general_party_branch_post.xml index 6d834ad3b..440888995 100644 --- a/tianhe_approvals/views/tianhe_general_party_branch_post.xml +++ b/tianhe_approvals/views/tianhe_general_party_branch_post.xml @@ -1,7 +1,7 @@ - - approvals.category.type.code.general.party.branch.post.approval + + approvals.category.type.code.purchase.work.approval approval.request diff --git a/tianhe_approvals/views/tianhe_tryout_official_approval.xml b/tianhe_approvals/views/tianhe_tryout_official_approval.xml deleted file mode 100644 index 146a1f80e..000000000 --- a/tianhe_approvals/views/tianhe_tryout_official_approval.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - approvals.category.type.code.tryout.official.approval - approval.request - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/yuthon_hr_employee/models/yuthon_user_role.py b/yuthon_hr_employee/models/yuthon_user_role.py index 4df6d5ce4..87dcf3822 100644 --- a/yuthon_hr_employee/models/yuthon_user_role.py +++ b/yuthon_hr_employee/models/yuthon_user_role.py @@ -22,4 +22,3 @@ class YuthonUserRole(models.Model): ("expatriate", "外派")], string="所属机构部门") create_time = fields.Datetime(string="创建时间", default=fields.Datetime.now) end_time = fields.Datetime(string="结束时间") -