diff --git a/awesome_dashboard/controllers/controllers.py b/awesome_dashboard/controllers/controllers.py index 56d4a051287..05977d3bd7f 100644 --- a/awesome_dashboard/controllers/controllers.py +++ b/awesome_dashboard/controllers/controllers.py @@ -9,7 +9,7 @@ logger = logging.getLogger(__name__) class AwesomeDashboard(http.Controller): - @http.route('/awesome_dashboard/statistics', type='json', auth='user') + @http.route('/awesome_dashboard/statistics', type='jsonrpc', auth='user') def get_statistics(self): """ Returns a dict of statistics about the orders: diff --git a/estate/__init__.py b/estate/__init__.py new file mode 100644 index 00000000000..0650744f6bc --- /dev/null +++ b/estate/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/estate/__manifest__.py b/estate/__manifest__.py new file mode 100644 index 00000000000..803185d0609 --- /dev/null +++ b/estate/__manifest__.py @@ -0,0 +1,19 @@ +{ + "name": "Real Estate", + "version": "1.9", + "author": "odoo", + "depends": [ + "base", + ], + "data": [ + "views/estate_property_offer_views.xml", + "views/estate_property_type_views.xml", + "views/estate_property_tag_views.xml", + "views/estate_property_views.xml", + "views/res_users_views.xml", + "views/estate_menus.xml", + "security/ir.model.access.csv", + ], + "application": True, + "license": "LGPL-3", +} diff --git a/estate/models/__init__.py b/estate/models/__init__.py new file mode 100644 index 00000000000..031221b4eae --- /dev/null +++ b/estate/models/__init__.py @@ -0,0 +1,5 @@ +from . import estate_property_offer +from . import estate_property_tag +from . import estate_property_type +from . import estate_property +from . import res_users diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py new file mode 100644 index 00000000000..4387482f04e --- /dev/null +++ b/estate/models/estate_property.py @@ -0,0 +1,143 @@ +from odoo import api, exceptions, fields, models +from odoo.orm.utils import ValidationError +from odoo.tools import float_compare + + +class EstateProperty(models.Model): + _name = "estate.property" + _description = "Real estate properties" + _order = "id desc" + + active = fields.Boolean(default=True) + name = fields.Char("Title", required=True) + description = fields.Text("Notes") + postcode = fields.Char("Postcode", required=True) + date_availability = fields.Date( + "Availability date", + copy=False, + default=lambda _: fields.Date.add(fields.Date.today(), months=3), + ) + expected_price = fields.Float("Expected Price", required=True) + selling_price = fields.Float( + "Selling price", + copy=False, + readonly=True, + ) + state = fields.Selection( + [ + ("new", "New"), + ("offer_received", "Offer Received"), + ("offer_accepted", "Offer Accepted"), + ("sold", "Sold"), + ("cancelled", "Cancelled"), + ], + default="new", + required=True, + copy=False, + ) + bedrooms = fields.Integer("Bedrooms", default=2) + facades = fields.Integer("Facades") + garage = fields.Boolean("Garage") + garden = fields.Boolean("Garden") + living_area = fields.Integer("Living area (sqm)") + garden_area = fields.Integer("Garden area (sqm)") + total_area = fields.Integer("Total area (sqm)", compute="_compute_total_area") + garden_orientation = fields.Selection( + [ + ("north", "North"), + ("south", "South"), + ("east", "East"), + ("west", "West"), + ], + ) + best_offer = fields.Float("Best Offer", compute="_compute_best_price") + buyer_id = fields.Many2one("res.partner", string="Buyer", copy=False) + sale_rep_id = fields.Many2one( + "res.users", + string="Salesperson", + default=lambda self: self.env.user, + ) + property_type_id = fields.Many2one("estate.property.type") + property_tag_ids = fields.Many2many("estate.property.tag", string="Tags") + offer_ids = fields.One2many( + "estate.property.offer", + "property_id", + ) + + _check_expected_price = models.Constraint( + "CHECK(expected_price > 0)", + "The expected price should be strictly positive", + ) + + _check_selling_price = models.Constraint( + "CHECK(selling_price >= 0)", + "The selling price should be positive", + ) + + @api.depends("living_area", "garden_area") + def _compute_total_area(self): + for record in self: + record.total_area = record.living_area + record.garden_area + + @api.depends("offer_ids") + def _compute_best_price(self): + for record in self: + valid_offers = record.offer_ids.filtered(lambda o: o.status != "refused") + prices = valid_offers.mapped("price") + record.best_offer = max(prices, default=0) + + @api.onchange("offer_ids") + def _onchange_offer(self): + for record in self: + # in case of a delete + if len(record.offer_ids) == 0: + record.state = "new" + + @api.onchange("garden") + def _onchange_garden(self): + if self.garden: + self.garden_area = 10 + self.garden_orientation = "north" + else: + self.garden_area = 0 + self.garden_orientation = None + + @api.constrains("expected_price", "selling_price") + def _check_offer_acceptable_price(self): + for record in self: + if ( + record.state == "offer_accepted" + and float_compare(record.selling_price, record.expected_price * 0.9, 3) + <= 0 + ): + raise ValidationError( + self.env._( + "The selling price should be greater than 90% of the expected price.", + ), + ) + + @api.ondelete(at_uninstall=False) + def _unlink_except_state_is_new_or_cancelled(self): + for record in self: + if record.state in ("new", "cancelled"): + raise exceptions.UserError( + self.env._( + "Property that is either new or cancelled, can't be deleted.", + ), + ) + + def action_sold_btn(self): + for record in self: + if record.state == "cancelled": + raise exceptions.UserError( + self.env._("Cancelled properties cannot be sold."), + ) + record.state = "sold" + + def action_cancelled_btn(self): + for record in self: + if record.state == "sold": + raise exceptions.UserError( + self.env._("Sold properties cannot be cancelled."), + ) + record.state = "cancelled" diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py new file mode 100644 index 00000000000..42255a1db48 --- /dev/null +++ b/estate/models/estate_property_offer.py @@ -0,0 +1,93 @@ +from odoo import api, exceptions, fields, models +from odoo.tools import float_compare + + +class EstatePropertyOffer(models.Model): + _name = "estate.property.offer" + _description = "Real estate property offer" + _order = "price desc" + + price = fields.Float("Price", required=True) + status = fields.Selection( + [("accepted", "Accepted"), ("refused", "Refused")], + copy=False, + ) + validity = fields.Integer( + "Validaty (days)", + default=7, + ) + date_deadline = fields.Date( + "Deadline", + compute="_computed_date_deadline", + inverse="_inverse_validity_period", + readonly=False, + ) + partner_id = fields.Many2one("res.partner", required=True) + property_id = fields.Many2one("estate.property", required=True) + property_type_id = fields.Many2one( + "estate.property.type", + related="property_id.property_type_id", + store=True, + ) + + _check_selling_price = models.Constraint( + "CHECK(price > 0)", + "The price should be strictly positive", + ) + + @api.depends("create_date", "validity") + def _computed_date_deadline(self): + for offer in self: + create_date = fields.Date.to_date(offer.create_date) or fields.Date.today() + if offer.validity: + offer.date_deadline = fields.Date.add( + create_date, + days=offer.validity, + ) + + def _inverse_validity_period(self): + for offer in self: + create_date = fields.Date.to_date(offer.create_date) or fields.Date.today() + offer.validity = (offer.date_deadline - create_date).days + + @api.model_create_multi + def create(self, vals_list): + for vals in vals_list: + if vals.get("property_id"): + property_record = self.env["estate.property"].browse( + vals["property_id"], + ) + offer_price = vals.get("price", 0.0) + if ( + property_record.best_offer + and float_compare(offer_price, property_record.best_offer, 2) < 0 + ): + raise exceptions.UserError( + self.env._( + "New offer (%(offer_price).2f) must be higher than the current best offer (%(best_offer).2f).", + offer_price=offer_price, + best_offer=property_record.best_offer, + ), + ) + if property_record.state == "new": + property_record.state = "offer_received" + return super().create(vals_list) + + def action_accept(self): + for offer in self: + if offer.property_id.buyer_id: + raise exceptions.UserError( + self.env._("One offer has already been accepted."), + ) + offer.status = "accepted" + offer.property_id.state = "offer_accepted" + offer.property_id.selling_price = offer.price + offer.property_id.buyer_id = offer.partner_id + + def action_refuse(self): + for offer in self: + offer.status = "refused" + if offer.property_id.state == "offer_received" and all( + s == "refused" for s in offer.property_id.offer_ids.mapped("status") + ): + offer.property_id.state = "new" diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py new file mode 100644 index 00000000000..98d9791f304 --- /dev/null +++ b/estate/models/estate_property_tag.py @@ -0,0 +1,15 @@ +from odoo import fields, models + + +class EstatePropertyTag(models.Model): + _name = "estate.property.tag" + _description = "Real estate property tag" + _order = "name" + + name = fields.Char("Name", required=True) + color = fields.Integer() + + _unique_name = models.Constraint( + "UNIQUE(name)", + "Tage name already exists. Tag names 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..e7744e03fda --- /dev/null +++ b/estate/models/estate_property_type.py @@ -0,0 +1,23 @@ +from odoo import api, fields, models + + +class EstatePropertyType(models.Model): + _name = "estate.property.type" + _description = "Real estate property type" + _order = "sequence, name" + + name = fields.Char("Property type", required=True) + sequence = fields.Integer("Sequence") + offer_count = fields.Integer("Offers", compute="_compute_offers_count") + property_list_id = fields.One2many("estate.property", "property_type_id") + offer_ids = fields.One2many("estate.property.offer", "property_type_id") + + _unique_name = models.Constraint( + "UNIQUE(name)", + "Property name already exists. Property names must be unique.", + ) + + @api.depends("offer_ids") + def _compute_offers_count(self): + for offer in self: + offer.offer_count = len(offer.offer_ids) diff --git a/estate/models/res_users.py b/estate/models/res_users.py new file mode 100644 index 00000000000..bccd3e0a716 --- /dev/null +++ b/estate/models/res_users.py @@ -0,0 +1,18 @@ +from odoo import fields, models + + +class ResUsers(models.Model): + _inherit = "res.users" + + property_ids = fields.One2many( + comodel_name="estate.property", + inverse_name="sale_rep_id", + string="Estate 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..5b07308d621 --- /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_properties,estate.property,model_estate_property,base.group_user,1,1,1,1 +access_estate_properties_type,estate.property.type,model_estate_property_type,base.group_user,1,1,1,1 +access_estate_properties_tag,estate.property_tag,model_estate_property_tag,base.group_user,1,1,1,1 +access_estate_properties_offer,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..9caea71ae48 --- /dev/null +++ b/estate/views/estate_menus.xml @@ -0,0 +1,15 @@ + + + + diff --git a/estate/views/estate_property_offer_views.xml b/estate/views/estate_property_offer_views.xml new file mode 100644 index 00000000000..f8fd16f10e2 --- /dev/null +++ b/estate/views/estate_property_offer_views.xml @@ -0,0 +1,44 @@ + + + + Property Offers + estate.property.offer + list,form + [('property_type_id', '=', active_id)] + + + + estate.property.offer.form + estate.property.offer + +
+ + + + + + + + +
+
+
+ + + estate.property.offer.list + estate.property.offer + + + + + + + + + + +

+ +

+ + + + + + + + + + + +
+ +
+
+ + + estate.property.type.list + estate.property.type + + + + + + + +
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml new file mode 100644 index 00000000000..ab469b1fb50 --- /dev/null +++ b/estate/views/estate_property_views.xml @@ -0,0 +1,149 @@ + + + + Property + estate.property + kanban,list,form + {'search_default_available': True} + + + + estate.property.form + estate.property + +
+
+
+ +

+ +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ + + estate.property.list + estate.property + + + + + + + + + + + + + + + estate.property.filter + estate.property + + + + + + + + + + + + + + + + + + + estate.property.kanban + estate.property + + + + + +
+ + + +
+
+ Expected price: + +
+
+ + Best offer price: + + + + Selling price: + + +
+
+ +
+
+
+
+
+
+
diff --git a/estate/views/res_users_views.xml b/estate/views/res_users_views.xml new file mode 100644 index 00000000000..0eb0d18fd29 --- /dev/null +++ b/estate/views/res_users_views.xml @@ -0,0 +1,17 @@ + + + + user.properties.form.inherit.estate + res.users + + + + + + + + + + + + diff --git a/estate_account/__init__.py b/estate_account/__init__.py new file mode 100644 index 00000000000..0650744f6bc --- /dev/null +++ b/estate_account/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/estate_account/__manifest__.py b/estate_account/__manifest__.py new file mode 100644 index 00000000000..cdfc9d72171 --- /dev/null +++ b/estate_account/__manifest__.py @@ -0,0 +1,13 @@ +{ + "name": "Estate account", + "version": "1.9", + "author": "odoo", + "depends": [ + "base", + "estate", + "account", + ], + "data": [], + "application": True, + "license": "LGPL-3", +} diff --git a/estate_account/models/__init__.py b/estate_account/models/__init__.py new file mode 100644 index 00000000000..5e1963c9d2f --- /dev/null +++ b/estate_account/models/__init__.py @@ -0,0 +1 @@ +from . import estate_property diff --git a/estate_account/models/estate_property.py b/estate_account/models/estate_property.py new file mode 100644 index 00000000000..b1b768c1945 --- /dev/null +++ b/estate_account/models/estate_property.py @@ -0,0 +1,36 @@ +from odoo import Command, models + + +class EstateProperty(models.Model): + _inherit = "estate.property" + + def action_sold_btn(self): + for record in self: + journal = self.env["account.journal"].search( + [("type", "=", "sale")], + limit=1, + ) + self.env["account.move"].create( + { + "partner_id": record.buyer_id.id, + "move_type": "out_invoice", + "journal_id": journal.id if journal else False, + "invoice_line_ids": [ + Command.create( + { + "name": "6% fee", + "quantity": 1, + "price_unit": record.selling_price * 0.06, + }, + ), + Command.create( + { + "name": "Administrative fix fees", + "quantity": 1, + "price_unit": 100.0, + }, + ), + ], + }, + ) + return super().action_sold_btn()