From 2a86825c883c641b0a36efd0e6b2fc5469e4ca66 Mon Sep 17 00:00:00 2001
From: ljmwkx <1340053001@qq.com>
Date: Sat, 1 Jun 2024 22:24:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=20=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E7=B0=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_approval/models/inherit_approval_category.py       | 4 ++--
 yuthon_approval/views/inherit_approval_category_views.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/yuthon_approval/models/inherit_approval_category.py b/yuthon_approval/models/inherit_approval_category.py
index a54c7a139..db92f3d58 100644
--- a/yuthon_approval/models/inherit_approval_category.py
+++ b/yuthon_approval/models/inherit_approval_category.py
@@ -13,7 +13,7 @@ class ApprovalCategory(models.Model):
     category_start_date = fields.Date(string="开始日期", default=fields.Date.today())
     category_end_date = fields.Date(string="结束日期")
 
-    approval_type = fields.Selection(
+    new_approval_type = fields.Selection(
         string='审批分类',
         selection=[('business', '业务单据'),
                    ('oa', 'OA审批'),
@@ -22,7 +22,7 @@ class ApprovalCategory(models.Model):
 
     def unlink(self):
         for res in self:
-            if res.biote_approval_type == 'business' or res.biote_approval_type == 'branch':
+            if res.new_approval_type == 'business' or res.new_approval_type == 'branch':
                 raise UserError('不允许删除业务/分支审批！')
         return super(ApprovalCategory, self).unlink()
 
diff --git a/yuthon_approval/views/inherit_approval_category_views.xml b/yuthon_approval/views/inherit_approval_category_views.xml
index e5e341bfa..3b9036725 100644
--- a/yuthon_approval/views/inherit_approval_category_views.xml
+++ b/yuthon_approval/views/inherit_approval_category_views.xml
@@ -19,7 +19,7 @@
         <field name="inherit_id" ref="approvals.approval_category_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='description']" position="after">
-                <field name="approval_type" />
+                <field name="new_approval_type" />
                 <field name="approval_department_ids" widget="many2many_tags"/>
             </xpath>
             <xpath expr="//field[@name='approver_ids']" position="after">
@@ -29,7 +29,7 @@
     </record>
 
     <record id="approvals.approval_category_action_new_request" model="ir.actions.act_window">
-        <field name="domain">[('approval_type', '=', 'oa')]</field>
+        <field name="domain">[('new_approval_type', '=', 'oa')]</field>
     </record>
 
 </odoo>
\ No newline at end of file