Skip to content

Commit 629a455

Browse files
committed
[IMP] estate: applied some coding guidelines to model names and views
1 parent c9347e8 commit 629a455

File tree

7 files changed

+28
-27
lines changed

7 files changed

+28
-27
lines changed

estate/models/estate_property.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,6 @@ def _compute_best_offer(self):
5757
prices = property.offer_ids.mapped('price')
5858
property.best_offer = max(prices, default=0.0)
5959

60-
@api.onchange('garden')
61-
def _onchange_garden(self):
62-
if (self.garden):
63-
self.garden_area = 10
64-
self.garden_orientation = 'North'
65-
else:
66-
self.garden_area = 0
67-
self.garden_orientation = ''
68-
6960
def action_sold(self):
7061
if (self.state != "Cancelled"):
7162
self.state = "Sold"
@@ -80,6 +71,15 @@ def action_cancel(self):
8071
raise UserError("A sold property can not be cancelled")
8172
return True
8273

74+
@api.onchange('garden')
75+
def _onchange_garden(self):
76+
if (self.garden):
77+
self.garden_area = 10
78+
self.garden_orientation = 'North'
79+
else:
80+
self.garden_area = 0
81+
self.garden_orientation = ''
82+
8383
@api.ondelete(at_uninstall=False)
8484
def _unlink_property(self):
8585
for property in self:

estate/models/estate_property_offer.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ class EstatePropertyOffer(models.Model):
1414
status = fields.Selection(
1515
string='status',
1616
selection=[('Accepted', 'Accepted'), ('Refused', 'Refused')],
17-
copy=False)
17+
copy=False
18+
)
1819
validity = fields.Integer(default=7)
1920
date_deadline = fields.Date(compute="_compute_date_deadline", inverse="_inverse_date_deadline")
2021
partner_id = fields.Many2one("res.partner", string="partner", required=True)
@@ -60,13 +61,13 @@ def _check_price_validity(self):
6061
@api.model_create_multi
6162
def create(self, vals_list):
6263
property_ids = [property['property_id'] for property in vals_list]
63-
property_objs = self.env['estate.property'].browse(property_ids)
64-
for property_obj in property_objs:
65-
if (property_obj.offer_ids):
66-
curr_lowest_offer = min(property_obj.offer_ids.mapped('price'))
64+
Properties = self.env['estate.property'].browse(property_ids)
65+
for Property in Properties:
66+
if (Property.offer_ids):
67+
curr_lowest_offer = min(Property.offer_ids.mapped('price'))
6768
if float_compare(vals_list[0]['price'], curr_lowest_offer, 2) < 0:
6869
raise ValidationError("Offered price must be higher than already existing offers")
6970

70-
if not property_obj.offer_ids:
71-
property_obj.state = 'Offer Received'
71+
if not Property.offer_ids:
72+
Property.state = 'Offer Received'
7273
return super().create(vals_list)

estate/models/res_users_child.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from odoo import fields, models
22

33

4-
class resUsersChild(models.Model):
4+
class ResUsersChild(models.Model):
55
_inherit = 'res.users'
66

77
property_ids = fields.One2many('estate.property', 'salesperson_id', string="sales person", domain="[('state', 'in', ['New', 'Offer Received'])]")

estate/views/estate_property_menu_views.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<odoo>
3-
<menuitem id="test_menu_root" name="Estate">
4-
<menuitem id="test_first_level_menu" name="ADs">
3+
<menuitem id="estate_property_menu_root" name="Estate">
4+
<menuitem id="estate_property_menu_properties" name="ADs">
55
<menuitem id="estate_property_menu_action" action="estate_property_action"/>
66
</menuitem>
7-
<menuitem id="test_first_level_menu2" name="Settings">
8-
<menuitem id="estate_property_menu_action_3" action="estate_property_type_action"/>
7+
<menuitem id="estate_property_menu_settings" name="Settings">
8+
<menuitem id="estate_property_type_menu_action" action="estate_property_type_action"/>
99
<menuitem id="estate_property_tag_menu_action" action="estate_property_tag_action"/>
1010
</menuitem>
1111
</menuitem>

estate/views/estate_property_views.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<field name="context">{'search_default_state': True}</field>
99
</record>
1010

11-
<record id="estate_property_new_view_search" model="ir.ui.view">
11+
<record id="estate_property_view_search" model="ir.ui.view">
1212
<field name="name">estate.property.view.search</field>
1313
<field name="model">estate.property</field>
1414
<field name="arch" type="xml">
@@ -28,7 +28,7 @@
2828
</record>
2929

3030
<record id="estate_property_view_list" model="ir.ui.view">
31-
<field name="name">estate.property.list</field>
31+
<field name="name">estate.property.view.list</field>
3232
<field name="model">estate.property</field>
3333
<field name="arch" type="xml">
3434
<list string="Channel" decoration-success="state in ['Offer Received', 'Offer Accepted']" decoration-bf="state in ['Offer Accepted']" decoration-muted="state in ['Sold']">
@@ -46,7 +46,7 @@
4646
</record>
4747

4848
<record id="estate_property_view_form" model="ir.ui.view">
49-
<field name="name">estate.property.form</field>
49+
<field name="name">estate.property.view.form</field>
5050
<field name="model">estate.property</field>
5151
<field name="arch" type="xml">
5252
<form string="Test">
@@ -103,7 +103,7 @@
103103
</record>
104104

105105
<record id="estate_property_view_kanban" model="ir.ui.view">
106-
<field name="name">estate.property.kanban</field>
106+
<field name="name">estate.property.view.kanban</field>
107107
<field name="model">estate.property</field>
108108
<field name="arch" type="xml">
109109
<kanban default_group_by="type_id" records_draggable="false">

estate/views/res_users_child_views.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<odoo>
33
<data>
44
<record id="res_users_view_form" model="ir.ui.view">
5-
<field name="name">res.users.view.form.inherit.form</field>
5+
<field name="name">res.users.view.form.inherit.res.users.child</field>
66
<field name="model">res.users</field>
77
<field name="inherit_id" ref="base.view_users_form"/>
88
<field name="arch" type="xml">

estate_account/models/estate_property_child.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from odoo.exceptions import UserError
33

44

5-
class estatePropertyChild(models.Model):
5+
class EstatePropertyChild(models.Model):
66
_inherit = 'estate.property'
77

88
def _get_default_journal(self):

0 commit comments

Comments
 (0)