From 0c13cb0d53d115cab2bcba80173d03278b42925b Mon Sep 17 00:00:00 2001
From: ONION <2275333053@qq.com>
Date: Thu, 6 Jun 2024 13:51:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=A1=A8=20=E5=8F=91=E6=96=87=E5=91=88?=
 =?UTF-8?q?=E6=89=B9=20=E8=B4=B9=E7=94=A8=E6=94=AF=E5=87=BA=20=E7=9D=A3?=
 =?UTF-8?q?=E5=8A=9E=E5=B7=A5=E4=BD=9C=E8=A1=A8?=
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      | 20 ++++++++++++++++
 tianhe_approvals/models/__init__.py           |  4 ++++
 .../models/inherit_approval_category.py       |  4 ++++
 .../models/tianhe_fee_adjustment_approval.py  | 11 +++++++++
 .../models/tianhe_fee_expend_approval.py      | 17 +++++++++++++
 .../models/tianhe_post_submission_approval.py | 10 ++++++++
 .../tianhe_supervision_worksheets_approval.py | 13 ++++++++++
 .../views/tianhe_fee_adjustment_approval.xml  | 19 +++++++++++++++
 .../views/tianhe_fee_expend_approval.xml      | 24 +++++++++++++++++++
 .../views/tianhe_post_submission_approval.xml | 20 ++++++++++++++++
 ...tianhe_supervision_worksheets_approval.xml | 22 +++++++++++++++++
 12 files changed, 168 insertions(+)
 create mode 100644 tianhe_approvals/models/tianhe_fee_adjustment_approval.py
 create mode 100644 tianhe_approvals/models/tianhe_fee_expend_approval.py
 create mode 100644 tianhe_approvals/models/tianhe_post_submission_approval.py
 create mode 100644 tianhe_approvals/models/tianhe_supervision_worksheets_approval.py
 create mode 100644 tianhe_approvals/views/tianhe_fee_adjustment_approval.xml
 create mode 100644 tianhe_approvals/views/tianhe_fee_expend_approval.xml
 create mode 100644 tianhe_approvals/views/tianhe_post_submission_approval.xml
 create mode 100644 tianhe_approvals/views/tianhe_supervision_worksheets_approval.xml

diff --git a/tianhe_approvals/__manifest__.py b/tianhe_approvals/__manifest__.py
index ad3a5d43d..4f2d4fab4 100644
--- a/tianhe_approvals/__manifest__.py
+++ b/tianhe_approvals/__manifest__.py
@@ -52,6 +52,10 @@
         'views/wuguan_invoicing_information_approval_order.xml',
         'views/liangchu_business_approval_form_grain_depot.xml',
         'views/liangchu_general_manager_office_meeting_topics.xml',
+        'views/tianhe_fee_adjustment_approval.xml',
+        'views/tianhe_fee_expend_approval.xml',
+        'views/tianhe_post_submission_approval.xml',
+        'views/tianhe_supervision_worksheets_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 0442dfd5a..f80bc61c9 100644
--- a/tianhe_approvals/data/approval_category_type_data.xml
+++ b/tianhe_approvals/data/approval_category_type_data.xml
@@ -223,5 +223,25 @@
             <field name="name">物业管理变更申请表</field>
             <field name="approval_type">property_management_application</field>
         </record>
+        <!--    天河物管 - 费用调整申请表    -->
+        <record id="approval_category_data_tianhe_fee_adjustment_approval" model="approval.category">
+            <field name="name">费用调整申请表</field>
+            <field name="approval_type">fee_adjustment</field>
+        </record>
+        <!--    天河物管 - 费用支出    -->
+        <record id="approval_category_data_tianhe_fee_expend_approval" model="approval.category">
+            <field name="name">费用支出</field>
+            <field name="approval_type">fee_expend</field>
+        </record>
+        <!--    天河物管 - 发文呈批    -->
+        <record id="approval_category_data_tianhe_post_submission_approval" model="approval.category">
+            <field name="name">发文呈批</field>
+            <field name="approval_type">post_submission</field>
+        </record>
+        <!--    天河物管 - 督办工作表    -->
+        <record id="approval_category_data_tianhe_supervision_worksheets_approval" model="approval.category">
+            <field name="name">督办工作表</field>
+            <field name="approval_type">supervision_worksheets</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/tianhe_approvals/models/__init__.py b/tianhe_approvals/models/__init__.py
index 6c09e6ca1..18c029bbb 100644
--- a/tianhe_approvals/models/__init__.py
+++ b/tianhe_approvals/models/__init__.py
@@ -32,3 +32,7 @@ from . import tianhe_information_ublish_approval_form
 from . import tianhe_lease_contract_approval_form
 from . import wuguan_intertubular_protocol
 from . import wuguan_invoicing_information_approval_order
+from . import tianhe_fee_adjustment_approval
+from . import tianhe_fee_expend_approval
+from . import tianhe_post_submission_approval
+from . import tianhe_supervision_worksheets_approval
diff --git a/tianhe_approvals/models/inherit_approval_category.py b/tianhe_approvals/models/inherit_approval_category.py
index c2f7ea97e..921d83b42 100644
--- a/tianhe_approvals/models/inherit_approval_category.py
+++ b/tianhe_approvals/models/inherit_approval_category.py
@@ -48,4 +48,8 @@ class ApprovalCategory(models.Model):
         ('wuguan_invoicing_information_approval_order', '开票信息审批单'),
         ('liangchu_business_approval_form_grain_depot', '业务呈批表'),
         ('liangchu_general_manager_office_meeting_topics', '总经理办公会议议题呈批表'),
+        ('fee_adjustment', '费用调整申请表'),
+        ('post_submission', '发文呈批'),
+        ('fee_expend', '费用支出'),
+        ('supervision_worksheets', ' '),
     ])
diff --git a/tianhe_approvals/models/tianhe_fee_adjustment_approval.py b/tianhe_approvals/models/tianhe_fee_adjustment_approval.py
new file mode 100644
index 000000000..a81d309dc
--- /dev/null
+++ b/tianhe_approvals/models/tianhe_fee_adjustment_approval.py
@@ -0,0 +1,11 @@
+from odoo import api, fields, models, tools, _
+from odoo.exceptions import ValidationError
+
+
+class TianHeFeeAdjustment(models.Model):
+    _inherit = "approval.request"
+    _description = '费用调整申请表'
+
+    property_information = fields.Char(string="物业信息")
+    fee_information = fields.Char(string="费用信息")
+    adjustment_reason = fields.Char(string="调整原因")
diff --git a/tianhe_approvals/models/tianhe_fee_expend_approval.py b/tianhe_approvals/models/tianhe_fee_expend_approval.py
new file mode 100644
index 000000000..93169828b
--- /dev/null
+++ b/tianhe_approvals/models/tianhe_fee_expend_approval.py
@@ -0,0 +1,17 @@
+from odoo import api, fields, models, tools, _
+from odoo.exceptions import ValidationError
+
+
+class TianHeFeeExpend(models.Model):
+    _inherit = "approval.request"
+    _description = '费用支出'
+
+    payment_date = fields.Date(string="支付日期")
+    Payer = fields.Char(string="支付人")
+    affiliation = fields.Many2one("res.company", string="所属公司")
+    joint_name = fields.Char(string="合同名称")
+    project_name = fields.Char(string="项目名称")
+    property_listings = fields.Char(string="物业列表")
+    property_address = fields.Char(string="物业地址")
+    payment_type = fields.Char(string="支付类型")
+    expend_fee = fields.Integer(string="支出金额")
diff --git a/tianhe_approvals/models/tianhe_post_submission_approval.py b/tianhe_approvals/models/tianhe_post_submission_approval.py
new file mode 100644
index 000000000..c70ce1520
--- /dev/null
+++ b/tianhe_approvals/models/tianhe_post_submission_approval.py
@@ -0,0 +1,10 @@
+from odoo import api, fields, models, tools, _
+from odoo.exceptions import ValidationError
+
+
+class TianHePostSubmission(models.Model):
+    _inherit = "approval.request"
+    _description = '发文呈批'
+
+    reference_cold = fields.Integer(string="发文字号")
+    major_event_category = fields.Integer(string="重大事项所属类别")
\ No newline at end of file
diff --git a/tianhe_approvals/models/tianhe_supervision_worksheets_approval.py b/tianhe_approvals/models/tianhe_supervision_worksheets_approval.py
new file mode 100644
index 000000000..b12d97c44
--- /dev/null
+++ b/tianhe_approvals/models/tianhe_supervision_worksheets_approval.py
@@ -0,0 +1,13 @@
+from odoo import api, fields, models, tools, _
+from odoo.exceptions import ValidationError
+
+
+class TianHeSupervisionWorksheets(models.Model):
+    _inherit = "approval.request"
+    _description = '督办工作表'
+
+    cold = fields.Integer(string="编号")
+    supervision_basis = fields.Char(string="督办依据")
+    handling_requirements = fields.Char(string="内容摘要及办理要求")
+    supervise_work = fields.Char(string="督办工作")
+    work_undertaking = fields.Char(string="工作承办")
diff --git a/tianhe_approvals/views/tianhe_fee_adjustment_approval.xml b/tianhe_approvals/views/tianhe_fee_adjustment_approval.xml
new file mode 100644
index 000000000..3db0b5b80
--- /dev/null
+++ b/tianhe_approvals/views/tianhe_fee_adjustment_approval.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="approvals_category_type_code_fee_adjustment_approval" model="ir.ui.view">
+        <field name="name">approvals.category.type.code.fee.adjustment.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='date_confirmed']" position="after">
+                <field name="contract_id" invisible="approval_category_name != 'fee_adjustment'"/>
+                <field name="lessee" invisible="approval_category_name != 'fee_adjustment'"/>
+                <field name="adjustment_reason" invisible="approval_category_name != 'fee_adjustment'" colspan="3"/>
+            </xpath>
+            <xpath expr="//field[@name='company_id']" position="after">
+                <field name="fee_information" invisible="approval_category_name != 'fee_adjustment'"/>
+                <field name="property_information" invisible="approval_category_name != 'fee_adjustment'"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/tianhe_approvals/views/tianhe_fee_expend_approval.xml b/tianhe_approvals/views/tianhe_fee_expend_approval.xml
new file mode 100644
index 000000000..2aaa0b126
--- /dev/null
+++ b/tianhe_approvals/views/tianhe_fee_expend_approval.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="approvals_category_type_code_fee_expend_approval" model="ir.ui.view">
+        <field name="name">approvals.category.type.code.fee.expend.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='date_confirmed']" position="after">
+                <field name="payment_date" invisible="approval_category_name != 'fee_expend'"/>
+                <field name="Payer" invisible="approval_category_name != 'fee_expend'"/>
+                <field name="affiliation" invisible="approval_category_name != 'fee_expend'"/>
+                <field name="joint_name" invisible="approval_category_name != 'fee_expend'"/>
+                <field name="project_name" invisible="approval_category_name != 'fee_expend'"/>
+            </xpath>
+            <xpath expr="//field[@name='company_id']" position="after">
+                <field name="property_listings" invisible="approval_category_name != 'fee_expend'"/>
+                <field name="property_address" invisible="approval_category_name != 'fee_expend'"/>
+                <field name="remarks" invisible="approval_category_name != 'fee_expend'"/>
+                <field name="payment_type" invisible="approval_category_name != 'fee_expend'"/>
+                <field name="expend_fee" invisible="approval_category_name != 'fee_expend'"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/tianhe_approvals/views/tianhe_post_submission_approval.xml b/tianhe_approvals/views/tianhe_post_submission_approval.xml
new file mode 100644
index 000000000..4b4884e2d
--- /dev/null
+++ b/tianhe_approvals/views/tianhe_post_submission_approval.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="approvals_category_type_code_post_submission_approval" model="ir.ui.view">
+        <field name="name">approvals.category.type.code.post.submission.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='date_confirmed']" position="after">
+                <field name="reference_cold" invisible="approval_category_name != 'post_submission'"/>
+                <field name="major_event_category" invisible="approval_category_name != 'post_submission'"/>
+            </xpath>
+            <xpath expr="//field[@name='company_id']" position="after">
+                <field name="main_flats" invisible="approval_category_name != 'post_submission'"/>
+                <field name="cp_flats" invisible="approval_category_name != 'post_submission'"/>
+                <field name="servings_number" invisible="approval_category_name != 'post_submission'"/>
+                <field name="remarks" invisible="approval_category_name != 'post_submission'"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/tianhe_approvals/views/tianhe_supervision_worksheets_approval.xml b/tianhe_approvals/views/tianhe_supervision_worksheets_approval.xml
new file mode 100644
index 000000000..5b5c34b3d
--- /dev/null
+++ b/tianhe_approvals/views/tianhe_supervision_worksheets_approval.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="approvals_category_type_code_supervision_worksheets_approval" model="ir.ui.view">
+        <field name="name">approvals.category.type.code.supervision.worksheets.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='date_confirmed']" position="after">
+                <field name="cold" invisible="approval_category_name != 'supervision_worksheets'"/>
+                <field name="supervision_basis" invisible="approval_category_name != 'supervision_worksheets'"/>
+                <field name="handling_requirements" invisible="approval_category_name != 'supervision_worksheets'"/>
+                <field name="main_text" invisible="approval_category_name != 'supervision_worksheets'" colspan="3"/>
+            </xpath>
+            <xpath expr="//field[@name='company_id']" position="after">
+                <field name="date_start" invisible="approval_category_name != 'supervision_worksheets'"/>
+                <field name="date_end" invisible="approval_category_name != 'supervision_worksheets'"/>
+                <field name="supervise_work" invisible="approval_category_name != 'supervision_worksheets'"/>
+                <field name="work_undertaking" invisible="approval_category_name != 'supervision_worksheets'"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file

From 0fb24ba9737cd9f62460c4de19d1821f39274b9e Mon Sep 17 00:00:00 2001
From: ONION <2275333053@qq.com>
Date: Thu, 6 Jun 2024 14:13:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7/=E4=BA=91?=
 =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E5=8F=91=E6=96=87=E5=91=88=E6=89=B9=20?=
 =?UTF-8?q?=E5=B7=B2=E5=85=A8=E9=83=A8=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tianhe_approvals/__manifest__.py                  |  1 +
 .../data/approval_category_type_data.xml          | 13 +++++++++----
 tianhe_approvals/models/__init__.py               |  1 +
 .../models/inherit_approval_category.py           |  3 ++-
 ..._account_cloud_sms_post_submission_approval.py |  9 +++++++++
 ...account_cloud_sms_post_submission_approval.xml | 15 +++++++++++++++
 6 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 tianhe_approvals/models/tianhe_official_account_cloud_sms_post_submission_approval.py
 create mode 100644 tianhe_approvals/views/tianhe_official_account_cloud_sms_post_submission_approval.xml

diff --git a/tianhe_approvals/__manifest__.py b/tianhe_approvals/__manifest__.py
index 4f2d4fab4..e04ec112f 100644
--- a/tianhe_approvals/__manifest__.py
+++ b/tianhe_approvals/__manifest__.py
@@ -56,6 +56,7 @@
         'views/tianhe_fee_expend_approval.xml',
         'views/tianhe_post_submission_approval.xml',
         'views/tianhe_supervision_worksheets_approval.xml',
+        'views/tianhe_official_account_cloud_sms_post_submission_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 f80bc61c9..4983e8b0a 100644
--- a/tianhe_approvals/data/approval_category_type_data.xml
+++ b/tianhe_approvals/data/approval_category_type_data.xml
@@ -223,25 +223,30 @@
             <field name="name">物业管理变更申请表</field>
             <field name="approval_type">property_management_application</field>
         </record>
-        <!--    天河物管 - 费用调整申请表    -->
+        <!--    天河投资办公室 - 费用调整申请表    -->
         <record id="approval_category_data_tianhe_fee_adjustment_approval" model="approval.category">
             <field name="name">费用调整申请表</field>
             <field name="approval_type">fee_adjustment</field>
         </record>
-        <!--    天河物管 - 费用支出    -->
+        <!--    天河投资办公室 - 费用支出    -->
         <record id="approval_category_data_tianhe_fee_expend_approval" model="approval.category">
             <field name="name">费用支出</field>
             <field name="approval_type">fee_expend</field>
         </record>
-        <!--    天河物管 - 发文呈批    -->
+        <!--    天河投资办公室 - 发文呈批    -->
         <record id="approval_category_data_tianhe_post_submission_approval" model="approval.category">
             <field name="name">发文呈批</field>
             <field name="approval_type">post_submission</field>
         </record>
-        <!--    天河物管 - 督办工作表    -->
+        <!--    天河投资办公室 - 督办工作表    -->
         <record id="approval_category_data_tianhe_supervision_worksheets_approval" model="approval.category">
             <field name="name">督办工作表</field>
             <field name="approval_type">supervision_worksheets</field>
         </record>
+        <!--    天河投资办公室 - 公众号/云短信发文呈批    -->
+        <record id="approval_category_data_ttianhe_official_account_cloud_sms_post_submission_approval" model="approval.category">
+            <field name="name">公众号/云短信发文呈批</field>
+            <field name="approval_type">official_account_cloud_sms_post_submission</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/tianhe_approvals/models/__init__.py b/tianhe_approvals/models/__init__.py
index 18c029bbb..be7793dbd 100644
--- a/tianhe_approvals/models/__init__.py
+++ b/tianhe_approvals/models/__init__.py
@@ -36,3 +36,4 @@ from . import tianhe_fee_adjustment_approval
 from . import tianhe_fee_expend_approval
 from . import tianhe_post_submission_approval
 from . import tianhe_supervision_worksheets_approval
+from . import tianhe_official_account_cloud_sms_post_submission_approval
diff --git a/tianhe_approvals/models/inherit_approval_category.py b/tianhe_approvals/models/inherit_approval_category.py
index 921d83b42..5cee38073 100644
--- a/tianhe_approvals/models/inherit_approval_category.py
+++ b/tianhe_approvals/models/inherit_approval_category.py
@@ -51,5 +51,6 @@ class ApprovalCategory(models.Model):
         ('fee_adjustment', '费用调整申请表'),
         ('post_submission', '发文呈批'),
         ('fee_expend', '费用支出'),
-        ('supervision_worksheets', ' '),
+        ('supervision_worksheets', '督办工作表'),
+        ('official_account_cloud_sms_post_submission', '公众号/云短信发文呈批'),
     ])
diff --git a/tianhe_approvals/models/tianhe_official_account_cloud_sms_post_submission_approval.py b/tianhe_approvals/models/tianhe_official_account_cloud_sms_post_submission_approval.py
new file mode 100644
index 000000000..319cc2594
--- /dev/null
+++ b/tianhe_approvals/models/tianhe_official_account_cloud_sms_post_submission_approval.py
@@ -0,0 +1,9 @@
+from odoo import api, fields, models, tools, _
+from odoo.exceptions import ValidationError
+
+
+class TianHeOfficalAccountCloudSMSPostSubmission(models.Model):
+    _inherit = "approval.request"
+    _description = '公众号/云短信发文呈批'
+
+
diff --git a/tianhe_approvals/views/tianhe_official_account_cloud_sms_post_submission_approval.xml b/tianhe_approvals/views/tianhe_official_account_cloud_sms_post_submission_approval.xml
new file mode 100644
index 000000000..2256b7a00
--- /dev/null
+++ b/tianhe_approvals/views/tianhe_official_account_cloud_sms_post_submission_approval.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="approvals_category_type_code_official_account_cloud_sms_post_submission_approval" model="ir.ui.view">
+        <field name="name">approvals.category.type.code.official.account.cloud.sms.post.submission.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='date_confirmed']" position="after">
+                <field name="remarks" invisible="approval_category_name != 'official_account_cloud_sms_post_submission'" colspan="3"/>
+            </xpath>
+            <xpath expr="//field[@name='company_id']" position="after">
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file