From 73541202aeee4ab3d30b2e19d4bcbf4074ec9316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Fri, 10 Apr 2026 16:47:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/property_lease_contract.xml            |  1 +
 yuthon_trade/models/yuthon_seals_approval.py     | 16 ++++++++++++++++
 .../views/yuthon_seals_approval_views.xml        |  7 ++++---
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index 11533add1..e43b9db80 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -450,6 +450,7 @@
                 <field name="deposit" decoration-success="deposit_status == 'paid'"
                        decoration-danger="deposit_status == 'unpaid'" decoration-muted="deposit_status == 'returned'"
                        decoration-warning="deposit_status == 'no_paid'"/>
+                <field name="not_tax_amount"/>
                 <field name="rent"/>
                 <field name="not_received" decoration-muted="comparison == 'equal'"
                        decoration-danger="comparison == 'outweigh'"
diff --git a/yuthon_trade/models/yuthon_seals_approval.py b/yuthon_trade/models/yuthon_seals_approval.py
index 8ad2e1caf..34c02265e 100644
--- a/yuthon_trade/models/yuthon_seals_approval.py
+++ b/yuthon_trade/models/yuthon_seals_approval.py
@@ -23,6 +23,22 @@ class YuthonSealsApproval(models.Model):
     remake = fields.Text(string="用章意见")
     active = fields.Boolean('Active', default=True, tracking=True)
     work_end = fields.Boolean(string="结束")
+    is_company = fields.Boolean(string="本公司", default=True, compute='_compute_is_company',
+                                search='_search_part_of_company')
+
+    def _compute_is_company(self):
+        active_company_ids = self.env.companies
+        for employee in self:
+            employee.is_company = employee.company_id in active_company_ids
+
+    def _search_part_of_company(self, operator, value):
+        company_ids = self.env.companies.ids
+        if not value:
+            operator = '!=' if operator == '=' else '='
+        if operator == '=':
+            return [('company_id', 'in', company_ids)]
+        else:
+            return [('company_id', 'not in', company_ids)]
 
     def _get_default_name_title(self):
         return self._description if self._description else self._name
diff --git a/yuthon_trade/views/yuthon_seals_approval_views.xml b/yuthon_trade/views/yuthon_seals_approval_views.xml
index a0b4f521c..44e2cc2c2 100644
--- a/yuthon_trade/views/yuthon_seals_approval_views.xml
+++ b/yuthon_trade/views/yuthon_seals_approval_views.xml
@@ -5,10 +5,10 @@
         <field name="model">yuthon.seals.approval</field>
         <field name="arch" type="xml">
             <tree string="用章审批">
-                <field name="name"/>
-                <field name="users_id" options="{'no_create': True}"/>
+                <field name="code"/>
+                <field name="users_id" string="发起人" options="{'no_create': True}"/>
+                <field name="name" string="标题"/>
                 <field name="approval_unit"/>
-                <field name="remake"/>
             </tree>
         </field>
     </record>
@@ -63,6 +63,7 @@
     <record id="view_yuthon_seals_approval_action" model="ir.actions.act_window">
         <field name="name">用章审批</field>
         <field name="res_model">yuthon.seals.approval</field>
+         <field name="domain">[('is_company','=',True)]</field>
         <field name="view_mode">tree,form</field>
     </record>
 </odoo>
\ No newline at end of file