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 @@ 租赁合同呈批表 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 + - + \ 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 @@ + + + + approvals.category.type.code.liangchu.business.approval.form.grain.depot + approval.request + + + + + + + + + + + + + \ 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 @@ + + + + approvals.category.type.code.liangchu.general.manager.office.meeting.topics + approval.request + + + + + + + + + + + + + + + + + \ 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 @@ - - + - - + + 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 @@ - + @@ -31,14 +31,14 @@ - + - - - - + + + + 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 @@ + + + + approvals.category.type.code.wuguan.intertubular.protocol + approval.request + + + + + + + + + + + + + + + + + + + + + + \ 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 @@ + + + + approvals.category.type.code.wuguan.invoicing.information.approval.order + approval.request + + + + + + + + + + + + + + + + + \ No newline at end of file