pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "2024-6-3制作补卡、加班、外出、销假、员工调岗、员工离职、员工转正pc和员工转正式流程审批表单，一共八个表单"

Browse Source 
This reverts commit 653b8ed40b.
This commit is contained in:
李鹏宇
2024-06-03 09:56:55 +00:00
committed by Gitee
parent 653b8ed40b
commit efbb92b91d
24 changed files with 3 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tianhe_approvals/__manifest__.py
-8
View File
@@ -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,
tianhe_approvals/data/approval_category_type_data.xml
-40
View File
@@ -92,45 +92,5 @@
<field name="name">天河投资租赁合同收款单</field>
<field name="approval_type">rental_receipt</field>
</record>
<!-- 公司通用表单- 补卡 -->
<record id="approval_category_data_generic_forms_replacement_card" model="approval.category">
<field name="name">补卡</field>
<field name="approval_type">generic_forms_replacement_card</field>
</record>
<!-- 公司通用表单- 加班 -->
<record id="approval_category_data_generic_forms_overtime" model="approval.category">
<field name="name">加班</field>
<field name="approval_type">generic_forms_overtime</field>
</record>
<!-- 公司通用表单- 外出 -->
<record id="approval_category_data_generic_forms_outing" model="approval.category">
<field name="name">外出</field>
<field name="approval_type">generic_forms_outing</field>
</record>
<!-- 公司通用表单- 销假 -->
<record id="approval_category_data_generic_forms_remove_holiday" model="approval.category">
<field name="name">销假</field>
<field name="approval_type">generic_forms_remove_holiday</field>
</record>
<!-- 公司通用表单 - 通用离职表 -->
<record id="approval_category_data_tianhe_dimission_approval" model="approval.category">
<field name="name">离职表</field>
<field name="approval_type">dimission</field>
</record>
<!-- 公司通用表单 - 试用期转正式员工 -->
<record id="approval_category_data_tianhe_tryout_official_approval" model="approval.category">
<field name="name">试用期转正式员工</field>
<field name="approval_type">tryout_official</field>
</record>
<!-- 公司通用表单 - 实习期转试用期 -->
<record id="approval_category_data_tianhe_exercitation_tryout_approval" model="approval.category">
<field name="name">实习期转试用期</field>
<field name="approval_type">exercitation_tryout</field>
</record>
<!-- 公司通用表单 - 调岗 -->
<record id="approval_category_data_generic_forms_reassignment" model="approval.category">
<field name="name">调岗</field>
<field name="approval_type">generic_forms_reassignment</field>
</record>
</data>
</odoo>
tianhe_approvals/models/__init__.py
-8
View File
@@ -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
tianhe_approvals/models/generic_forms_outing.py
-13
View File
@@ -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="申请单位")
tianhe_approvals/models/generic_forms_overtime.py
-13
View File
@@ -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="加班餐费")
tianhe_approvals/models/generic_forms_reassignment.py
-14
View File
@@ -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="调岗时间")
tianhe_approvals/models/generic_forms_remove_holiday.py
-13
View File
@@ -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="销假类型")
tianhe_approvals/models/generic_forms_replacement_card.py
-23
View File
@@ -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="异常类型")
tianhe_approvals/models/inherit_approval_category.py
-8
View File
@@ -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', '公司通用表单——调岗'),
])
tianhe_approvals/models/inherit_approval_request.py
-14
View File
@@ -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='议题')
tianhe_approvals/models/tianhe_dimission_approval.py
-11
View File
@@ -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="转正状态")
tianhe_approvals/models/tianhe_exercitation_tryout_approval.py
-14
View File
@@ -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="转正式日期")
tianhe_approvals/models/tianhe_tryout_official_approval.py
-12
View File
@@ -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="转正日期")
tianhe_approvals/views/generic_forms_outing.xml
-24
View File
@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="approvals_category_type_code_generic_forms_outing" model="ir.ui.view">
<field name="name">approvals.category.type.code.generic.forms.outing</field>
<field name="model">approval.request</field>
<field name="inherit_id" ref="approvals.approval_request_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='date_confirmed']" position="after">
<field name="type_application" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'generic_forms_outing'"/>
<field name="date_start" invisible="approval_category_name != 'generic_forms_outing'"/>
<field name="date_end" invisible="approval_category_name != 'generic_forms_outing'"/>
<field name="approval_sex" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'generic_forms_outing'"/>
</xpath>
<xpath expr="//field[@name='company_id']" position="after">
<field name="post" invisible="approval_category_name != 'generic_forms_outing'"/>
<field name="apply_unit" invisible="approval_category_name != 'generic_forms_outing'"/>
<field name="missed_meal_charges" invisible="approval_category_name != 'generic_forms_outing'"/>
<field name="reason_application" string="申请事由" invisible="approval_category_name != 'generic_forms_outing'"/>
<field name="duration" string="外出申请时长" invisible="approval_category_name != 'generic_forms_outing'"/>
</xpath>
</field>
</record>
</odoo>
tianhe_approvals/views/generic_forms_overtime.xml
-23
View File
@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="approvals_category_type_code_generic_forms_overtime" model="ir.ui.view">
<field name="name">approvals.category.type.code.generic.forms.overtime</field>
<field name="model">approval.request</field>
<field name="inherit_id" ref="approvals.approval_request_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='date_confirmed']" position="after">
<field name="type_application" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'generic_forms_overtime'"/>
<field name="date_start" invisible="approval_category_name != 'generic_forms_overtime'"/>
<field name="date_end" invisible="approval_category_name != 'generic_forms_overtime'"/>
</xpath>
<xpath expr="//field[@name='company_id']" position="after">
<field name="type_overtime" invisible="approval_category_name != 'generic_forms_overtime'"/>
<field name="compensation_mode" invisible="approval_category_name != 'generic_forms_overtime'"/>
<field name="duration" string="月累计加班时长" invisible="approval_category_name != 'generic_forms_overtime'"/>
<field name="overtime_meal_pay" invisible="approval_category_name != 'generic_forms_overtime'"/>
<field name="reason_application" string="申请事由" invisible="approval_category_name != 'generic_forms_overtime'"/>
</xpath>
</field>
</record>
</odoo>
tianhe_approvals/views/generic_forms_reassignment.xml
-24
View File
@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="approvals_category_type_code_generic_forms_reassignment" model="ir.ui.view">
<field name="name">approvals.category.type.code.generic.forms.reassignment</field>
<field name="model">approval.request</field>
<field name="inherit_id" ref="approvals.approval_request_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='date_confirmed']" position="after">
<field name="type_application" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'generic_forms_reassignment'"/>
<field name="approval_sex" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'generic_forms_reassignment'"/>
<field name="entry_time" invisible="approval_category_name != 'generic_forms_reassignment'"/>
</xpath>
<xpath expr="//field[@name='company_id']" position="after">
<field name="post" invisible="approval_category_name != 'generic_forms_reassignment'"/>
<field name="change_post" invisible="approval_category_name != 'generic_forms_reassignment'"/>
<field name="change_department" invisible="approval_category_name != 'generic_forms_reassignment'"/>
<field name="timing_reassignments" invisible="approval_category_name != 'generic_forms_reassignment'"/>
<field name="reason_application" string="申请事由" invisible="approval_category_name != 'generic_forms_reassignment'"/>
</xpath>
</field>
</record>
</odoo>
tianhe_approvals/views/generic_forms_remove_holiday.xml
-24
View File
@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="approvals_category_type_code_generic_forms_remove_holiday" model="ir.ui.view">
<field name="name">approvals.category.type.code.generic_forms_remove_holiday</field>
<field name="model">approval.request</field>
<field name="inherit_id" ref="approvals.approval_request_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='date_confirmed']" position="after">
<field name="type_application" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'generic_forms_remove_holiday'"/>
<field name="date_start" invisible="approval_category_name != 'generic_forms_remove_holiday'"/>
<field name="date_end" invisible="approval_category_name != 'generic_forms_remove_holiday'"/>
<field name="approval_sex" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'generic_forms_remove_holiday'"/>
</xpath>
<xpath expr="//field[@name='company_id']" position="after">
<field name="post" invisible="approval_category_name != 'generic_forms_remove_holiday'"/>
<field name="entry_time" invisible="approval_category_name != 'generic_forms_remove_holiday'"/>
<field name="type_remove_holiday" invisible="approval_category_name != 'generic_forms_remove_holiday'"/>
<field name="reason_application" string="销假原因" invisible="approval_category_name != 'generic_forms_remove_holiday'"/>
<field name="duration" string="销假时长" invisible="approval_category_name != 'generic_forms_remove_holiday'"/>
</xpath>
</field>
</record>
</odoo>
tianhe_approvals/views/generic_forms_replacement_card.xml
-20
View File
@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="approvals_category_type_code_generic_forms_replacement_card" model="ir.ui.view">
<field name="name">approvals.category.type.code.generic.forms.replacement.card</field>
<field name="model">approval.request</field>
<field name="inherit_id" ref="approvals.approval_request_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='date_confirmed']" position="after">
<field name="type_application" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'generic_forms_replacement_card'"/>
<field name="replacement_time" invisible="approval_category_name != 'generic_forms_replacement_card'"/>
</xpath>
<xpath expr="//field[@name='company_id']" position="after">
<field name="reason_application" invisible="approval_category_name != 'generic_forms_replacement_card'"/>
<field name="type_of_exception" invisible="approval_category_name != 'generic_forms_replacement_card'"/>
<field name="real_go_work_time" invisible="approval_category_name != 'generic_forms_replacement_card'"/>
<field name="real_get_off_work_time" invisible="approval_category_name != 'generic_forms_replacement_card'"/>
</xpath>
</field>
</record>
</odoo>
tianhe_approvals/views/tianhe_contentious_matter_approval.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="approvals_category_type_code_contentious_matter_approval" model="ir.ui.view">
<field name="name">approvals.category.type.code.contentious.matter.approval</field>
<field name="name">approvals.category.type.code.construction.business.approval</field>
<field name="model">approval.request</field>
<field name="inherit_id" ref="approvals.approval_request_view_form"/>
<field name="arch" type="xml">
tianhe_approvals/views/tianhe_dimission_approval.xml
-21
View File
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="approvals_category_type_code_dimission_approval" model="ir.ui.view">
<field name="name">approvals.category.type.code.dimission.approval</field>
<field name="model">approval.request</field>
<field name="inherit_id" ref="approvals.approval_request_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='company_id']" position="after">
<field name="approvals_department_id" invisible="approval_category_name != 'dimission'"/>
<field name="post" invisible="approval_category_name != 'dimission'"/>
<field name="entry_time" invisible="approval_category_name != 'dimission'"/>
<field name="form_employment" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'dimission'"/>
<field name="expected_time" invisible="approval_category_name != 'dimission'"/>
</xpath>
<xpath expr="//field[@name='date_confirmed']" position="after">
<field name="reason_application" string="申请原因" invisible="approval_category_name != 'dimission'"/>
<field name="regularization_state" invisible="approval_category_name != 'dimission'"/>
</xpath>
</field>
</record>
</odoo>
tianhe_approvals/views/tianhe_exercitation_tryout_approval.xml
-27
View File
@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="approvals_category_type_code_exercitation_tryout_approval" model="ir.ui.view">
<field name="name">approvals.category.type.code.exercitation.tryout.approval</field>
<field name="model">approval.request</field>
<field name="inherit_id" ref="approvals.approval_request_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='company_id']" position="after">
<field name="approvals_department_id" invisible="approval_category_name != 'exercitation_tryout'"/>
<field name="employment_contracts_time" invisible="approval_category_name != 'exercitation_tryout'"/>
<field name="post" invisible="approval_category_name != 'exercitation_tryout'"/>
<field name="construction_no" invisible="approval_category_name != 'exercitation_tryout'"/>
<field name="type_application" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'exercitation_tryout'"/>
<field name="Position_level" invisible="approval_category_name != 'exercitation_tryout'"/>
<field name="entry_time" invisible="approval_category_name != 'exercitation_tryout'"/>
</xpath>
<xpath expr="//field[@name='date_confirmed']" position="after">
<field name="employment_contracts_main" invisible="approval_category_name != 'exercitation_tryout'"/>
<field name="reason_application" string="转正式原因" invisible="approval_category_name != 'exercitation_tryout'"/>
<field name="approval_sex" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'exercitation_tryout'"/>
<field name="regularization_date" invisible="approval_category_name != 'exercitation_tryout'"/>
<field name="turn_official_date" invisible="approval_category_name != 'exercitation_tryout'"/>
<field name="main_text" string="补充说明" invisible="approval_category_name != 'exercitation_tryout'" colspan="3"/>
</xpath>
</field>
</record>
</odoo>
tianhe_approvals/views/tianhe_general_party_branch_post.xml
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="approvals_category_type_code_general_party_branch_post_approval" model="ir.ui.view">
<field name="name">approvals.category.type.code.general.party.branch.post.approval</field>
<record id="approvals_category_type_code_purchase_work_approval" model="ir.ui.view">
<field name="name">approvals.category.type.code.purchase.work.approval</field>
<field name="model">approval.request</field>
<field name="inherit_id" ref="approvals.approval_request_view_form"/>
<field name="arch" type="xml">
tianhe_approvals/views/tianhe_tryout_official_approval.xml
-26
View File
@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="approvals_category_type_code_tryout_official_approval" model="ir.ui.view">
<field name="name">approvals.category.type.code.tryout.official.approval</field>
<field name="model">approval.request</field>
<field name="inherit_id" ref="approvals.approval_request_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='company_id']" position="after">
<field name="approvals_department_id" invisible="approval_category_name != 'tryout_official'"/>
<field name="post" invisible="approval_category_name != 'tryout_official'"/>
<field name="Position_level" string="转正前职级" invisible="approval_category_name != 'tryout_official'"/>
<field name="Position_level" string="转正后职级" invisible="approval_category_name != 'tryout_official'"/>
<field name="type_application" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'tryout_official'"/>
<field name="entry_time" invisible="approval_category_name != 'tryout_official'"/>
</xpath>
<xpath expr="//field[@name='date_confirmed']" position="after">
<field name="regular_assessment" invisible="approval_category_name != 'tryout_official'"/>
<field name="assessment_ratings" invisible="approval_category_name != 'tryout_official'"/>
<field name="construction_no" invisible="approval_category_name != 'tryout_official'"/>
<field name="approval_sex" widget="radio" options="{'horizontal': true}" invisible="approval_category_name != 'tryout_official'"/>
<field name="regularization_date" invisible="approval_category_name != 'tryout_official'"/>
<field name="main_text" string="附件上传提示" invisible="approval_category_name != 'tryout_official'" colspan="3"/>
</xpath>
</field>
</record>
</odoo>
yuthon_hr_employee/models/yuthon_user_role.py
-1
View File
@@ -22,4 +22,3 @@ class YuthonUserRole(models.Model):
("expatriate", "外派")], string="所属机构部门")
create_time = fields.Datetime(string="创建时间", default=fields.Datetime.now)
end_time = fields.Datetime(string="结束时间")