Skip to content

Commit fb58afd

Browse files
committed
[FIX] estate: PR review adjustments
1 parent cad2ef0 commit fb58afd

File tree

3 files changed

+19
-26
lines changed

3 files changed

+19
-26
lines changed

estate/models/estate_property.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from odoo import fields, models, api
1+
from odoo import fields, models, api, _
22
from odoo.exceptions import UserError, ValidationError
33
from odoo.tools import float_is_zero, float_compare
44

@@ -63,17 +63,15 @@ def _onchange_garden(self):
6363
self.garden_orientation = ""
6464

6565
def action_property_sold(self):
66-
for record in self:
67-
if record.state == "cancelled":
68-
raise UserError("Cancelled properties cannot be sold.")
69-
record.state = "sold"
66+
if self.filtered(lambda x: x.state == "cancelled"):
67+
raise UserError(_("Cancelled properties cannot be sold."))
68+
self.state = "sold"
7069
return True
7170

7271
def action_property_cancel(self):
73-
for record in self:
74-
if record.state == "sold":
75-
raise UserError("Sold properties cannot be cancelled.")
76-
record.state = "cancelled"
72+
if self.filtered(lambda x: x.state == "sold"):
73+
raise UserError(_("Sold properties cannot be cancelled."))
74+
self.state = "cancelled"
7775
return True
7876

7977
_positive_expected_price = models.Constraint(
@@ -86,4 +84,4 @@ def action_property_cancel(self):
8684
def _check_ninety_percent(self):
8785
for record in self:
8886
if not float_is_zero(record.selling_price, 2) and float_compare(record.expected_price * 0.9, record.selling_price, 2) == 1:
89-
raise ValidationError("The selling price must be at least 90% of the expected price! You must reduce the expected price if you want to accept this offer.")
87+
raise ValidationError(_("The selling price must be at least 90% of the expected price! You must reduce the expected price if you want to accept this offer."))

estate/models/estate_property_offer.py

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class EstatePropertyOffer(models.Model):
1212
selection=[("accepted", "Accepted"), ("refused", "Refused")],
1313
copy=False,
1414
)
15-
partner_id = fields.Many2one("res.partner", string="Buyer", required=True)
15+
partner_id = fields.Many2one("res.partner", string="Buyer", required=True)
1616
property_id = fields.Many2one("estate.property", required=True)
1717
validity = fields.Integer(string="Validity (days)", default=7)
1818
date_deadline = fields.Date(string="Deadline", compute="_compute_date_deadline", inverse="_inverse_date_deadline")
@@ -28,23 +28,18 @@ def _inverse_date_deadline(self):
2828
record.validity = (record.date_deadline - record.create_date.date()).days
2929

3030
def action_accept_offer(self):
31-
for record in self:
32-
if record.property_id.state not in ("accepted", "sold", "cancelled"):
33-
record.property_id.state = "accepted"
34-
record.status = "accepted"
35-
record.property_id.selling_price = self.price
36-
record.property_id.buyer_id = self.partner_id
37-
else:
38-
raise UserError(_("This offer can't be accepted because the property is currently %s.")% record.property_id.state)
31+
if self.filtered(lambda x: x.property_id.state in ("accepted", "sold", "cancelled")):
32+
raise UserError(_("This offer can't be accepted because the property is currently %s.", self.property_id.state))
33+
34+
self.status = "accepted"
35+
self.property_id.state = "accepted"
36+
self.property_id.selling_price = self.price
37+
self.property_id.buyer_id = self.partner_id
38+
3939
return True
4040

4141
def action_refuse_offer(self):
42-
for record in self:
43-
if record.status == "accepted":
44-
record.property_id.state = "new"
45-
record.property_id.selling_price = 0.0
46-
record.property_id.buyer_id = ""
47-
record.status = "refused"
42+
self.status = "refused"
4843
return True
4944

5045
_positive_offer_price = models.Constraint(

estate/security/ir.model.access.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
22
access_estate_property_user,access_estate_property_user,model_estate_property,base.group_user,1,1,1,1
33
access_estate_property_type_user,access_estate_property_type_user,model_estate_property_type,base.group_user,1,1,1,1
44
access_estate_property_tag_user,access_estate_property_tag_user,model_estate_property_tag,base.group_user,1,1,1,1
5-
access_estate_property_offer_user,access_estate_property_offer_user,model_estate_property_offer,base.group_user,1,1,1,1
5+
access_estate_property_offer_user,access_estate_property_offer_user,model_estate_property_offer,base.group_user,1,1,1,1

0 commit comments

Comments
 (0)