From 4b073c2fca5ab3732920a70ba9d82530b0c64fa2 Mon Sep 17 00:00:00 2001
From: ONION <2275333053@qq.com>
Date: Tue, 4 Jun 2024 15:06:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E7=AB=8B=E9=A1=B9,?=
=?UTF-8?q?=E7=AD=89=E4=B8=89=E4=B8=AA=E8=A1=A8=EF=BC=8C=E4=B8=80=E4=B8=AA?=
=?UTF-8?q?py=E6=B2=A1=E6=96=B0=E5=AD=97=E6=AE=B5=E6=B2=A1=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
tianhe_approvals/__manifest__.py | 4 +++
.../data/approval_category_type_data.xml | 36 +++++++++++++++++++
tianhe_approvals/models/__init__.py | 7 ++++
.../models/inherit_approval_category.py | 4 +++
.../models/inherit_approval_request.py | 9 +++++
.../models/tianhe_engineering_approval.py | 11 ++++++
.../models/tianhe_meeting_minutes_approval.py | 15 ++++++++
.../models/tianhe_shift_registration_form.py | 12 +++++++
.../views/tianhe_engineering_approval.xml | 29 +++++++++++++++
.../views/tianhe_meeting_minutes_approval.xml | 21 +++++++++++
.../tianhe_party_branch_committee_post.xml | 23 ++++++++++++
.../views/tianhe_shift_registration_form.xml | 20 +++++++++++
12 files changed, 191 insertions(+)
create mode 100644 tianhe_approvals/models/tianhe_engineering_approval.py
create mode 100644 tianhe_approvals/models/tianhe_meeting_minutes_approval.py
create mode 100644 tianhe_approvals/models/tianhe_shift_registration_form.py
create mode 100644 tianhe_approvals/views/tianhe_engineering_approval.xml
create mode 100644 tianhe_approvals/views/tianhe_meeting_minutes_approval.xml
create mode 100644 tianhe_approvals/views/tianhe_party_branch_committee_post.xml
create mode 100644 tianhe_approvals/views/tianhe_shift_registration_form.xml
diff --git a/tianhe_approvals/__manifest__.py b/tianhe_approvals/__manifest__.py
index 44c256984..22b124efe 100644
--- a/tianhe_approvals/__manifest__.py
+++ b/tianhe_approvals/__manifest__.py
@@ -37,6 +37,10 @@
'views/tianhe_tryout_official_approval.xml',
'views/tianhe_exercitation_tryout_approval.xml',
'views/generic_forms_reassignment.xml',
+ 'views/tianhe_meeting_minutes_approval.xml',
+ 'views/tianhe_party_branch_committee_post.xml',
+ 'views/tianhe_shift_registration_form.xml',
+ 'views/tianhe_engineering_approval.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..f19deb13b 100644
--- a/tianhe_approvals/data/approval_category_type_data.xml
+++ b/tianhe_approvals/data/approval_category_type_data.xml
@@ -132,5 +132,41 @@
调岗
generic_forms_reassignment
+
+
+
+ 离职表
+ dimission
+
+
+
+ 试用期转正式员工
+ tryout_official
+
+
+
+ 实习期转试用期
+ exercitation_tryout
+
+
+
+ 党支委发文
+ party_branch_committee_post
+
+
+
+ 调班登记表
+ shift_registration_form
+
+
+
+ 会议纪要
+ meeting_minutes
+
+
+
+ 工程立项
+ engineering
+
diff --git a/tianhe_approvals/models/__init__.py b/tianhe_approvals/models/__init__.py
index d467dc1ba..2fdf10336 100644
--- a/tianhe_approvals/models/__init__.py
+++ b/tianhe_approvals/models/__init__.py
@@ -10,6 +10,12 @@ 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 tianhe_dimission_approval
+from . import tianhe_tryout_official_approval
+from . import tianhe_exercitation_tryout_approval
+from . import tianhe_shift_registration_form
+from . import tianhe_meeting_minutes_approval
+from . import generic_forms_replacement_card
from . import generic_forms_overtime
from . import generic_forms_outing
from . import generic_forms_remove_holiday
@@ -17,3 +23,4 @@ from . import tianhe_dimission_approval
from . import tianhe_tryout_official_approval
from . import tianhe_exercitation_tryout_approval
from . import generic_forms_reassignment
+from . import tianhe_engineering_approval
diff --git a/tianhe_approvals/models/inherit_approval_category.py b/tianhe_approvals/models/inherit_approval_category.py
index 7afd27e7a..67a21bc84 100644
--- a/tianhe_approvals/models/inherit_approval_category.py
+++ b/tianhe_approvals/models/inherit_approval_category.py
@@ -33,4 +33,8 @@ class ApprovalCategory(models.Model):
('tryout_official', '试用期转正式员工'),
('exercitation_tryout', '实习期转试用期'),
('generic_forms_reassignment', '公司通用表单——调岗'),
+ ('party_branch_committee_post', '党支委发文'),
+ ('shift_registration_form', '调班登记表'),
+ ('meeting_minutes', '会议纪要'),
+ ('engineering', '工程立项'),
])
diff --git a/tianhe_approvals/models/inherit_approval_request.py b/tianhe_approvals/models/inherit_approval_request.py
index a5bb5c948..f6fa58929 100644
--- a/tianhe_approvals/models/inherit_approval_request.py
+++ b/tianhe_approvals/models/inherit_approval_request.py
@@ -52,5 +52,14 @@ class ApprovalRequestLine(models.Model):
_description = '明细行'
approval_request_id = fields.Many2one('approval.request')
+
+ # 董事会议题申报表
topic = fields.Char(string='议题')
+ # 工程立项
+ property_name = fields.Char(string='物业名称')
+ area = fields.Char(string='面积')
+ property_id = fields.Char(string='物业ID')
+ project_flow = fields.Char(string='项目流水号')
+
+
diff --git a/tianhe_approvals/models/tianhe_engineering_approval.py b/tianhe_approvals/models/tianhe_engineering_approval.py
new file mode 100644
index 000000000..283a9a5ad
--- /dev/null
+++ b/tianhe_approvals/models/tianhe_engineering_approval.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, tools, _
+from odoo.exceptions import ValidationError
+
+
+class TianHeEngineeringApproval(models.Model):
+ _inherit = "approval.request"
+ _description = '工程立项'
+
+ engineering_type = fields.Char(string="工程类型")
+ engineering_place = fields.Char(string="项目地址")
diff --git a/tianhe_approvals/models/tianhe_meeting_minutes_approval.py b/tianhe_approvals/models/tianhe_meeting_minutes_approval.py
new file mode 100644
index 000000000..a1407ea66
--- /dev/null
+++ b/tianhe_approvals/models/tianhe_meeting_minutes_approval.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, tools, _
+from odoo.exceptions import ValidationError
+
+
+class TianHeMeetingMinutesApproval(models.Model):
+ _inherit = "approval.request"
+ _description = '会议纪要'
+
+ # 不会写
+ attend_users = fields.Char(string="出席人员")
+ attend_persons = fields.Char(string="列席人员")
+ compere = fields.Char(string="主持人")
+ meeting_place = fields.Char(string="会议地点")
+ meeting_subject = fields.Char(string="会议主题")
diff --git a/tianhe_approvals/models/tianhe_shift_registration_form.py b/tianhe_approvals/models/tianhe_shift_registration_form.py
new file mode 100644
index 000000000..f4ef43beb
--- /dev/null
+++ b/tianhe_approvals/models/tianhe_shift_registration_form.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, tools, _
+from odoo.exceptions import ValidationError
+
+
+class TianHeShiftRegistrationFormApproval(models.Model):
+ _inherit = "approval.request"
+ _description = '调班登记表'
+
+ transferees = fields.Many2one('res.users', string="调班人")
+ accept_transferred = fields.Many2one('res.users', string="被调班人")
+ time_transferred = fields.Datetime(string="调班时间")
diff --git a/tianhe_approvals/views/tianhe_engineering_approval.xml b/tianhe_approvals/views/tianhe_engineering_approval.xml
new file mode 100644
index 000000000..dece53701
--- /dev/null
+++ b/tianhe_approvals/views/tianhe_engineering_approval.xml
@@ -0,0 +1,29 @@
+
+
+
+ approvals.category.type.code.engineering.approval
+ approval.request
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tianhe_approvals/views/tianhe_meeting_minutes_approval.xml b/tianhe_approvals/views/tianhe_meeting_minutes_approval.xml
new file mode 100644
index 000000000..853e199f9
--- /dev/null
+++ b/tianhe_approvals/views/tianhe_meeting_minutes_approval.xml
@@ -0,0 +1,21 @@
+
+
+
+ approvals.category.type.code.meeting.minutes.approval
+ approval.request
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tianhe_approvals/views/tianhe_party_branch_committee_post.xml b/tianhe_approvals/views/tianhe_party_branch_committee_post.xml
new file mode 100644
index 000000000..11ad516e0
--- /dev/null
+++ b/tianhe_approvals/views/tianhe_party_branch_committee_post.xml
@@ -0,0 +1,23 @@
+
+
+
+ approvals.category.type.code.party.branch.committee.post.approval
+ approval.request
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tianhe_approvals/views/tianhe_shift_registration_form.xml b/tianhe_approvals/views/tianhe_shift_registration_form.xml
new file mode 100644
index 000000000..46294594f
--- /dev/null
+++ b/tianhe_approvals/views/tianhe_shift_registration_form.xml
@@ -0,0 +1,20 @@
+
+
+
+ approvals.category.type.code.shift.registration.form.approval
+ approval.request
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From ace2abda565c6fff3fc0cd0a63fd407cdd089f74 Mon Sep 17 00:00:00 2001
From: pengyuthon
Date: Tue, 4 Jun 2024 16:47:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
tianhe_approvals/data/approval_category_type_data.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/tianhe_approvals/data/approval_category_type_data.xml b/tianhe_approvals/data/approval_category_type_data.xml
index 1f052e032..568388c85 100644
--- a/tianhe_approvals/data/approval_category_type_data.xml
+++ b/tianhe_approvals/data/approval_category_type_data.xml
@@ -167,6 +167,7 @@
工程立项
engineering
+
物业经营报表管理
From a9a970436e4044f13e27d4c97bcda279f8fa08b2 Mon Sep 17 00:00:00 2001
From: ONION <2275333053@qq.com>
Date: Wed, 5 Jun 2024 16:19:34 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E5=8F=98=E6=9B=B4?=
=?UTF-8?q?=E8=A1=A8=E7=94=B3=E8=AF=B7=E8=A1=A8=20=E8=AF=B7=E5=81=87?=
=?UTF-8?q?=E7=99=BB=E8=AE=B0=E5=8D=95=20=E7=89=A9=E4=B8=9A=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E5=8F=98=E6=9B=B4=E7=94=B3=E8=AF=B7=E8=A1=A8=E5=B7=AE?=
=?UTF-8?q?=E4=BA=94=E5=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
tianhe_approvals/__manifest__.py | 3 ++
.../data/approval_category_type_data.xml | 16 +++++++++
tianhe_approvals/models/__init__.py | 3 ++
.../models/inherit_approval_category.py | 5 ++-
.../models/inherit_approval_request.py | 7 ++--
.../wuguan_leave_registration_approval.py | 24 ++++++++++++++
.../wuguan_property_management_application.py | 13 ++++++++
.../wuguan_property_right_alter_approval.py | 17 ++++++++++
.../views/tianhe_engineering_approval.xml | 2 +-
.../tianhe_lease_contract_approval_form.xml | 2 +-
.../wuguan_leave_registration_approval.xml | 19 +++++++++++
...wuguan_property_management_application.xml | 33 +++++++++++++++++++
.../wuguan_property_right_alter_approval.xml | 22 +++++++++++++
13 files changed, 161 insertions(+), 5 deletions(-)
create mode 100644 tianhe_approvals/models/wuguan_leave_registration_approval.py
create mode 100644 tianhe_approvals/models/wuguan_property_management_application.py
create mode 100644 tianhe_approvals/models/wuguan_property_right_alter_approval.py
create mode 100644 tianhe_approvals/views/wuguan_leave_registration_approval.xml
create mode 100644 tianhe_approvals/views/wuguan_property_management_application.xml
create mode 100644 tianhe_approvals/views/wuguan_property_right_alter_approval.xml
diff --git a/tianhe_approvals/__manifest__.py b/tianhe_approvals/__manifest__.py
index ddd677956..45b6cad6d 100644
--- a/tianhe_approvals/__manifest__.py
+++ b/tianhe_approvals/__manifest__.py
@@ -41,6 +41,9 @@
'views/tianhe_party_branch_committee_post.xml',
'views/tianhe_shift_registration_form.xml',
'views/tianhe_engineering_approval.xml',
+ 'views/wuguan_property_right_alter_approval.xml',
+ 'views/wuguan_leave_registration_approval.xml',
+ 'views/wuguan_property_management_application.xml',
'views/tianhe_property_management_reporting.xml',
'views/tianhe_fire_safety_management.xml',
'views/tianhe_information_ublish_approval_form.xml',
diff --git a/tianhe_approvals/data/approval_category_type_data.xml b/tianhe_approvals/data/approval_category_type_data.xml
index 1f052e032..40776ce88 100644
--- a/tianhe_approvals/data/approval_category_type_data.xml
+++ b/tianhe_approvals/data/approval_category_type_data.xml
@@ -167,6 +167,7 @@
工程立项
engineering
+
物业经营报表管理
@@ -187,5 +188,20 @@
租赁合同呈批表
tianhe_lease_contract_approval_form
+
+
+ 产权变更表申请表
+ property_right_alter
+
+
+
+ 请假登记单
+ leave_registration
+
+
+
+ 物业管理变更申请表
+ property_management_application
+
diff --git a/tianhe_approvals/models/__init__.py b/tianhe_approvals/models/__init__.py
index 6fcf3d5c4..93fc9a437 100644
--- a/tianhe_approvals/models/__init__.py
+++ b/tianhe_approvals/models/__init__.py
@@ -24,6 +24,9 @@ from . import tianhe_tryout_official_approval
from . import tianhe_exercitation_tryout_approval
from . import generic_forms_reassignment
from . import tianhe_engineering_approval
+from . import wuguan_property_right_alter_approval
+from . import wuguan_leave_registration_approval
+from . import wuguan_property_management_application
from . import tianhe_fire_safety_management
from . import tianhe_information_ublish_approval_form
from . import tianhe_lease_contract_approval_form
diff --git a/tianhe_approvals/models/inherit_approval_category.py b/tianhe_approvals/models/inherit_approval_category.py
index 38b25d118..37aa63495 100644
--- a/tianhe_approvals/models/inherit_approval_category.py
+++ b/tianhe_approvals/models/inherit_approval_category.py
@@ -37,8 +37,11 @@ class ApprovalCategory(models.Model):
('shift_registration_form', '调班登记表'),
('meeting_minutes', '会议纪要'),
('engineering', '工程立项'),
+ ('property_right_alter', '产权变更表申请表'),
+ ('leave_registration', '请假登记单'),
+ ('property_management_application', ' '),
('tianhe_property_management_reporting', '物业经营报表管理'),
('tianhe_fire_safety_management', '消防安全管理'),
('tianhe_information_ublish_approval_form', '信息发布呈批表'),
- ('tianhe_lease_contract_approval_form', '信息发布呈批表'),
+ ('tianhe_lease_contract_approval_form', '租赁合同呈批表'),
])
diff --git a/tianhe_approvals/models/inherit_approval_request.py b/tianhe_approvals/models/inherit_approval_request.py
index 74b8203c4..a3e2387a2 100644
--- a/tianhe_approvals/models/inherit_approval_request.py
+++ b/tianhe_approvals/models/inherit_approval_request.py
@@ -60,11 +60,14 @@ class ApprovalRequestLine(models.Model):
date_start = fields.Datetime(string="开始时间")
date_end = fields.Datetime(string="结束时间")
-
# 工程立项
property_name = fields.Char(string='物业名称')
area = fields.Char(string='面积')
property_id = fields.Char(string='物业ID')
project_flow = fields.Char(string='项目流水号')
-
+ # 物业管理变更申请表
+ subordinate_companies = fields.Char(string="所属公司")
+ administrator = fields.Char(string="管理员")
+ district = fields.Char(string="片区")
+ manage_type = fields.Char(string="管理类型")
diff --git a/tianhe_approvals/models/wuguan_leave_registration_approval.py b/tianhe_approvals/models/wuguan_leave_registration_approval.py
new file mode 100644
index 000000000..01bb68a6b
--- /dev/null
+++ b/tianhe_approvals/models/wuguan_leave_registration_approval.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, tools, _
+from odoo.exceptions import ValidationError
+
+
+class WuguanLeaveRegistrationApproval(models.Model):
+ _inherit = "approval.request"
+ _description = '请假登记单'
+
+ leave_category = fields.Selection([('annual leave', '年假'),
+ ('leave in lieu', '调休假'),
+ ('leave', '事假'),
+ ('sick leave', '病假'),
+ ('funeral leave', '丧假'),
+ ('marital leave', '婚假'),
+ ('maternity leave', '产假'),
+ ('paternity leave', '陪产假'),
+ ('nursing leave', '看护假'),
+ ('parental leave', '育儿假'),
+ ('nursing leave', '护理假'),
+ ('family planning leave', '计生假'),
+ ], string="请假类别")
+ flow_mark = fields.Char(string="流程号")
+ leave_time = fields.Char(string="请假时间")
diff --git a/tianhe_approvals/models/wuguan_property_management_application.py b/tianhe_approvals/models/wuguan_property_management_application.py
new file mode 100644
index 000000000..bc9f47ddf
--- /dev/null
+++ b/tianhe_approvals/models/wuguan_property_management_application.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, tools, _
+from odoo.exceptions import ValidationError
+
+
+class WuguanPropertyRightApproval(models.Model):
+ _inherit = "approval.request"
+ _description = '物业管理变更申请表'
+
+ new_subordinate_companies = fields.Char(string="新所属公司")
+ new_administrator = fields.Char(string="新管理员")
+ new_district = fields.Char(string="新片区")
+ new_manage_type = fields.Char(string="新管理类型")
\ No newline at end of file
diff --git a/tianhe_approvals/models/wuguan_property_right_alter_approval.py b/tianhe_approvals/models/wuguan_property_right_alter_approval.py
new file mode 100644
index 000000000..4a66550e7
--- /dev/null
+++ b/tianhe_approvals/models/wuguan_property_right_alter_approval.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, tools, _
+from odoo.exceptions import ValidationError
+
+
+class WuguanPropertyRightApproval(models.Model):
+ _inherit = "approval.request"
+ _description = '产权变更表申请表'
+
+ original_tenement = fields.Char(string="原物业名称")
+ original_property_rights = fields.Char(string="原产权证号")
+ original_area = fields.Char(string="原面积")
+ original_person = fields.Char(string="原权属人")
+ new_tenement = fields.Char(string="新物业信息")
+ new_property_rights = fields.Char(string="新产权证号")
+ new_area = fields.Char(string="新面积")
+ new_person = fields.Char(string="新权属人")
diff --git a/tianhe_approvals/views/tianhe_engineering_approval.xml b/tianhe_approvals/views/tianhe_engineering_approval.xml
index dece53701..ce71b6fc8 100644
--- a/tianhe_approvals/views/tianhe_engineering_approval.xml
+++ b/tianhe_approvals/views/tianhe_engineering_approval.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/tianhe_approvals/views/tianhe_lease_contract_approval_form.xml b/tianhe_approvals/views/tianhe_lease_contract_approval_form.xml
index 35123fa9a..621a86a28 100644
--- a/tianhe_approvals/views/tianhe_lease_contract_approval_form.xml
+++ b/tianhe_approvals/views/tianhe_lease_contract_approval_form.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/tianhe_approvals/views/wuguan_leave_registration_approval.xml b/tianhe_approvals/views/wuguan_leave_registration_approval.xml
new file mode 100644
index 000000000..bd108ac99
--- /dev/null
+++ b/tianhe_approvals/views/wuguan_leave_registration_approval.xml
@@ -0,0 +1,19 @@
+
+
+
+ approvals.category.type.code.leave.registration
+ approval.request
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tianhe_approvals/views/wuguan_property_management_application.xml b/tianhe_approvals/views/wuguan_property_management_application.xml
new file mode 100644
index 000000000..50c3202d8
--- /dev/null
+++ b/tianhe_approvals/views/wuguan_property_management_application.xml
@@ -0,0 +1,33 @@
+
+
+
+ approvals.category.type.code.property.management.application
+ approval.request
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tianhe_approvals/views/wuguan_property_right_alter_approval.xml b/tianhe_approvals/views/wuguan_property_right_alter_approval.xml
new file mode 100644
index 000000000..0b873df14
--- /dev/null
+++ b/tianhe_approvals/views/wuguan_property_right_alter_approval.xml
@@ -0,0 +1,22 @@
+
+
+
+ approvals.category.type.code.property.right.alter
+ approval.request
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file