From e3fa36f8de5caf7fb5c9e489a3ea65d10bb2ed39 Mon Sep 17 00:00:00 2001
From: ONIONZHAOXI <2275333053@qq.com>
Date: Wed, 5 Jun 2024 18:36:24 +0800
Subject: [PATCH] =?UTF-8?q?2024-6-5=E5=88=B6=E4=BD=9C=EF=BC=9A=E7=AE=A1?=
 =?UTF-8?q?=E5=AD=90=E9=97=B4=E5=8D=8F=E8=AE=AE=EF=BC=8C=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AE=A1=E6=89=B9=E5=8D=95=EF=BC=8C=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E5=91=88=E6=89=B9=E8=A1=A8=EF=BC=88=E7=B2=AE=E5=BA=93?=
 =?UTF-8?q?=E4=B8=93=E7=94=A8=EF=BC=89=EF=BC=8C=E6=80=BB=E7=BB=8F=E7=90=86?=
 =?UTF-8?q?=E5=8A=9E=E5=85=AC=E4=BC=9A=E8=AE=AE=E8=AE=AE=E9=A2=98=E5=91=88?=
 =?UTF-8?q?=E6=89=B9=E8=A1=A8=E5=9B=9B=E4=B8=AA=E8=A1=A8=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B9=8B=E5=89=8D=E7=9A=84bug=EF=BC=8C?=
 =?UTF-8?q?=E8=AE=A9=E5=AD=97=E6=AE=B5=E6=9B=B4=E5=8D=8F=E8=B0=83?=
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      | 22 ++++++++++++++-
 tianhe_approvals/models/__init__.py           |  2 ++
 .../models/inherit_approval_category.py       |  6 ++++-
 .../models/tianhe_dsh_issues_declarations.py  |  3 ++-
 .../models/wuguan_intertubular_protocol.py    | 16 +++++++++++
 ...an_invoicing_information_approval_order.py | 17 ++++++++++++
 ...chu_business_approval_form_grain_depot.xml | 18 +++++++++++++
 ..._general_manager_office_meeting_topics.xml | 22 +++++++++++++++
 .../views/tianhe_dsh_issues_declarations.xml  |  7 +++--
 .../tianhe_lease_contract_approval_form.xml   | 12 ++++-----
 .../views/wuguan_intertubular_protocol.xml    | 27 +++++++++++++++++++
 ...n_invoicing_information_approval_order.xml | 22 +++++++++++++++
 13 files changed, 165 insertions(+), 13 deletions(-)
 create mode 100644 tianhe_approvals/models/wuguan_intertubular_protocol.py
 create mode 100644 tianhe_approvals/models/wuguan_invoicing_information_approval_order.py
 create mode 100644 tianhe_approvals/views/liangchu_business_approval_form_grain_depot.xml
 create mode 100644 tianhe_approvals/views/liangchu_general_manager_office_meeting_topics.xml
 create mode 100644 tianhe_approvals/views/wuguan_intertubular_protocol.xml
 create mode 100644 tianhe_approvals/views/wuguan_invoicing_information_approval_order.xml

diff --git a/tianhe_approvals/__manifest__.py b/tianhe_approvals/__manifest__.py
index c644c770f..a7ea7b308 100644
--- a/tianhe_approvals/__manifest__.py
+++ b/tianhe_approvals/__manifest__.py
@@ -41,6 +41,10 @@
         'views/tianhe_fire_safety_management.xml',
         'views/tianhe_information_ublish_approval_form.xml',
         'views/tianhe_lease_contract_approval_form.xml',
+        'views/wuguan_intertubular_protocol.xml',
+        'views/wuguan_invoicing_information_approval_order.xml',
+        'views/liangchu_business_approval_form_grain_depot.xml',
+        'views/liangchu_general_manager_office_meeting_topics.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 02479af1e..cead4154d 100644
--- a/tianhe_approvals/data/approval_category_type_data.xml
+++ b/tianhe_approvals/data/approval_category_type_data.xml
@@ -152,5 +152,25 @@
             <field name="name">租赁合同呈批表</field>
             <field name="approval_type">tianhe_lease_contract_approval_form</field>
         </record>
+        <!--    天河物管 - 管子间协议    -->
+        <record id="approval_category_data_wuguan_intertubular_protocol" model="approval.category">
+            <field name="name">管子间协议</field>
+            <field name="approval_type">wuguan_intertubular_protocol</field>
+        </record>
+              <!--    天河物管 - 开票信息审批单    -->
+        <record id="approval_category_data_wuguan_invoicing_information_approval_order" model="approval.category">
+            <field name="name">开票信息审批单</field>
+            <field name="approval_type">wuguan_invoicing_information_approval_order</field>
+        </record>
+               <!--    粮储 - 业务呈批表（粮库专用）    -->
+        <record id="approval_category_data_liangchu_business_approval_form_grain_depot" model="approval.category">
+            <field name="name">业务呈批表（粮库专用）</field>
+            <field name="approval_type">liangchu_business_approval_form_grain_depot</field>
+        </record>
+                 <!--    粮储 - 总经理办公会议议题呈批表    -->
+        <record id="approval_category_data_liangchu_general_manager_office_meeting_topics" model="approval.category">
+            <field name="name">总经理办公会议议题呈批表</field>
+            <field name="approval_type">liangchu_general_manager_office_meeting_topics</field>
+        </record>
     </data>
-</odoo>
+</odoo>
\ No newline at end of file
diff --git a/tianhe_approvals/models/__init__.py b/tianhe_approvals/models/__init__.py
index f1b5c225a..02a8b3a23 100644
--- a/tianhe_approvals/models/__init__.py
+++ b/tianhe_approvals/models/__init__.py
@@ -20,3 +20,5 @@ from . import generic_forms_reassignment
 from . import tianhe_fire_safety_management
 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
diff --git a/tianhe_approvals/models/inherit_approval_category.py b/tianhe_approvals/models/inherit_approval_category.py
index 214328eca..cdf20a0cc 100644
--- a/tianhe_approvals/models/inherit_approval_category.py
+++ b/tianhe_approvals/models/inherit_approval_category.py
@@ -36,5 +36,9 @@ class ApprovalCategory(models.Model):
         ('tianhe_property_management_reporting', '物业经营报表管理'),
         ('tianhe_fire_safety_management', '消防安全管理'),
         ('tianhe_information_ublish_approval_form', '信息发布呈批表'),
-        ('tianhe_lease_contract_approval_form', '信息发布呈批表'),
+        ('tianhe_lease_contract_approval_form', '租赁合同呈批表'),
+        ('wuguan_intertubular_protocol', '管子间协议'),
+        ('wuguan_invoicing_information_approval_order', '开票信息审批单'),
+        ('liangchu_business_approval_form_grain_depot', '业务呈批表'),
+        ('liangchu_general_manager_office_meeting_topics', '总经理办公会议议题呈批表'),
     ])
diff --git a/tianhe_approvals/models/tianhe_dsh_issues_declarations.py b/tianhe_approvals/models/tianhe_dsh_issues_declarations.py
index 78cc0c51c..03d23183d 100644
--- a/tianhe_approvals/models/tianhe_dsh_issues_declarations.py
+++ b/tianhe_approvals/models/tianhe_dsh_issues_declarations.py
@@ -7,4 +7,5 @@ class TianHeDshIssuesDeclarations(models.Model):
     _inherit = "approval.request"
     _description = '天河投资办公室——董事会议题申报表'
 
-    approval_request_ids = fields.One2many('approval.request.line', 'approval_request_id', string="正文")
+    approval_request_ids = fields.One2many('approval.request.line', 'approval_request_id', string="")
+    # issues = fields.Char(string="议题")
diff --git a/tianhe_approvals/models/wuguan_intertubular_protocol.py b/tianhe_approvals/models/wuguan_intertubular_protocol.py
new file mode 100644
index 000000000..cc795841d
--- /dev/null
+++ b/tianhe_approvals/models/wuguan_intertubular_protocol.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, tools, _
+from odoo.exceptions import ValidationError
+
+
+class WuguanIntertubularProtocol(models.Model):
+    _inherit = "approval.request"
+    _description = '管子间协议'
+
+    wuguan_payout_address = fields.Char(string="物业地址")
+    management_fee = fields.Char(string="管理费")
+    collection_agencies = fields.Char(string="收款公司")
+    total_management_fee = fields.Char(string="管理费总额")
+    payment_cycle = fields.Char(string="付款周期")
+    date_lease = fields.Char(string="租期")
+    penalty_proportion = fields.Char(string="违约金比例")
diff --git a/tianhe_approvals/models/wuguan_invoicing_information_approval_order.py b/tianhe_approvals/models/wuguan_invoicing_information_approval_order.py
new file mode 100644
index 000000000..76d08d450
--- /dev/null
+++ b/tianhe_approvals/models/wuguan_invoicing_information_approval_order.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, tools, _
+from odoo.exceptions import ValidationError
+
+
+class WuguanInvoicingInformationApprovalOrder(models.Model):
+    _inherit = "approval.request"
+    _description = '开票信息审批单'
+
+    # contract_id = fields.Char(string="合同编号")
+    # date_start = fields.Datetime(string="开始时间")
+    # lessee = fields.Char(string="承租方")
+    # wuguan_payout_address = fields.Char(string="物业地址")
+    duty_number = fields.Char(string="税号")
+    billing_type = fields.Char(string="开票类型")
+    wuguan_email = fields.Char(string="邮箱")
+    billing_name = fields.Char(string="开票名称")
\ No newline at end of file
diff --git a/tianhe_approvals/views/liangchu_business_approval_form_grain_depot.xml b/tianhe_approvals/views/liangchu_business_approval_form_grain_depot.xml
new file mode 100644
index 000000000..76fd5c291
--- /dev/null
+++ b/tianhe_approvals/views/liangchu_business_approval_form_grain_depot.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="approvals_category_type_code_liangchu_business_approval_form_grain_depot" model="ir.ui.view">
+        <field name="name">approvals.category.type.code.liangchu.business.approval.form.grain.depot</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="main_text" invisible="approval_category_name != 'liangchu_business_approval_form_grain_depot'" colspan="3"/>
+            </xpath>
+            <xpath expr="//field[@name='company_id']" position="after">
+                <field name="approvals_department_id" invisible="approval_category_name != 'liangchu_business_approval_form_grain_depot'"/>
+                <field name="business_type"  invisible="approval_category_name != 'liangchu_business_approval_form_grain_depot'"/>
+                <field name="urgency"  invisible="approval_category_name != 'liangchu_business_approval_form_grain_depot'"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/tianhe_approvals/views/liangchu_general_manager_office_meeting_topics.xml b/tianhe_approvals/views/liangchu_general_manager_office_meeting_topics.xml
new file mode 100644
index 000000000..8ff9ed6ce
--- /dev/null
+++ b/tianhe_approvals/views/liangchu_general_manager_office_meeting_topics.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="approvals_category_type_code_liangchu_general_manager_office_meeting_topics" model="ir.ui.view">
+        <field name="name">approvals.category.type.code.liangchu.general.manager.office.meeting.topics</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 != 'liangchu_general_manager_office_meeting_topics'"/>
+            </xpath>
+            <xpath expr="//group" position="after" >
+                <group invisible="approval_category_name != 'liangchu_general_manager_office_meeting_topics'">
+                    <field name="approval_request_ids" string="">
+                        <tree editable="bottom">
+                            <field name="topic"/>
+                        </tree>
+                    </field>
+                </group>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/tianhe_approvals/views/tianhe_dsh_issues_declarations.xml b/tianhe_approvals/views/tianhe_dsh_issues_declarations.xml
index cc6671cf8..b512a5b48 100644
--- a/tianhe_approvals/views/tianhe_dsh_issues_declarations.xml
+++ b/tianhe_approvals/views/tianhe_dsh_issues_declarations.xml
@@ -7,12 +7,11 @@
         <field name="arch" type="xml">
             <xpath expr="//field[@name='company_id']" position="after">
                 <field name="approvals_department_id" invisible="approval_category_name != 'tianhe_dsh_issues_declarations'"/>
-                <field name="date" invisible="approval_category_name != 'tianhe_dsh_issues_declarations'"/>
             </xpath>
-            <xpath expr="//group" position="after">
+            <xpath expr="//group" position="after" >
                 <group invisible="approval_category_name != 'tianhe_dsh_issues_declarations'">
-                    <field name="approval_request_ids">
-                        <tree>
+                    <field name="approval_request_ids" string="">
+                        <tree editable="bottom">
                             <field name="topic"/>
                         </tree>
                     </field>
diff --git a/tianhe_approvals/views/tianhe_lease_contract_approval_form.xml b/tianhe_approvals/views/tianhe_lease_contract_approval_form.xml
index 35123fa9a..7814dbbf5 100644
--- a/tianhe_approvals/views/tianhe_lease_contract_approval_form.xml
+++ b/tianhe_approvals/views/tianhe_lease_contract_approval_form.xml
@@ -21,7 +21,7 @@
             <xpath expr="//group" position="after">
                 <group invisible="approval_category_name != 'tianhe_lease_contract_approval_form'">
                     <field name="approval_request_ids" string="租金信息">
-                        <tree>
+                        <tree editable="bottom">
                             <field name="unit_price"/>
                             <field name="rent"/>
                             <field name="date_start"/>
@@ -31,14 +31,14 @@
                 </group>
             </xpath>
             <xpath expr="//page[@name='approvers']" position="before">
-                <page string="参考信息">
+                <page string="参考信息" invisible="approval_category_name != 'tianhe_lease_contract_approval_form'">
                     <from>
                         <group>
                             <group>
-                                <field name="original_lessee"/>
-                                <field name="original_lease_price"/>
-                                <field name="market_reference_price"/>
-                                <field name="evaluate_reference_price"/>
+                                <field name="original_lessee" />
+                                <field name="original_lease_price" />
+                                <field name="market_reference_price" />
+                                <field name="evaluate_reference_price" />
                             </group>
                             <group>
                                 <field name="expiration_time"/>
diff --git a/tianhe_approvals/views/wuguan_intertubular_protocol.xml b/tianhe_approvals/views/wuguan_intertubular_protocol.xml
new file mode 100644
index 000000000..085782419
--- /dev/null
+++ b/tianhe_approvals/views/wuguan_intertubular_protocol.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="approvals_category_type_code_wuguan_intertubular_protocol" model="ir.ui.view">
+        <field name="name">approvals.category.type.code.wuguan.intertubular.protocol</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="contract_id" invisible="approval_category_name != 'wuguan_intertubular_protocol'"/>
+                <field name="lessee" invisible="approval_category_name != 'wuguan_intertubular_protocol'"/>
+                <field name="wuguan_payout_address"  invisible="approval_category_name != 'wuguan_intertubular_protocol'"/>
+                <field name="management_fee"  invisible="approval_category_name != 'wuguan_intertubular_protocol'"/>
+                <field name="total_management_fee" invisible="approval_category_name != 'wuguan_intertubular_protocol'"/>
+                <field name="date_start" invisible="approval_category_name != 'wuguan_intertubular_protocol'"/>
+                <field name="date_end" invisible="approval_category_name != 'wuguan_intertubular_protocol'"/>
+            </xpath>
+            <xpath expr="//field[@name='date_confirmed']" position="after">
+                <field name="deposit" invisible="approval_category_name != 'wuguan_intertubular_protocol'"/>
+                <field name="property_rent_m" invisible="approval_category_name != 'wuguan_intertubular_protocol'"/>
+                <field name="payment_cycle" invisible="approval_category_name != 'wuguan_intertubular_protocol'"/>
+                <field name="date_lease" invisible="approval_category_name != 'wuguan_intertubular_protocol'"/>
+                <field name="penalty_proportion" invisible="approval_category_name != 'wuguan_intertubular_protocol'"/>
+                <field name="collection_agencies" invisible="approval_category_name != 'wuguan_intertubular_protocol'"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/tianhe_approvals/views/wuguan_invoicing_information_approval_order.xml b/tianhe_approvals/views/wuguan_invoicing_information_approval_order.xml
new file mode 100644
index 000000000..2d5465d11
--- /dev/null
+++ b/tianhe_approvals/views/wuguan_invoicing_information_approval_order.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="approvals_category_type_code_wuguan_invoicing_information_approval_order" model="ir.ui.view">
+        <field name="name">approvals.category.type.code.wuguan.invoicing.information.approval.order</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 != 'wuguan_invoicing_information_approval_order'"/>
+                <field name="date_start" string="生效日期" invisible="approval_category_name != 'wuguan_invoicing_information_approval_order'"/>
+                <field name="lessee" invisible="approval_category_name != 'wuguan_invoicing_information_approval_order'"/>
+            </xpath>
+            <xpath expr="//field[@name='company_id']" position="after">
+                <field name="billing_type" invisible="approval_category_name != 'wuguan_invoicing_information_approval_order'"/>
+                <field name="wuguan_email" invisible="approval_category_name != 'wuguan_invoicing_information_approval_order'"/>
+                <field name="billing_name"  invisible="approval_category_name != 'wuguan_invoicing_information_approval_order'"/>
+                <field name="wuguan_payout_address" invisible="approval_category_name != 'wuguan_invoicing_information_approval_order'"/>
+                <field name="duty_number" invisible="approval_category_name != 'wuguan_invoicing_information_approval_order'"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file