Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev_zhang

Signed-off-by: 李鹏宇 <9664676+pengyuthon@user.noreply.gitee.com>

tianhe_approvals/__manifest__.py

@@ -37,6 +37,13 @@
         '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',
+        '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',

tianhe_approvals/data/approval_category_type_data.xml

@@ -132,6 +132,42 @@
             <field name="name">调岗</field>
             <field name="approval_type">generic_forms_reassignment</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_tianhe_party_branch_committee_post" model="approval.category">
+            <field name="name">党支委发文</field>
+            <field name="approval_type">party_branch_committee_post</field>
+        </record>
+        <!--    天河投资办公室 - 调班登记表    -->
+        <record id="approval_category_data_tianhe_shift_registration_form" model="approval.category">
+            <field name="name">调班登记表</field>
+            <field name="approval_type">shift_registration_form</field>
+        </record>
+        <!--    天河投资办公室 - 会议纪要    -->
+        <record id="approval_category_data_tianhe_meeting_minutes_approval" model="approval.category">
+            <field name="name">会议纪要</field>
+            <field name="approval_type">meeting_minutes</field>
+        </record>
+        <!--    天河投资办公室 - 工程立项    -->
+        <record id="approval_category_data_tianhe_engineering_approval" model="approval.category">
+            <field name="name">工程立项</field>
+            <field name="approval_type">engineering</field>
+        </record>
         <!--    天河投资办公室 - 物业经营报表管理     -->
         <record id="approval_category_data_tianhe_property_management_reporting" model="approval.category">
             <field name="name">物业经营报表管理</field>
@@ -171,6 +207,20 @@
         <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 id="approval_category_data_wuguan_property_right_alter_approval" model="approval.category">
+            <field name="name">产权变更表申请表</field>
+            <field name="approval_type">property_right_alter</field>
+        </record>
+        <!--    天河物管 - 请假登记单    -->
+        <record id="approval_category_data_wuguan_leave_registration_approval" model="approval.category">
+            <field name="name">请假登记单</field>
+            <field name="approval_type">leave_registration</field>
+        </record>
+        <!--    天河物管 - 物业管理变更申请表    -->
+        <record id="approval_category_data_wuguan_property_management_application" model="approval.category">
+            <field name="name">物业管理变更申请表</field>
+            <field name="approval_type">property_management_application</field>
         </record>
     </data>
 </odoo>

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,6 +23,10 @@ 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
+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

tianhe_approvals/models/inherit_approval_category.py

@@ -33,6 +33,13 @@ class ApprovalCategory(models.Model):
         ('tryout_official', '试用期转正式员工'),
         ('exercitation_tryout', '实习期转试用期'),
         ('generic_forms_reassignment', '公司通用表单——调岗'),
+        ('party_branch_committee_post', '党支委发文'),
+        ('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_approvals/models/inherit_approval_request.py

@@ -52,10 +52,22 @@ class ApprovalRequestLine(models.Model):
     _description = '明细行'
 
     approval_request_id = fields.Many2one('approval.request')
+
+    # 董事会议题申报表
     topic = fields.Char(string='议题')
     unit_price = fields.Char(string="单价")
     rent = fields.Char(string="租金")
     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="管理类型")

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="项目地址")

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="会议主题")

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="调班时间")

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="请假时间")

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="新管理类型")

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="新权属人")

tianhe_approvals/views/tianhe_engineering_approval.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="approvals_category_type_code_engineering_approval" model="ir.ui.view">
+        <field name="name">approvals.category.type.code.engineering.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="engineering_type" invisible="approval_category_name != 'engineering'"/>
+                <field name="engineering_place" invisible="approval_category_name != 'engineering'"/>
+            </xpath>
+            <xpath expr="//field[@name='date_confirmed']" position="after">
+                <field name="date_start" string="立项日期" invisible="approval_category_name != 'engineering'"/>
+            </xpath>
+            <xpath expr="//page[@name='description']" position="after">
+                <page string="项目物业列表" invisible="approval_category_name != 'engineering'">
+                    <field name="approval_request_ids">
+                        <tree editable="bottom">
+                            <field name="property_name"/>
+                            <field name="area"/>
+                            <field name="property_id"/>
+                            <field name="project_flow"/>
+                        </tree>
+                    </field>
+                </page>
+            </xpath>
+        </field>
+    </record>
+</odoo>

tianhe_approvals/views/tianhe_meeting_minutes_approval.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="approvals_category_type_code_meeting_minutes_approval" model="ir.ui.view">
+        <field name="name">approvals.category.type.code.meeting.minutes.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="compere" invisible="approval_category_name != 'meeting_minutes'"/>
+                <field name="attend_users" invisible="approval_category_name != 'meeting_minutes'"/>
+                <field name="attend_persons" invisible="approval_category_name != 'meeting_minutes'"/>
+            </xpath>
+            <xpath expr="//field[@name='date_confirmed']" position="after">
+                <field name="meeting_place" invisible="approval_category_name != 'meeting_minutes'"/>
+                <field name="meeting_subject" invisible="approval_category_name != 'meeting_minutes'"/>
+                <field name="date_start" string="时间" invisible="approval_category_name != 'meeting_minutes'"/>
+                <field name="main_text" string="会议内容" invisible="approval_category_name != 'meeting_minutes'" colspan="3"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>

tianhe_approvals/views/tianhe_party_branch_committee_post.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="approvals_category_type_code_party_branch_committee_post_approval" model="ir.ui.view">
+        <field name="name">approvals.category.type.code.party.branch.committee.post.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 != 'party_branch_committee_post'"/>
+                <field name="document_id" invisible="approval_category_name != 'party_branch_committee_post'"/>
+                <field name="secret_level" invisible="approval_category_name != 'party_branch_committee_post'"/>
+                <field name="urgency" invisible="approval_category_name != 'party_branch_committee_post'"/>
+                <field name="servings_number" invisible="approval_category_name != 'party_branch_committee_post'"/>
+            </xpath>
+            <xpath expr="//field[@name='date_confirmed']" position="after">
+                <field name="main_flats" invisible="approval_category_name != 'party_branch_committee_post'"/>
+                <field name="cp_flats" invisible="approval_category_name != 'party_branch_committee_post'"/>
+                <field name="date" invisible="approval_category_name != 'party_branch_committee_post'"/>
+                <field name="main_text" invisible="approval_category_name != 'party_branch_committee_post'" colspan="3"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>

tianhe_approvals/views/tianhe_shift_registration_form.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="approvals_category_type_code_shift_registration_form_approval" model="ir.ui.view">
+        <field name="name">approvals.category.type.code.shift.registration.form.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" string="申请部门" invisible="approval_category_name != 'shift_registration_form'"/>
+                <field name="date_start" string="申请时间" invisible="approval_category_name != 'shift_registration_form'"/>
+                <field name="time_transferred" invisible="approval_category_name != 'shift_registration_form'"/>
+            </xpath>
+            <xpath expr="//field[@name='date_confirmed']" position="after">
+                <field name="transferees" invisible="approval_category_name != 'shift_registration_form'"/>
+                <field name="accept_transferred" invisible="approval_category_name != 'shift_registration_form'"/>
+                <field name="main_text" string="调班原因" invisible="approval_category_name != 'shift_registration_form'" colspan="3"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>

tianhe_approvals/views/wuguan_leave_registration_approval.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="approvals_category_type_code_leave_registration" model="ir.ui.view">
+        <field name="name">approvals.category.type.code.leave.registration</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="leave_category" invisible="approval_category_name != 'leave_registration'"/>
+                <field name="leave_time" invisible="approval_category_name != 'leave_registration'"/>
+            </xpath>
+            <xpath expr="//field[@name='company_id']" position="after">
+                <field name="approvals_department_id" invisible="approval_category_name != 'leave_registration'"/>
+                <field name="flow_mark" invisible="approval_category_name != 'leave_registration'"/>
+                <field name="date" string="登记时间" invisible="approval_category_name != 'leave_registration'"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>

tianhe_approvals/views/wuguan_property_management_application.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="approvals_category_type_code_property_management_application" model="ir.ui.view">
+        <field name="name">approvals.category.type.code.property.management.application</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="new_district" invisible="approval_category_name != 'property_management_application'"/>
+                <field name="new_manage_type" invisible="approval_category_name != 'property_management_application'"/>
+                <field name="main_text" string="变更事由" invisible="approval_category_name != 'property_management_application'" colspan="3"/>
+            </xpath>
+            <xpath expr="//field[@name='company_id']" position="after">
+                <field name="new_subordinate_companies" invisible="approval_category_name != 'property_management_application'"/>
+                <field name="new_administrator" invisible="approval_category_name != 'property_management_application'"/>
+                <field name="date" string="起始生效日期" invisible="approval_category_name != 'property_management_application'"/>
+            </xpath>
+            <xpath expr="//page[@name='description']" position="after">
+                <page string="原物业信息" invisible="approval_category_name != 'property_management_application'">
+                    <field name="approval_request_ids">
+                        <tree editable="bottom">
+                            <field name="property_name"/>
+                            <field name="subordinate_companies"/>
+                            <field name="administrator"/>
+                            <field name="district"/>
+                            <field name="manage_type"/>
+                        </tree>
+                    </field>
+                </page>
+            </xpath>
+        </field>
+    </record>
+</odoo>

tianhe_approvals/views/wuguan_property_right_alter_approval.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="approvals_category_type_code_property_right_alter" model="ir.ui.view">
+        <field name="name">approvals.category.type.code.property.right.alter</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="original_tenement" invisible="approval_category_name != 'property_right_alter'"/>
+                <field name="new_tenement" invisible="approval_category_name != 'property_right_alter'"/>
+                <field name="original_property_rights" invisible="approval_category_name != 'property_right_alter'"/>
+                <field name="new_property_rights" invisible="approval_category_name != 'property_right_alter'"/>
+            </xpath>
+            <xpath expr="//field[@name='company_id']" position="after">
+                <field name="approvals_department_id" invisible="approval_category_name != 'property_right_alter'"/>
+                <field name="original_area" invisible="approval_category_name != 'property_right_alter'"/>
+                <field name="new_area" invisible="approval_category_name != 'property_right_alter'"/>
+                <field name="date" string="生效日期" invisible="approval_category_name != 'property_right_alter'"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>