[CLN] estate: cleaned the code

Author: Mohamed-Khaled308

.idea/workspace.xml

@@ -11,7 +11,7 @@
         'views/estate_property_offer_views.xml',
         'views/estate_property_type_views.xml',
         'views/estate_property_tag_views.xml',
-        'views/user_with_properties_views.xml',
+        'views/res_users_views.xml',
         'views/estate_menus.xml'
     ],
     'application': True,

estate/__manifest__.py

@@ -2,4 +2,4 @@
 from . import estate_property_type
 from . import estate_property_tag
 from . import estate_property_offer
-from . import user_with_properties
+from . import res_users

estate/models/__init__.py

@@ -76,26 +76,22 @@ def _compute_best_price(self):
 
     @api.onchange('garden')
     def _onchange_garden(self):
-        if self.garden:
-            self.garden_area = 10
-            self.garden_orientation = "north"
-        else:
-            self.garden_area = False
-            self.garden_orientation = ""
+        self.garden_area = 10 if self.garden else 0
+        self.garden_orientation = 'north' if self.garden else ''
 
     @api.ondelete(at_uninstall=False)
     def _unlink_if_new_or_cancelled_state(self):
-        if any(not (property.state == 'new' or property.state == 'cancelled') for property in self):
+        if any(not (prop.state == 'new' or prop.state == 'cancelled') for prop in self):
             raise UserError("You can only delete new or cancelled properties")
 
-    def action_mark_sold(self):
+    def action_sold(self):
         for prop in self:
             if prop.state == "cancelled":
                 raise UserError("You cannot sell a cancelled property")
             prop.state = "sold"
         return True
 
-    def action_mark_cancel(self):
+    def action_cancel(self):
         for prop in self:
             if prop.state == "sold":
                 raise UserError("You cannot cancel a sold property")

estate/models/estate_property.py

@@ -1,7 +1,7 @@
 from odoo import models, fields
 
 
-class UserWithProperties(models.Model):
+class ResUsers(models.Model):
     _inherit = 'res.users'
     _description = 'user with properties model'
 

estate/models/user_with_properties.py renamed to estate/models/res_users.py

@@ -1,14 +1,45 @@
 <?xml version="1.0"?>
 <odoo>
-    <menuitem id="estate_property_root_menu" name="Real Estate">
-        <menuitem id="estate_property_advertisements" name="Advertisements" sequence="1">
-            <menuitem id="estate_property_menu" name="Properties" action="estate_property_action"/>
-        </menuitem>
-        <menuitem id="estate_property_settings" name="Settings" sequence="2">
-            <menuitem id="estate_property_type_menu" name="Property Types" action="estate_property_type_action"
-                      sequence="1"/>
-            <menuitem id="estate_property_tag_menu" name="Property Tags" action="estate_property_tag_action"
-                      sequence="2"/>
-        </menuitem>
-    </menuitem>
+    <menuitem
+            id="estate_property_menu_root"
+            name="Real Estate"
+    />
+
+    <menuitem
+            id="estate_property_menu_advertisements"
+            name="Advertisements"
+            parent="estate_property_menu_root"
+            sequence="1"
+    />
+
+    <menuitem
+            id="estate_property_menu_properties"
+            name="Properties"
+            parent="estate_property_menu_advertisements"
+            action="estate_property_action"
+            sequence="1"
+    />
+
+    <menuitem
+            id="estate_property_menu_settings"
+            name="Settings"
+            parent="estate_property_menu_root"
+            sequence="2"
+    />
+
+    <menuitem
+            id="estate_property_menu_property_type"
+            name="Property Types"
+            parent="estate_property_menu_settings"
+            action="estate_property_type_action"
+            sequence="1"
+    />
+
+    <menuitem
+            id="estate_property_menu_property_tag"
+            name="Property Tags"
+            parent="estate_property_menu_settings"
+            action="estate_property_tag_action"
+            sequence="2"
+    />
 </odoo>

estate/views/estate_menus.xml

@@ -7,7 +7,7 @@
             <form string="Property types">
                 <header>
                     <button type="action" name="%(estate_property_offer_action)d" string="Offers"
-                        class="oe_stat_button" icon="fa-star"></button>
+                            class="oe_stat_button" icon="fa-star"/>
                 </header>
                 <sheet>
                     <div>

estate/views/estate_property_type_views.xml

@@ -26,9 +26,9 @@
         <field name="arch" type="xml">
             <form string="Properties">
                 <header>
-                    <button name="action_mark_sold" type="object" string="SOLD"
+                    <button name="action_sold" type="object" string="SOLD"
                             invisible="state == 'sold' or state == 'cancelled'"/>
-                    <button name="action_mark_cancel" type="object" string="CANCEL"
+                    <button name="action_cancel" type="object" string="CANCEL"
                             invisible="state == 'sold' or state == 'cancelled'"/>
                     <field name="state" widget="statusbar" statusbar_visible="new,offer_received,offer_accepted,sold"/>
                 </header>
@@ -113,7 +113,11 @@
                 <templates>
                     <t t-name="card">
                         <div>
-                            <field name="name"/>
+                            <div>
+                                <h1>
+                                    <field name="name"/>
+                                </h1>
+                            </div>
                             <div>Expected Price:
                                 <field name="expected_price"/>
                             </div>
@@ -125,7 +129,10 @@
                                 Selling Price:
                                 <field name="selling_price"/>
                             </div>
-                            <field name="property_tag_ids" string="Property Tags" widget="many2many_tags" options="{'color_field': 'color'}"/>
+                            <div>
+                                <field name="property_tag_ids" string="Property Tags" widget="many2many_tags"
+                                       options="{'color_field': 'color'}"/>
+                            </div>
                         </div>
                     </t>
                 </templates>

estate/views/estate_property_views.xml

@@ -1,6 +1,6 @@
 <odoo>
-    <record id="user_with_properties_view_list" model="ir.ui.view">
-        <field name="name">user.with.properties.list</field>
+    <record id="view_users_form" model="ir.ui.view">
+        <field name="name">res.users.view.form.inherit.estate</field>
         <field name="model">res.users</field>
         <field name="inherit_id" ref="base.view_users_form"/>
         <field name="arch" type="xml">

estate/views/user_with_properties_views.xml renamed to estate/views/res_users_views.xml

@@ -4,7 +4,8 @@
 class EstateProperty(models.Model):
     _inherit = "estate.property"
 
-    def action_mark_sold(self):
+    def action_sold(self):
+        super().action_sold()
         for prop in self:
             self.env['account.move'].sudo().create(
                 {
@@ -24,4 +25,3 @@ def action_mark_sold(self):
                     ]
                 }
             )
-        return super().action_mark_sold()