Skip to content

Commit e4bb062

Browse files
[CLN] Module: Estate, Estate_accounting
Description: 1. cleaning code to follow odoo's convention 2. addressing nit left by the PR reviewer
1 parent 2035786 commit e4bb062

File tree

8 files changed

+39
-51
lines changed

8 files changed

+39
-51
lines changed

estate/models/building.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
from datetime import timedelta
2+
13
from odoo import models, fields, api
24
from odoo.exceptions import UserError
3-
from datetime import timedelta
45

56

67
class Building(models.Model):
7-
_name = "estate.buildings"
8-
_description = "Buildings"
8+
_name = 'estate.building'
9+
_description = 'Buildings'
910
_order = "id desc"
1011

1112
name = fields.Char()
@@ -39,7 +40,7 @@ class Building(models.Model):
3940
"res.users", string="Salesperson", default=lambda self: self.env.user
4041
)
4142
tag_ids = fields.Many2many("estate.building_tags", string="Tags")
42-
offer_ids = fields.One2many("estate.offers", "building_id", string="Offers")
43+
offer_ids = fields.One2many("estate.offer", "building_id", string="Offers")
4344

4445
total_area = fields.Integer(string="Total Area", compute="_compute_total_area")
4546

estate/models/building_type.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33

44
class BuildingType(models.Model):
5-
_name = "estate.building_type"
6-
_description = "Building Type"
5+
_name = 'estate.building_type'
6+
_description = 'Building Type'
77
_order = "sequence, name"
88

99
name = fields.Char(required=True)
1010
building_ids = fields.One2many(
11-
"estate.buildings", "building_type_id", string="Buildings"
11+
"estate.building", "building_type_id", string="Buildings"
1212
)
13-
offer_ids = fields.One2many("estate.offers", "property_type_id", string="Offers")
13+
offer_ids = fields.One2many("estate.offer", "property_type_id", string="Offers")
1414
offers_count = fields.Integer(
1515
string="Offers Count",
1616
compute="_compute_offers_count",
@@ -27,6 +27,6 @@ class BuildingType(models.Model):
2727

2828
def _compute_offers_count(self):
2929
for record in self:
30-
record.offers_count = self.env["estate.offers"].search_count(
30+
record.offers_count = self.env["estate.offer"].search_count(
3131
[("property_type_id", "=", record.id)]
3232
)

estate/models/offer.py

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1+
from datetime import timedelta
2+
13
from odoo import models, fields, api
24
from odoo.exceptions import UserError
3-
from datetime import timedelta
45
from odoo.tools.float_utils import float_compare
56

67

78
class Offer(models.Model):
8-
_name = "estate.offers"
9-
_description = "Offers"
9+
_name = 'estate.offer'
10+
_description = 'Offers'
1011
_order = "price desc"
1112

1213
price = fields.Integer(required=True)
@@ -15,7 +16,7 @@ class Offer(models.Model):
1516
string="Status",
1617
required=False,
1718
)
18-
building_id = fields.Many2one("estate.buildings", string="Building")
19+
building_id = fields.Many2one("estate.building", string="Building")
1920
partner_id = fields.Many2one("res.partner", string="Partner")
2021
validity = fields.Integer(string="Validity (days)", default=7)
2122
date_deadline = fields.Date(
@@ -42,10 +43,7 @@ def _inverse_date_deadline(self):
4243

4344
def action_accept_offer(self):
4445
for record in self:
45-
if record.status != "accepted" and record.building_id.state not in [
46-
"sold",
47-
"canceled",
48-
]:
46+
if record.status != "accepted" and record.building_id.state not in ["sold", "canceled"]:
4947
record.status = "accepted"
5048
record.building_id.state = "offer_accepted"
5149
record.building_id.buyer_id = record.partner_id
@@ -58,9 +56,7 @@ def action_accept_offer(self):
5856
)
5957
other_offers.write({"status": "refused"})
6058
elif record.building_id.state in ["sold", "canceled"]:
61-
raise UserError(
62-
self.env._("Cannot accept offers for sold or canceled buildings.")
63-
)
59+
raise UserError(self.env._("Cannot accept offers for sold or canceled buildings."))
6460
else:
6561
raise UserError(self.env._("Offer is already accepted."))
6662

@@ -76,22 +72,13 @@ def action_refuse_offer(self):
7672
@api.constrains("building_id", "price")
7773
def _check_price(self):
7874
for record in self:
79-
if (
80-
float_compare(
81-
0.9 * record.building_id.value, record.price, precision_digits=2
82-
)
83-
== 1
84-
):
85-
raise UserError(
86-
self.env._(
87-
"Offer price must be at least 90% of the building's value."
88-
)
89-
)
75+
if float_compare(0.9 * record.building_id.value, record.price, precision_digits=2) > 0:
76+
raise UserError(self.env._("Offer price must be at least 90% of the building's value."))
9077

9178
@api.model
9279
def create(self, vals):
9380
for val in vals:
94-
self.env["estate.buildings"].browse(
81+
self.env["estate.building"].browse(
9582
val["building_id"]
9683
).state = "offer_received"
9784
return super().create(vals)

estate/models/salesperson.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33

44
class ResUsers(models.Model):
5-
_inherit = ["res.users"]
5+
_name = 'res.users'
6+
_inherit = ['res.users']
67

7-
building = fields.One2many("estate.buildings", "salesperson_id", string="Listings")
8+
building = fields.One2many("estate.building", "salesperson_id", string="Listings")

estate/models/tag.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33

44
class BuildingTag(models.Model):
5-
_name = "estate.building_tags"
6-
_description = "Building Tags"
5+
_name = 'estate.building_tags'
6+
_description = 'Building Tags'
77
_order = "name"
88

99
name = fields.Char(required=True)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
2-
access_first_model,access_first_model,model_estate_buildings,base.group_user,1,1,1,1
2+
access_first_model,access_first_model,model_estate_building,base.group_user,1,1,1,1
33
access_building_type_model,access_building_type_model,model_estate_building_type,base.group_user,1,1,1,1
44
access_building_tags_model,access_building_tags_model,model_estate_building_tags,base.group_user,1,1,1,1
5-
access_offers_model,access_offers_model,model_estate_offers,base.group_user,1,1,1,1
5+
access_offers_model,access_offers_model,model_estate_offer,base.group_user,1,1,1,1

estate/views/views.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<odoo>
33
<record id="some_model_action_1" model="ir.actions.act_window">
44
<field name="name">Buildings</field>
5-
<field name="res_model">estate.buildings</field>
5+
<field name="res_model">estate.building</field>
66
<field name="view_mode">list,form,kanban</field>
77
<field name="context">{'search_default_Available': True}</field>
88
</record>
@@ -15,14 +15,14 @@
1515

1616
<record id="some_model_action_3" model="ir.actions.act_window">
1717
<field name="name">Offers</field>
18-
<field name="res_model">estate.offers</field>
18+
<field name="res_model">estate.offer</field>
1919
<field name="view_mode">list</field>
2020
<field name="domain">[('property_type_id', '=', active_id)]</field>
2121
</record>
2222

2323
<record id="list_view_" model="ir.ui.view">
24-
<field name="name">estate.buildings.list</field>
25-
<field name="model">estate.buildings</field>
24+
<field name="name">estate.building.list</field>
25+
<field name="model">estate.building</field>
2626
<field name="arch" type="xml">
2727
<list string="test_list" decoration-success="state in ('offer_received', 'offer_accepted')" decoration-bf="state=='offer_accepted'" decoration-muted="state=='sold'">
2828
<field name="name"/>
@@ -36,8 +36,8 @@
3636
</record>
3737

3838
<record id="first_form_view" model="ir.ui.view">
39-
<field name="name">estate.buildings.form</field>
40-
<field name="model">estate.buildings</field>
39+
<field name="name">estate.building.form</field>
40+
<field name="model">estate.building</field>
4141
<field name="arch" type="xml">
4242
<form string="Test">
4343
<header>
@@ -98,8 +98,8 @@
9898
</record>
9999

100100
<record id="first_search_view" model="ir.ui.view">
101-
<field name="name">estate.buildings.search</field>
102-
<field name="model">estate.buildings</field>
101+
<field name="name">estate.building.search</field>
102+
<field name="model">estate.building</field>
103103
<field name="arch" type="xml">
104104
<search string="test_search">
105105
<field name="name"/>
@@ -170,8 +170,8 @@
170170
</field>
171171
</record>
172172
<record id="kanban_1" model="ir.ui.view">
173-
<field name="name">estate.buildings.kanban</field>
174-
<field name="model">estate.buildings</field>
173+
<field name="name">estate.building.kanban</field>
174+
<field name="model">estate.building</field>
175175
<field name="arch" type="xml">
176176
<kanban default_group_by="building_type_id">
177177
<template>

estate_accounting/models/estate_account.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33

44
class estateAccount(models.Model):
5-
_inherit = "estate.buildings"
5+
_inherit = "estate.building"
66

77
def action_set_sold(self):
8-
print("\n\n\n", self.buyer_id.id, "\n\n\n")
9-
account_move = self.env["account.move"].create(
8+
self.env["account.move"].create(
109
{
1110
"partner_id": self.buyer_id.id,
1211
"move_type": "out_invoice",

0 commit comments

Comments
 (0)