From 9f6fa5d2503cbed3c4234576f62389b96593a8e0 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Wed, 26 Mar 2025 16:00:41 +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

---
 yuthon_property/views/yuthon_property_views.xml               | 2 +-
 .../models/property_evaluate_application.py                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml
index 01d28e48d..b99dfeeb8 100644
--- a/yuthon_property/views/yuthon_property_views.xml
+++ b/yuthon_property/views/yuthon_property_views.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree string="物业管理">
                 <header>
-                    <button name="put_assessment_approval" type="object" string="提交评估申请" class="btn btn-primary"/>
+<!--                    <button name="put_assessment_approval" type="object" string="提交评估申请" class="btn btn-primary"/>-->
                     <button name="put_merge_approval" string="合并" type="object" class="btn btn-primary"/>
                     <button name="put_property_handover" string="物业移交" type="object" class="btn btn-primary"/>
                     <button name="put_declare_approval" type="object" string="提交出租申报" class="btn btn-primary"/>
diff --git a/yuthon_property_approval/models/property_evaluate_application.py b/yuthon_property_approval/models/property_evaluate_application.py
index 4492babfe..7789cb8ef 100644
--- a/yuthon_property_approval/models/property_evaluate_application.py
+++ b/yuthon_property_approval/models/property_evaluate_application.py
@@ -107,7 +107,7 @@ class EvaluateApplicationLine(models.Model):
         domain = [('state', '=', 'to')]
         domain.append(('premises_id', '=', self.premises_id.id))
         if self.property_floor:
-            domain.append(('property_floor', '=', self.property_floor))
+            domain.append(('property_floor_id', '=', self.property_floor_id.id))
         return {
             "name": _("物业"),
             "type": "ir.actions.act_window",
@@ -121,7 +121,7 @@ class EvaluateApplicationLine(models.Model):
         domain = [('state', '=', 'to')]
         domain.append(('premises_id', '=', self.premises_id.id))
         if self.property_floor:
-            domain.append(('property_floor', '=', self.property_floor))
+            domain.append(('property_floor_id', '=', self.property_floor_id.id))
         property_ids = self.env['yuthon.property'].search(domain)
         for property in property_ids:
             property.write({'state': 'ing'})
\ No newline at end of file