diff --git a/.gitignore b/.gitignore index 6f064674a33..31582eed5f6 100755 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ install/win32/meta.py /man/ /share/ /src/ +# Ignore Markdown files +*.md diff --git a/README.md b/README.md deleted file mode 100644 index 29e1a840775..00000000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# Odoo 16.0 - Technical Training - -The Technical Training of Odoo 16.0 is available on the -[Tutorial](https://www.odoo.com/documentation/master/developer/howtos/rdtraining.html) diff --git a/estate/__manifest__.py b/estate/__manifest__.py index d7cfa57d4c5..d03bcb8ecf5 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -1,11 +1,25 @@ { - "name": "Estate", # The name that will appear in the App list - "version": "16.0.0", # Version - "application": True, # This line says the module is an App, and not a module - "depends": ["base"], # dependencies + "name": "Estate", + "version": "18.0.1.0.0", + "application": True, + "depends": ["base"], "data": [ + # Security files first + "security/ir.model.access.csv", + # Data files in dependency order + # "data/estate_property_type_data.xml", # Base data first + # "data/estate_property_tag_data.xml", # Independent data + # "data/estate_property_offer_data.xml", # Depends on property types + + # Views and menus last + "views/estate_property_views.xml", + "views/estate_property_offer_views.xml", + "views/estate_property_type_views.xml", + "views/estate_property_tag_views.xml", + "views/res_users_views.xml", + "views/estate_menus.xml", ], "installable": True, - 'license': 'LGPL-3', + "license": "LGPL-3", } diff --git a/estate/models.py b/estate/models.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/estate/models/__init__.py b/estate/models/__init__.py new file mode 100644 index 00000000000..9a2189b6382 --- /dev/null +++ b/estate/models/__init__.py @@ -0,0 +1,5 @@ +from . import estate_property +from . import estate_property_type +from . import estate_property_tag +from . import estate_property_offer +from . import res_users diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py new file mode 100644 index 00000000000..e9916b16073 --- /dev/null +++ b/estate/models/estate_property.py @@ -0,0 +1,180 @@ +from odoo import api, fields, models +from odoo.exceptions import UserError, ValidationError +from odoo.tools.float_utils import float_compare, float_is_zero + +class EstateProperty(models.Model): + _name = "estate.property" + _description = "Estate Property" + _order = "id desc" + + # Basic fields + name = fields.Char(string="Title", required=True) + description = fields.Text(string="Description") + postcode = fields.Char(string="Postcode") + date_availability = fields.Date( + string="Available From", + copy=False, + default=lambda self: fields.Date.add(fields.Date.today(), months=3), + ) + expected_price = fields.Float(string="Expected Price", required=True) + selling_price = fields.Float(string="Selling Price", readonly=True, copy=False) + bedrooms = fields.Integer(string="Bedrooms", default=2) + living_area = fields.Integer(string="Living Area (sqm)") + facades = fields.Integer(string="Facades") + garage = fields.Boolean(string="Garage") + garden = fields.Boolean(string="Garden") + garden_area = fields.Integer(string="Garden Area (sqm)") + garden_orientation = fields.Selection( + selection=[ + ('north', 'North'), + ('south', 'South'), + ('east', 'East'), + ('west', 'West') + ], + string="Garden Orientation" + ) + + # Reserved/common fields + active = fields.Boolean(string="Active", default=True) + state = fields.Selection( + selection=[ + ("new", "New"), + ("offer_received", "Offer Received"), + ("offer_accepted", "Offer Accepted"), + ("sold", "Sold"), + ("cancelled", "Cancelled"), + ], + string="Status", + required=True, + copy=False, + default="new", + ) + + # Relations + property_type_id = fields.Many2one( + comodel_name="estate.property.type", + string="Property Type", + ) + + # Parties + salesman_id = fields.Many2one( + comodel_name="res.users", + string="Salesman", + default=lambda self: self.env.user, + ) + buyer_id = fields.Many2one( + comodel_name="res.partner", + string="Buyer", + copy=False, + ) + + tag_ids = fields.Many2many( + comodel_name="estate.property.tag", + string="Tags", + ) + + offer_ids = fields.One2many( + comodel_name="estate.property.offer", + inverse_name="property_id", + string="Offers", + ) + + # SQL constraints + _sql_constraints = [ + ( + "expected_price_strictly_positive", + "CHECK(expected_price > 0)", + "The expected price must be strictly positive.", + ), + ( + "selling_price_positive", + "CHECK(selling_price >= 0)", + "The selling price must be positive.", + ), + ] + + # Computed fields + total_area = fields.Integer( + string="Total Area (sqm)", + compute="_compute_total_area", + store=False, + ) + best_price = fields.Float( + string="Best Offer", + compute="_compute_best_price", + store=False, + ) + + @api.depends("living_area", "garden_area") + def _compute_total_area(self) -> None: + for property in self: + living = property.living_area or 0 + garden = property.garden_area or 0 + property.total_area = living + garden + + @api.depends("offer_ids.price") + def _compute_best_price(self) -> None: + for property in self: + prices = property.offer_ids.mapped("price") + property.best_price = max(prices) if prices else 0.0 + + @api.onchange("garden") + def _onchange_garden(self) -> None: + if self.garden: + self.garden_area = 10 + self.garden_orientation = "north" + else: + self.garden_area = 0 + self.garden_orientation = False + + # CRUD methods (ORM overrides) + @api.ondelete(at_uninstall=False) + def _unlink_if_allowed(self): + for property in self: + if property.state not in ("new", "cancelled"): + raise UserError("You can only delete properties in New or Cancelled state. Consider archiving instead.") + # clean up children explicitly to avoid FK issues + self.mapped("offer_ids").unlink() + + # Python-level validation for clearer errors in the UI + @api.constrains("expected_price") + def _check_expected_price_positive(self): + for property in self: + if property.expected_price is not None and property.expected_price <= 0: + raise ValidationError("The expected price must be strictly positive.") + + @api.constrains("selling_price") + def _check_selling_price_non_negative(self): + for property in self: + if property.selling_price is not None and property.selling_price < 0: + raise ValidationError("The selling price must be positive.") + + @api.constrains("selling_price", "expected_price") + def _check_selling_price_threshold(self): + precision = 2 + for property in self: + # Skip if no selling price yet + if property.selling_price is None or float_is_zero(property.selling_price, precision_digits=precision): + continue + # Require a valid expected price to compare against + if property.expected_price is None or not float_compare(property.expected_price, 0.0, precision_digits=precision) == 1: + # expected price not set/invalid; other constraints will catch it + continue + min_allowed = property.expected_price * 0.9 + if float_compare(property.selling_price, min_allowed, precision_digits=precision) == -1: + raise ValidationError("The selling price cannot be lower than 90% of the expected price.") + + # Action methods + def action_cancel(self): + self.ensure_one() + if self.state == "sold": + raise UserError("A sold property cannot be cancelled.") + self.state = "cancelled" + return True + + def action_set_sold(self): + self.ensure_one() + if self.state == "cancelled": + raise UserError("A cancelled property cannot be sold.") + self.state = "sold" + return True \ No newline at end of file diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py new file mode 100644 index 00000000000..132bf6a3a18 --- /dev/null +++ b/estate/models/estate_property_offer.py @@ -0,0 +1,112 @@ +from odoo import models, fields, api +from odoo.exceptions import UserError +from datetime import date, timedelta + + +class EstatePropertyOffer(models.Model): + _name = "estate.property.offer" + _description = "Estate Property Offer" + _order = "price desc" + + price = fields.Float(string="Price") + status = fields.Selection( + selection=[("accepted", "Accepted"), ("refused", "Refused")], + string="Status", + copy=False, + ) + partner_id = fields.Many2one("res.partner", string="Partner", required=True) + property_id = fields.Many2one( + "estate.property", + string="Property", + required=True, + ondelete="cascade", + ) + property_type_id = fields.Many2one( + comodel_name="estate.property.type", + string="Property Type", + related="property_id.property_type_id", + store=True, + ) + + validity = fields.Integer(string="Validity (days)", default=7) + date_deadline = fields.Date(string="Deadline", compute="_compute_date_deadline", inverse="_inverse_date_deadline", store=False) + + @api.depends("validity", "create_date") + def _compute_date_deadline(self) -> None: + for offer in self: + created = (offer.create_date or fields.Datetime.now()) + base_date = created.date() + offer.date_deadline = base_date + timedelta(days=offer.validity or 0) + + def _inverse_date_deadline(self) -> None: + for offer in self: + created = (offer.create_date or fields.Datetime.now()) + base_date = created.date() + if offer.date_deadline: + delta = offer.date_deadline - base_date + offer.validity = max(delta.days, 0) + + # Make the form reactive while editing (no need to wait for save) + @api.onchange("validity") + def _onchange_validity(self): + for offer in self: + created = (offer.create_date or fields.Datetime.now()) + base_date = created.date() + offer.date_deadline = base_date + timedelta(days=offer.validity or 0) + + @api.onchange("date_deadline") + def _onchange_date_deadline(self): + for offer in self: + if offer.date_deadline: + created = (offer.create_date or fields.Datetime.now()) + base_date = created.date() + delta = offer.date_deadline - base_date + offer.validity = max(delta.days, 0) + + # Actions on offers + def action_accept(self): + for offer in self: + if offer.property_id.state == "sold": + raise UserError("Cannot accept an offer on a sold property.") + # set other offers to refused + siblings = offer.property_id.offer_ids - offer + siblings.write({"status": "refused"}) + offer.status = "accepted" + offer.property_id.write({ + "buyer_id": offer.partner_id.id, + "selling_price": offer.price, + "state": "offer_accepted", + }) + return True + + def action_refuse(self): + self.status = "refused" + return True + + # SQL constraints + _sql_constraints = [ + ( + "offer_price_strictly_positive", + "CHECK(price > 0)", + "The offer price must be strictly positive.", + ), + ] + + # When an offer is created, mark the property as having an offer + @api.model_create_multi + def create(self, vals_list): + # Business rule: price must be strictly higher than any existing offer on the property + props = self.env["estate.property"] + for vals in vals_list: + property_id = vals.get("property_id") + if property_id: + prop = self.env["estate.property"].browse(property_id) + props |= prop + existing_max = max(prop.offer_ids.mapped("price") or [0.0]) + if vals.get("price") is not None and vals["price"] <= existing_max: + raise UserError("Offer must be higher than all existing offers for this property.") + + records = super().create(vals_list) + # Set property state to Offer Received for affected properties + props.filtered(lambda p: p.state == "new").state = "offer_received" + return records diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py new file mode 100644 index 00000000000..bcfb0e275ff --- /dev/null +++ b/estate/models/estate_property_tag.py @@ -0,0 +1,14 @@ +from odoo import models, fields + + +class EstatePropertyTag(models.Model): + _name = "estate.property.tag" + _description = "Estate Property Tag" + _order = "name" + + name = fields.Char(string="Name", required=True) + color = fields.Integer(string="Color") + + _sql_constraints = [ + ("estate_property_tag_name_uniq", "unique(name)", "Property tag name must be unique."), + ] diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py new file mode 100644 index 00000000000..305303e2089 --- /dev/null +++ b/estate/models/estate_property_type.py @@ -0,0 +1,33 @@ +from odoo import models, fields + + +class EstatePropertyType(models.Model): + _name = "estate.property.type" + _description = "Estate Property Type" + _order = "sequence, name" + + name = fields.Char(string="Name", required=True) + sequence = fields.Integer(string="Sequence", default=10) + + _sql_constraints = [ + ("estate_property_type_name_uniq", "unique(name)", "Property type name must be unique."), + ] + + # Inline list: related properties + property_ids = fields.One2many( + comodel_name="estate.property", + inverse_name="property_type_id", + string="Properties", + ) + + offer_ids = fields.One2many( + comodel_name="estate.property.offer", + inverse_name="property_type_id", + string="Offers", + ) + offer_count = fields.Integer(string="Offers", compute="_compute_offer_count") + + def _compute_offer_count(self): + for rec in self: + rec.offer_count = len(rec.offer_ids) + diff --git a/estate/models/res_users.py b/estate/models/res_users.py new file mode 100644 index 00000000000..6d58b009f61 --- /dev/null +++ b/estate/models/res_users.py @@ -0,0 +1,16 @@ +from odoo import models, fields + + +class ResUsers(models.Model): + _inherit = "res.users" + + # Properties assigned to the salesperson (this user) + # Only show available properties (New or Offer Received) + property_ids = fields.One2many( + comodel_name="estate.property", + inverse_name="salesman_id", + string="Properties", + domain=[("state", "in", ("new", "offer_received"))], + ) + + diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv new file mode 100644 index 00000000000..89f97c50842 --- /dev/null +++ b/estate/security/ir.model.access.csv @@ -0,0 +1,5 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_estate_property,access_estate_property,model_estate_property,base.group_user,1,1,1,1 +access_estate_property_type,access_estate_property_type,model_estate_property_type,base.group_user,1,1,1,1 +access_estate_property_tag,access_estate_property_tag,model_estate_property_tag,base.group_user,1,1,1,1 +access_estate_property_offer,access_estate_property_offer,model_estate_property_offer,base.group_user,1,1,1,1 diff --git a/estate/views/estate_menus.xml b/estate/views/estate_menus.xml new file mode 100644 index 00000000000..ce072ba5daf --- /dev/null +++ b/estate/views/estate_menus.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/estate/views/estate_property_offer_views.xml b/estate/views/estate_property_offer_views.xml new file mode 100644 index 00000000000..8f1236f8fda --- /dev/null +++ b/estate/views/estate_property_offer_views.xml @@ -0,0 +1,44 @@ + + + + estate.property.offer.list + estate.property.offer + + + + + + + + + + + + Offers + estate.property.offer + list,form + [("property_type_id", "=", active_id)] + + + + estate.property.offer.form + estate.property.offer + +
+ +
+
+ + + + + + + +
+
+
+
+
diff --git a/estate/views/estate_property_tag_views.xml b/estate/views/estate_property_tag_views.xml new file mode 100644 index 00000000000..61bb371530f --- /dev/null +++ b/estate/views/estate_property_tag_views.xml @@ -0,0 +1,39 @@ + + + + estate.property.tag.list + estate.property.tag + + + + + + + + + + estate.property.tag.form + estate.property.tag + +
+ +
+
+ + + +
+
+
+
+ + + Property Tags + estate.property.tag + list,form + +
diff --git a/estate/views/estate_property_type_views.xml b/estate/views/estate_property_type_views.xml new file mode 100644 index 00000000000..e8900a9e2bc --- /dev/null +++ b/estate/views/estate_property_type_views.xml @@ -0,0 +1,53 @@ + + + + estate.property.type.list + estate.property.type + + + + + + + + + + estate.property.type.form + estate.property.type + +
+ +
+
+ +
+
+ + + + + + + + + + + + +
+
+
+
+ + + Property Types + estate.property.type + list,form + +
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml new file mode 100644 index 00000000000..9d18d3521f1 --- /dev/null +++ b/estate/views/estate_property_views.xml @@ -0,0 +1,191 @@ + + + + + estate.property.list + estate.property + 1 + + + + + + + + + + + + + + + + + + + + estate.property.kanban + estate.property + + + + + + + + + + +
+ +
+ Expected Price: + +
+
+ Best Offer: + +
+
+ Selling Price: + +
+
+ +
+
+
+
+
+
+
+ + + + estate.property.form + estate.property + +
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +