From f77c71c09154a69da87f35e4eb4857b16e1df961 Mon Sep 17 00:00:00 2001
From: sunjie <sunjie20081001@126.com>
Date: Fri, 22 Aug 2025 02:52:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9B=B4=E6=96=B0=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/soong_workflow_record.xml           |  2 +-
 .../views/yuthon_hr_employee_views.xml        |  6 +-
 yuthon_maintain/__manifest__.py               |  2 +-
 .../views/maintenance_equipment_views.xml     | 88 +++++++++++--------
 .../property_reconciliation_wizard_views.xml  |  1 +
 .../views/yuthon_salary_project_views.xml     |  2 +-
 6 files changed, 59 insertions(+), 42 deletions(-)

diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml
index 301390ccf..d9ed545e0 100644
--- a/soong_workflow/views/soong_workflow_record.xml
+++ b/soong_workflow/views/soong_workflow_record.xml
@@ -59,7 +59,7 @@
                       decoration-danger="approve_state == 'end'"
                       create="false" default_order="write_date2 desc" expand="1">
                     <header>
-                       <button name="admin_end" type="object" string="管理员强制结束" dclass="oe_highlight"/>
+                       <button name="admin_end" type="object" string="管理员强制结束" class="oe_highlight"/>
                     </header>
                     <field name="code"/>
                     <field name="name"/>
diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
index 88ebde08e..3a130e23b 100644
--- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="view_employee_inherit_del_form" model="ir.ui.view">
-        <field name="name">hr.employee.inherit.del.form</field>
+        <field name="name">hr.employee.inherit.del.form.inherit</field>
         <field name="model">hr.employee</field>
         <field name="inherit_id" ref="hr.view_employee_form"/>
         <field name="arch" type="xml">
@@ -443,7 +443,7 @@
         <field name="name">hr.employee.inherit.del.form</field>
         <field name="model">hr.employee</field>
         <field name="arch" type="xml">
-            <tree string="通讯录" crate="false" delete="false" editable="bottom">
+            <tree string="通讯录" create="false" delete="false" editable="bottom">
                 <field name="name" readonly="1"/>
                 <field name="mobile_phone" readonly="1"/>
                 <field name="work_phone" readonly="1"/>
@@ -458,7 +458,7 @@
         <field name="name">hr.employee.member</field>
         <field name="model">hr.employee</field>
         <field name="arch" type="xml">
-            <tree string="会员列表" crate="false" delete="false" editable="bottom">
+            <tree string="会员列表" create="false" delete="false" editable="bottom">
                 <field name="name" readonly="1"/>
                 <field name="work_phone" readonly="1"/>
                 <field name="department_id" readonly="1" options='{"no_open": True, "no_create": True}'/>
diff --git a/yuthon_maintain/__manifest__.py b/yuthon_maintain/__manifest__.py
index 256159366..92f99702d 100644
--- a/yuthon_maintain/__manifest__.py
+++ b/yuthon_maintain/__manifest__.py
@@ -10,7 +10,7 @@
     'category': 'Human Resources/Attendances',
     'version': '0.1',
     'license': 'LGPL-3',
-    'depends': ['documents', 'maintenance', 'hr', 'base', 'soong_workflow'],
+    'depends': ['documents', 'maintenance', 'hr', 'base', 'soong_workflow','hr_maintenance'],
     'data': [
         'security/ir.model.access.csv',
         'data/yuthon_maintain_code_data.xml',
diff --git a/yuthon_maintain/views/maintenance_equipment_views.xml b/yuthon_maintain/views/maintenance_equipment_views.xml
index bd2c45d25..bb85eac1f 100644
--- a/yuthon_maintain/views/maintenance_equipment_views.xml
+++ b/yuthon_maintain/views/maintenance_equipment_views.xml
@@ -13,7 +13,8 @@
                 <field name="company" string="公司" widget="radio" invisible="not is_jtbb"/>
             </xpath>
             <xpath expr="//field[@name='department_id']" position="after">
-                    <field name="department_id1" options="{'no_create': True}" invisible="equipment_assign_to != 'employee'"/>
+                <field name="department_id1" options="{'no_create': True}"
+                       invisible="equipment_assign_to != 'employee'"/>
             </xpath>
             <xpath expr="//field[@name='technician_user_id']" position="attributes">
                 <attribute name="string">管理员</attribute>
@@ -24,13 +25,13 @@
                 <field name="equipment_unit"/>
             </xpath>
             <xpath expr="//field[@name='model']" position="attributes">
-                    <attribute name="string">型号</attribute>
+                <attribute name="string">型号</attribute>
             </xpath>
             <xpath expr="//field[@name='cost']" position="attributes">
-                    <attribute name="string">原值</attribute>
+                <attribute name="string">原值</attribute>
             </xpath>
             <xpath expr="//field[@name='warranty_date']" position="attributes">
-                    <attribute name="string">寿命</attribute>
+                <attribute name="string">寿命</attribute>
             </xpath>
             <xpath expr="//page[@name='maintenance']" position="after">
                 <page string="关联流程">
@@ -79,39 +80,54 @@
         </field>
     </record>
     <record id="view_maintenance_equipment_inherit_tree" model="ir.ui.view">
-            <field name="name">maintenance.equipment.tree.inherit</field>
-            <field name="model">maintenance.equipment</field>
-            <field name="inherit_id" ref="maintenance.hr_equipment_view_tree"/>
-            <field name="arch" type="xml">
-                    <xpath expr="//tree/field[@name='name']" position="after">
-                        <field name="mainten_state"/>
-                        <field name="model" sting="型号"/>
-                        <field name="equipment_number"/>
-                        <field name="equipment_unit"/>
-                        <field name="cost" string="原值"/>
-                        <field name="warranty_date" string="寿命"/>
-                    </xpath>
-                    <xpath expr="//tree/field[@name='employee_id']" position="attributes">
-                        <attribute name="column_invisible">1</attribute>
-                    </xpath>
-                    <xpath expr="//tree/field[@name='technician_user_id']" position="attributes">
-                        <attribute name="column_invisible">1</attribute>
-                    </xpath>
-                    <xpath expr="//tree/field[@name='technician_user_id']" position="after">
-                        <field name="employee_id" string="员工"/>
-                        <field name="department_id1"/>
-                    </xpath>
-                    <xpath expr="//tree/field[@name='department_id']" position="attributes">
-                        <attribute name="column_invisible">1</attribute>
-                    </xpath>
-                    <xpath expr="//tree/field[@name='assign_date']" position="attributes">
-                            <attribute name="string">购入日期</attribute>
-                    </xpath>
-                    <xpath expr="//tree/field[@name='serial_no']" position="attributes">
-                            <attribute name="string">资产编号</attribute>
-                    </xpath>
-            </field>
+        <field name="name">maintenance.equipment.tree.inherit</field>
+        <field name="model">maintenance.equipment</field>
+        <field name="inherit_id" ref="maintenance.hr_equipment_view_tree"/>
+        <field name="arch" type="xml">
+
+            <xpath expr="//field[@name='name']" position="after">
+                <field name="mainten_state"/>
+                <field name="model" string="型号"/>
+                <field name="equipment_number"/>
+                <field name="equipment_unit"/>
+                <field name="cost" string="原值"/>
+                <field name="warranty_date" string="寿命"/>
+            </xpath>
+
+            <xpath expr="//field[@name='assign_date']" position="attributes">
+                <attribute name="string">购入日期</attribute>
+            </xpath>
+            <xpath expr="//field[@name='serial_no']" position="attributes">
+                <attribute name="string">资产编号</attribute>
+            </xpath>
+        </field>
     </record>
+
+
+    <record id="maintenance_equipment_view_tree_inherit_hr" model="ir.ui.view">
+        <field name="name">maintenance.equipment.view.tree.inherit.hr</field>
+        <field name="model">maintenance.equipment</field>
+        <field name="inherit_id" ref="hr_maintenance.maintenance_equipment_view_tree_inherit_hr"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='employee_id']" position="attributes">
+                <attribute name="column_invisible">1</attribute>
+            </xpath>
+            <xpath expr="//field[@name='department_id']" position="attributes">
+                <attribute name="column_invisible">1</attribute>
+            </xpath>
+
+            <xpath expr="//field[@name='technician_user_id']" position="after">
+                <field name="employee_id" string="员工"/>
+                <field name="department_id1"/>
+            </xpath>
+
+            <xpath expr="//field[@name='technician_user_id']" position="attributes">
+                <attribute name="column_invisible">1</attribute>
+            </xpath>
+
+        </field>
+    </record>
+
     <record id="maintain_equipment_kanban_inherit_hr" model="ir.ui.view">
         <field name="name">maintain.equipment.kanban.inherit.hr</field>
         <field name="model">maintenance.equipment</field>
diff --git a/yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml b/yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml
index 54d2ab7c9..0219d6228 100644
--- a/yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml
+++ b/yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml
@@ -19,6 +19,7 @@
                         <page name="对账明细">
                             <field name="reconciliation_line_ids">
                                 <tree editable="bottom" create="false" delete="false" default_order="sequence desc">
+                                    <field name="sequence" column_invisible="1" />
                                     <field name="reconciliation_id" column_invisible="1"/>
                                     <field name="property_id" readonly="1" force_save="1"/>
                                     <field name="contract_id" readonly="1" force_save="1"/>
diff --git a/yuthon_salary/views/yuthon_salary_project_views.xml b/yuthon_salary/views/yuthon_salary_project_views.xml
index b97feebf7..d765dfdd7 100644
--- a/yuthon_salary/views/yuthon_salary_project_views.xml
+++ b/yuthon_salary/views/yuthon_salary_project_views.xml
@@ -4,7 +4,7 @@
         <field name="name">yuthon.salary.project.tree</field>
         <field name="model">yuthon.salary.project</field>
         <field name="arch" type="xml">
-            <tree string="项目配置" edtitable="bottom">
+            <tree string="项目配置" editable="bottom">
                 <field name="sequence"/>
                 <field name="name"/>
                 <field name="decision_type_id"/>