This commit is contained in:
pengyuthon
2024-06-01 15:34:49 +08:00
parent 2285dd4839
commit 8a4b28f97f
5 changed files with 20 additions and 26 deletions
@@ -4,90 +4,88 @@
<!-- 天河投资办公室 - 采购办公用品 -->
<record id="approval_category_data_tianhe_purchase_work_approval" model="approval.category">
<field name="name">采购办公用品</field>
<field name="approval_category_type">purchase_work</field>
<field name="approval_type">purchase_work</field>
</record>
<!-- 天河投资办公室 - 党总支发文 -->
<record id="approval_category_data_tianhe_general_party_branch_post" model="approval.category">
<field name="name">党总支发文</field>
<field name="approval_category_type">general_party_branch_post</field>
<field name="approval_type">general_party_branch_post</field>
</record>
<!-- 天河投资办公室 - 建设工程业务呈批表 -->
<record id="approval_category_data_tianhe_construction_business_approval" model="approval.category">
<field name="name">建设工程业务呈批表</field>
<field name="approval_category_type">construction_business</field>
<field name="sequence">1</field>
<field name="approval_type">construction_business</field>
</record>
<!-- 天河投资办公室 - 董事会议题申报表 -->
<record id="approval_category_data_tianhe_dsh_issues_declarations" model="approval.category">
<field name="name">董事会议题申报表</field>
<field name="approval_category_type">tianhe_dsh_issues_declarations</field>
<field name="approval_type">tianhe_dsh_issues_declarations</field>
</record>
<!-- 天河投资办公室 - 经营班子申报表 -->
<record id="approval_category_data_tianhe_management_declare_approval" model="approval.category">
<field name="name">经营班子申报表</field>
<field name="approval_category_type">management_declare</field>
<field name="approval_type">management_declare</field>
<field name="sequence">1</field>
</record>
<!-- 天河投资办公室 - 公文发文(子企业) -->
<record id="approval_category_data_tianhe_official_issues_for_son" model="approval.category">
<field name="name">公文发文(子企业)</field>
<field name="approval_category_type">official_issues_for_son</field>
<field name="sequence">1</field>
<field name="approval_type">official_issues_for_son</field>
</record>
<!-- 天河投资办公室 - 公文发文 -->
<record id="approval_category_data_tianhe_official_issues" model="approval.category">
<field name="name">公文发文</field>
<field name="approval_category_type">official_issues</field>
<field name="approval_type">official_issues</field>
</record>
<!-- 天河投资办公室 - 科创中小企业服务中心业务呈批表 -->
<record id="approval_category_data_tianhe_business_statement_approval" model="approval.category">
<field name="name">科创中小企业服务中心业务呈批表</field>
<field name="approval_category_type">business_statement</field>
<field name="approval_type">business_statement</field>
</record>
<!-- 天河投资办公室 - 公文收文 -->
<record id="approval_category_data_tianhe_official_receipt" model="approval.category">
<field name="name">公文收文</field>
<field name="approval_category_type">official_receipt</field>
<field name="approval_type">official_receipt</field>
</record>
<!-- 天河投资办公室 - 流程变更申请 -->
<record id="approval_category_data_tianhe_process_change_approval" model="approval.category">
<field name="name">流程变更申请</field>
<field name="approval_category_type">process_change</field>
<field name="approval_type">process_change</field>
</record>
<!-- 天河投资办公室 - 会议文档 -->
<record id="approval_category_data_tianhe_meeting_file" model="approval.category">
<field name="name">会议文档</field>
<field name="approval_category_type">meeting_file</field>
<field name="approval_type">meeting_file</field>
</record>
<!-- 天河投资办公室 - 诉讼事项录入表 -->
<record id="approval_category_data_tianhe_contentious_matter_approval" model="approval.category">
<field name="name">诉讼事项录入表</field>
<field name="approval_category_type">contentious_matter</field>
<field name="approval_type">contentious_matter</field>
</record>
<!-- 天河投资办公室 - 投融资发文 -->
<record id="approval_category_data_tianhe_financing_post_approval" model="approval.category">
<field name="name">投融资发文</field>
<field name="approval_category_type">financing_post</field>
<field name="approval_type">financing_post</field>
</record>
<!-- 天河投资办公室 - 业务呈批表 -->
<record id="approval_category_data_tianhe_business_approval" model="approval.category">
<field name="name">业务呈批表</field>
<field name="approval_category_type">business</field>
<field name="approval_type">business</field>
</record>
<!-- 天河投资办公室 - 文件处理表 -->
<record id="approval_category_data_tianhe_document_processing_approval" model="approval.category">
<field name="name">文件处理表</field>
<field name="approval_category_type">document_processing</field>
<field name="approval_type">document_processing</field>
</record>
<!-- 天河投资办公室 - 物业部业务呈批表 -->
<record id="approval_category_data_tianhe_property_submission_approval" model="approval.category">
<field name="name">物业部业务呈批表</field>
<field name="approval_category_type">property_submission</field>
<field name="approval_type">property_submission</field>
</record>
<!-- 天河投资办公室 - 租赁合同收款单 -->
<record id="approval_category_data_tianhe_rental_receipt_approval" model="approval.category">
<field name="name">天河投资租赁合同收款单</field>
<field name="approval_category_type">rental_receipt</field>
<field name="approval_type">rental_receipt</field>
</record>
</data>
</odoo>
@@ -6,7 +6,7 @@ class ApprovalCategory(models.Model):
_inherit = 'approval.category'
_description = 'tian he 审批框架拓展'
approval_category_type = fields.Selection([
approval_type = fields.Selection(selection_add=[
('purchase_work', '采购审批单'),
('construction_business', '建设工程业务呈批表'),
('management_declare', '经营班子申报表'),
@@ -29,4 +29,4 @@ class ApprovalCategory(models.Model):
('document_processing', '文件处理表'),
('property_submission', '物业部业务呈批表'),
('rental_receipt', '租赁合同收款单'),
], string="审批类别")
])
@@ -8,9 +8,6 @@ class ApprovalCategory(models.Model):
approval_department_ids = fields.Many2many('hr.department', string="审批所属部门")
approval_process_id = fields.Many2one('approval.process', string="审批流程")
approval_category_type = fields.Selection([
('demo', 'demo测试')
], string="审批类别", help="后台计算")
is_enable = fields.Boolean(string="启用", default=True)
category_start_date = fields.Date(string="开始日期", default=fields.Date.today())
category_end_date = fields.Date(string="结束日期")
@@ -6,7 +6,7 @@ from odoo.exceptions import ValidationError
class ApprovalRequest(models.Model):
_inherit = "approval.request"
approval_category_name = fields.Selection(string="类别名称", related='category_id.approval_category_type')
approval_category_name = fields.Selection(string="类别名称", related='category_id.approval_type')
def print_approval_report(self):
return self.env.ref('yuthon_approval.all_demo_report_actions').report_action(self)
@@ -20,7 +20,6 @@
<field name="arch" type="xml">
<xpath expr="//field[@name='description']" position="after">
<field name="approval_department_ids" widget="many2many_tags"/>
<field name="approval_category_type"/>
</xpath>
<xpath expr="//field[@name='approver_ids']" position="after">
<field name="approval_process_id" widget="many2one_avatar_user"/>