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

2024-6-5制作：管子间协议，开票信息审批单，业务呈批表（粮库专用），总经理办公会议议题呈批表四个表，并修改之前的bug，让字段更协调

Browse Source
This commit is contained in:
ONIONZHAOXI
2024-06-05 18:36:24 +08:00
parent 742c0b915a
commit e3fa36f8de
13 changed files with 165 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tianhe_approvals/__manifest__.py
+4
View File
@@ -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,
tianhe_approvals/data/approval_category_type_data.xml
+21 -1
View File
@@ -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>
tianhe_approvals/models/__init__.py
+2
View File
@@ -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
tianhe_approvals/models/inherit_approval_category.py
+5 -1
View File
@@ -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', '总经理办公会议议题呈批表'),
])
tianhe_approvals/models/tianhe_dsh_issues_declarations.py
+2 -1
View File
@@ -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="议题")
tianhe_approvals/models/wuguan_intertubular_protocol.py
+16
View File
@@ -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="违约金比例")
tianhe_approvals/models/wuguan_invoicing_information_approval_order.py
+17
View File
@@ -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="开票名称")
tianhe_approvals/views/liangchu_business_approval_form_grain_depot.xml
+18
View File
@@ -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>
tianhe_approvals/views/liangchu_general_manager_office_meeting_topics.xml
+22
View File
@@ -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>
tianhe_approvals/views/tianhe_dsh_issues_declarations.xml
+3 -4
View File
@@ -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>
tianhe_approvals/views/tianhe_lease_contract_approval_form.xml
+6 -6
View File
@@ -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"/>
tianhe_approvals/views/wuguan_intertubular_protocol.xml
+27
View File
@@ -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>
tianhe_approvals/views/wuguan_invoicing_information_approval_order.xml
+22
View File
@@ -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>