From cd38afaa270b94b20da41844c0ffe3dc262d2814 Mon Sep 17 00:00:00 2001
From: yousseftarhri <yousseftarhri@gmail.com>
Date: Thu, 9 Jan 2025 18:39:57 +0100
Subject: [PATCH] merge to version 17

---
 estate/views/estate_property_offer_views.xml |  4 +--
 estate/views/estate_property_views.xml       | 12 ++++----
 estate_account/__manifest__.py               |  1 -
 estate_account/models/estate_property.py     | 32 ++++++++------------
 4 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/estate/views/estate_property_offer_views.xml b/estate/views/estate_property_offer_views.xml
index ed7d8b0..b9f1a55 100644
--- a/estate/views/estate_property_offer_views.xml
+++ b/estate/views/estate_property_offer_views.xml
@@ -23,8 +23,8 @@
                 <field name="partner_id"/>
                 <field name="validity"/>
                 <field name="date_deadline"/>
-                <button name="action_accept" type="object" title="Accept" icon="fa-check" attrs="{'invisible': [('state', '!=', False)]}"/>
-                <button name="action_refuse" type="object" title="Refuse" icon="fa-times" attrs="{'invisible': [('state', '!=', False)]}"/>
+                <button name="action_accept" type="object" title="Accept" icon="fa-check" invisible="state != False"/>
+                <button name="action_refuse" type="object" title="Refuse" icon="fa-times" invisible="state != False"/>
                 <field name="state" invisible="1"/>
             </tree>
         </field>
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
index 40b213c..9aa2095 100644
--- a/estate/views/estate_property_views.xml
+++ b/estate/views/estate_property_views.xml
@@ -7,9 +7,9 @@
         <field name="arch" type="xml">
             <form>
                 <header>
-                    <button name="action_sold" type="object" string="Sold" states="new,offer_received"/>
-                    <button name="action_sold" type="object" string="Sold" states="offer_accepted" class="oe_highlight"/>
-                    <button name="action_cancel" type="object" string="Cancel" states="new,offer_received,offer_accepted"/>
+                    <button name="action_sold" type="object" string="Sold" invisible="state in ('new','offer_received')"/>
+                    <button name="action_sold" type="object" string="Sold" invisible="state in 'offer_accepted'" class="oe_highlight"/>
+                    <button name="action_cancel" type="object" string="Cancel" invisible="state in ('new','offer_received','offer_accepted')"/>
                     <field name="state" widget="statusbar" statusbar_visible="new,offer_received,offer_accepted,sold"/>
                 </header>
                 <sheet>
@@ -41,14 +41,14 @@
                                     <field name="facades"/>
                                     <field name="garage"/>
                                     <field name="garden"/>
-                                    <field name="garden_area" attrs="{'invisible': [('garden', '=', False)]}"/>
-                                    <field name="garden_orientation" attrs="{'invisible': [('garden', '=', False)]}"/>
+                                    <field name="garden_area" invisible="garden == False"/>
+                                    <field name="garden_orientation" invisible="garden == False"/>
                                     <field name="total_area"/>
                                 </group>
                             </group>
                         </page>
                         <page string="Offers">
-                            <field name="offer_ids" attrs="{'readonly': [('state', 'in', ('offer_accepted', 'sold', 'canceled'))]}"/>
+                            <field name="offer_ids" readonly="state in ('offer_accepted', 'sold', 'canceled')"/>
                         </page>
                         <page string="Other Info">
                             <group>
diff --git a/estate_account/__manifest__.py b/estate_account/__manifest__.py
index 51af02a..624d75b 100644
--- a/estate_account/__manifest__.py
+++ b/estate_account/__manifest__.py
@@ -6,5 +6,4 @@
         "estate",
         "account",
     ],
-    "auto_install": True,
 }
diff --git a/estate_account/models/estate_property.py b/estate_account/models/estate_property.py
index 585ed93..c17010d 100644
--- a/estate_account/models/estate_property.py
+++ b/estate_account/models/estate_property.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from odoo import models
+from odoo import models, Command
 
 
 class EstateProperty(models.Model):
@@ -23,25 +23,17 @@ def action_sold(self):
                     "move_type": "out_invoice",
                     "journal_id": journal.id,
                     "invoice_line_ids": [
-                        (
-                            0,
-                            0,
-                            {
-                                "name": prop.name,
-                                "quantity": 1.0,
-                                "price_unit": prop.selling_price * 6.0 / 100.0,
-                            },
-                        ),
-                        (
-                            0,
-                            0,
-                            {
-                                "name": "Administrative fees",
-                                "quantity": 1.0,
-                                "price_unit": 100.0,
-                            },
-                        ),
+                        Command.create({
+                            "name": prop.name,
+                            "quantity": 1.0,
+                            "price_unit": prop.selling_price * 6.0 / 100.0,
+                        }),
+                        Command.create({
+                            "name": "Administrative fees",
+                            "quantity": 1.0,
+                            "price_unit": 100.0,
+                        }),
                     ],
                 }
             )
-        return res
+        return res
\ No newline at end of file