From 921d083db9af2ab50b1d051479a91afe3435847e Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Thu, 15 May 2025 14:34:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 soong_workflow/models/soong_workflow_record.py    |  1 +
 soong_workflow/security/company_rule.xml          | 11 +++++------
 soong_workflow/views/soong_workflow_record.xml    |  1 +
 yuthon_salary/models/yuthon_salary_asset.py       |  2 +-
 yuthon_salary/views/yuthon_salary_asset_views.xml |  4 ++--
 yuthon_work_brand/views/hr_menus.xml              |  2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py
index 6a86a4cdd..315fa814f 100644
--- a/soong_workflow/models/soong_workflow_record.py
+++ b/soong_workflow/models/soong_workflow_record.py
@@ -31,6 +31,7 @@ class SoongWorkflowRecord(models.Model):
     employee_ids = fields.Many2many('hr.employee', string="当前经办人")
     workflow_id = fields.Many2one(comodel_name="soong.workflow", string="类型", ondelete="restrict")
     node_id = fields.Many2one(comodel_name="soong.workflow.node", string="当前节点")
+    company_id = fields.Many2one(related="create_uid.company_id", string="公司")
     approve_state = fields.Selection([("start", "草稿"), ("pending", "审批中"), ("end", "结束")], default="start", string="状态")
     reclaim_state = fields.Boolean(string="回收")
     approvals_group_id = fields.Many2one(related='workflow_id.approvals_group_id', string="审批分组", store=True)
diff --git a/soong_workflow/security/company_rule.xml b/soong_workflow/security/company_rule.xml
index 71fcd341a..4ad0b6b3c 100644
--- a/soong_workflow/security/company_rule.xml
+++ b/soong_workflow/security/company_rule.xml
@@ -5,10 +5,9 @@
         <field name="model_id" ref="model_soong_user_role"/>
         <field name="domain_force">[('company_id', 'in', company_ids)]</field>
     </record>
-
-<!--    <record model="ir.rule" id="soong_user_role_rule_group">-->
-<!--        <field name="name">角色多公司</field>-->
-<!--        <field name="model_id" ref="model_soong_user_role_group"/>-->
-<!--        <field name="domain_force">[('company_id', 'in', company_ids)]</field>-->
-<!--    </record>-->
+    <record model="ir.rule" id="soong_workflow_record_rule">
+        <field name="name">工作流查询多公司</field>
+        <field name="model_id" ref="model_soong_workflow_record"/>
+        <field name="domain_force">[('company_id', 'in', company_ids)]</field>
+    </record>
 </odoo>
\ No newline at end of file
diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml
index d15d2f235..7bb339560 100644
--- a/soong_workflow/views/soong_workflow_record.xml
+++ b/soong_workflow/views/soong_workflow_record.xml
@@ -34,6 +34,7 @@
                     <field name="employee_ids" widget="many2many_tags" string="当前经办人" class="list_ids_width"/>
                     <field name="create_uid"/>
                     <field name="write_date2"/>
+                    <field name="company_id" optional="hide"/>
                     <field name="reclaim_state" column_invisible="1"/>
                     <field name="member_of_department" optional="hide"/>
                     <button name="delete_record" type="object" string="删除" class="btn-primary" confirm="你确定要删除吗?"/>
diff --git a/yuthon_salary/models/yuthon_salary_asset.py b/yuthon_salary/models/yuthon_salary_asset.py
index d0c3928cd..54a660fa0 100644
--- a/yuthon_salary/models/yuthon_salary_asset.py
+++ b/yuthon_salary/models/yuthon_salary_asset.py
@@ -4,7 +4,7 @@ import re
 
 class YuthonSalaryAsset(models.Model):
     _name = 'yuthon.salary.asset'
-    _description = '管理费用、财务费用表'
+    _description = '预算管理'
 
     project_id = fields.Many2one('yuthon.salary.project', string='项目')
     budgeted_number = fields.Float(string='2024年预算数')
diff --git a/yuthon_salary/views/yuthon_salary_asset_views.xml b/yuthon_salary/views/yuthon_salary_asset_views.xml
index 9b96d30e0..9cc5ea152 100644
--- a/yuthon_salary/views/yuthon_salary_asset_views.xml
+++ b/yuthon_salary/views/yuthon_salary_asset_views.xml
@@ -4,7 +4,7 @@
         <field name="name">yuthon.salary.asset.tree</field>
         <field name="model">yuthon.salary.asset</field>
         <field name="arch" type="xml">
-            <tree string="管理费用、财务费用表" editable="bottom">
+            <tree string="预算管理" editable="bottom">
                 <field name="project_id"/>
                 <field name="budgeted_number"/>
                 <field name="actual_number"/>
@@ -19,7 +19,7 @@
         </field>
     </record>
     <record id="action_yuthon_salary_asset" model="ir.actions.act_window">
-        <field name="name">管理费用、财务费用表</field>
+        <field name="name">预算管理</field>
         <field name="res_model">yuthon.salary.asset</field>
         <field name="view_mode">tree</field>
     </record>
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index 467681a39..10b4d07f9 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -478,7 +478,7 @@
               action="yuthon_salary.action_view_hr_payslip_salary_release"
               sequence="30"/>
      <menuitem id="yuthon_salary_asset_board"
-              name="管理费用、财务费用表"
+              name="预算管理"
               parent="finance_manage_employee_root_board"
               action="yuthon_salary.action_yuthon_salary_asset"
               sequence="40"/>