diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/estate/__manifest__.py b/estate/__manifest__.py index d7cfa57d4c5..72afa1616a0 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -1,10 +1,16 @@ { "name": "Estate", # The name that will appear in the App list - "version": "16.0.0", # Version + "version": "18.0.1.5", # Version "application": True, # This line says the module is an App, and not a module "depends": ["base"], # dependencies "data": [ - + 'security/ir.model.access.csv', + 'views/estate_property_offer_views.xml', + 'views/estate_property_tag_views.xml', + 'views/estate_property_type_views.xml', + 'views/estate_property_views.xml', + 'views/estate_menus.xml', + 'views/res_users_views.xml', ], "installable": True, '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..9c7b5068827 --- /dev/null +++ b/estate/models/__init__.py @@ -0,0 +1,5 @@ +from . import estate_property +from . import estate_property_tag +from . import estate_property_type +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..143d3b59e11 --- /dev/null +++ b/estate/models/estate_property.py @@ -0,0 +1,96 @@ +from odoo import fields, models, api +from odoo.exceptions import UserError +from odoo.tools.float_utils import float_compare, float_is_zero + + +class EstateProperty(models.Model): + _name = 'estate.property' + _description = 'Real Estate Property' + + # Custom fields + name = fields.Char(string="Title", required=True) + description = fields.Text() + postcode = fields.Char() + date_availability = fields.Date(string="Available From", copy=False, default=fields.Date.add(fields.Date.today(), months=3)) + expected_price = fields.Float(required=True) + selling_price = fields.Float(readonly=True, copy=False) + bedrooms = fields.Integer(default=2) + living_area = fields.Integer(string="Living Area (sqm)") + facades = fields.Integer() + garage = fields.Boolean() + garden = fields.Boolean() + garden_area = fields.Integer() + garden_orientation = fields.Selection([('n', 'North'), ('e', 'East'), ('s', 'South'), ('w', 'West')]) + + # Computed fields + total_area = fields.Integer(string='Total Area (sqm)', compute='_compute_total_area') + best_price = fields.Float(string='Best Offer', compute='_compute_best_price') + + # Relational fields + property_type_id = fields.Many2one('estate.property.type', string="Property Type") + buyer_id = fields.Many2one('res.partner', string="Buyer", copy=False) + salesperson_id = fields.Many2one('res.users', string="Salesperson", default=lambda self: self.env.user) + tag_ids = fields.Many2many('estate.property.tag', string="Tags") + offer_ids = fields.One2many('estate.property.offer', 'property_id', string="Offers") + + # Constraints + _sql_constraints = [ + ('check_expected_price', 'CHECK(expected_price >= 0)', 'The expected price must be strictly positive.'), + ('check_selling_price', 'CHECK(selling_price >= 0)', 'The selling price must be positive.'), + ] + + # Reserved fields + active = fields.Boolean(default=True) + state = fields.Selection(string="Status", default='new', copy=False, selection=[ + ('new', 'New'), + ('received', 'Offer Received'), + ('accepted', 'Offer Accepted'), + ('sold', 'Sold'), + ('canceled', 'Canceled')]) + + # Compute methods + @api.depends('living_area', 'garden_area') + def _compute_total_area(self): + for property in self: + property.total_area = property.living_area + property.garden_area + + @api.depends('offer_ids.price') + def _compute_best_price(self): + for property in self: + property.best_price = max(property.offer_ids.mapped('price') or [0]) + + @api.onchange('garden') + def _onchange_garden(self): + if not self.garden: + self.garden_area = 0 + self.garden_orientation = False + else: + self.garden_area = 10 + self.garden_orientation = 'n' + + # Constraint methods + @api.constrains('selling_price', 'expected_price') + def _check_selling_price(self): + for property in self: + if not float_is_zero(property.selling_price, precision_digits=2) and \ + float_compare(property.selling_price, (property.expected_price*9/10), precision_digits=2) == -1: + raise UserError("The selling price must be at least 90% of the expected price.") + + # Object methods + @api.ondelete(at_uninstall=False) + def _unlink_if_new_or_cancelled(self): + for _ in self.filtered(lambda p: p.state not in ['new', 'canceled']): + raise UserError("You cannot delete a property that is not new or canceled.") + + # Action methods + def action_sold(self): + for _ in self.filtered(lambda p: p.state == 'canceled'): + raise UserError("You cannot sell a canceled property.") + self.state = 'sold' + return True + + def action_cancel(self): + for _ in self.filtered(lambda p: p.state == 'sold'): + raise UserError("You cannot cancel a sold property.") + self.state = 'canceled' + return True diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py new file mode 100644 index 00000000000..81e3a210cbd --- /dev/null +++ b/estate/models/estate_property_offer.py @@ -0,0 +1,66 @@ +from odoo import fields, models, api +from odoo.exceptions import UserError +from odoo.tools.float_utils import float_compare + + +class EstatePropertyOffer(models.Model): + _name = 'estate.property.offer' + _description = 'Real Estate Property Offer' + _order = 'price desc' + + # Custom fields + price = fields.Float() + status = fields.Selection([('accepted', 'Accepted'), ('refused', 'Refused')], copy=False) + partner_id = fields.Many2one('res.partner', required=True) + property_id = fields.Many2one('estate.property', required=True) + + # Computed fields + validity = fields.Integer(string="Validity (days)", default=7) + date_deadline = fields.Date(string="Deadline", compute='_compute_date_deadline', inverse='_inverse_date_deadline') + + # Constraints + _sql_constraints = [ + ('check_price', 'CHECK(price >= 0)', 'The offer price must be positive.'), + ] + + # Compute methods + @api.depends('create_date', 'validity') + def _compute_date_deadline(self): + for offer in self: + date = offer.create_date or fields.Date.today() + offer.date_deadline = fields.Date.add(date, days=offer.validity) + + @api.depends('create_date', 'date_deadline') + def _inverse_date_deadline(self): + for offer in self: + offer.validity = (offer.date_deadline - offer.create_date.date()).days + + # Object methods + @api.model_create_multi + def create(self, values_list): + for values in values_list: + property_obj = self.env['estate.property'].browse(values['property_id']) + if property_obj.state == 'new': + property_obj.state = 'received' + elif property_obj.state == 'received' and property_obj.offer_ids: + min_price = min(property_obj.offer_ids.mapped('price')) + if float_compare(values['price'], min_price, precision_digits=2) == -1: + raise UserError("You cannot make an offer with a price below the lowest offer.") + return super().create(values_list) + + # Action methods + def action_accept(self): + for _ in self.filtered("property_id.buyer_id"): + raise UserError("You can only accept one offer at a time.") + self.status = 'accepted' + self.property_id.state = 'accepted' + self.property_id.buyer_id = self.partner_id + self.property_id.selling_price = self.price + return True + + def action_refuse(self): + for offer in self.filtered(lambda o: o.status == 'accepted'): + offer.property_id.buyer_id = False + offer.property_id.selling_price = 0 + self.status = 'refused' + return True diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py new file mode 100644 index 00000000000..42f6e64f3e2 --- /dev/null +++ b/estate/models/estate_property_tag.py @@ -0,0 +1,16 @@ +from odoo import fields, models + + +class PropertyTag(models.Model): + _name = 'estate.property.tag' + _description = 'Real Estate Property Tag' + _order = 'name' + + # Custom fields + name = fields.Char(required=True) + color = fields.Integer() + + # Constraints + _sql_constraints = [ + ('check_name', 'UNIQUE(name)', 'The name of the property tag 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..f7359c2ee7f --- /dev/null +++ b/estate/models/estate_property_type.py @@ -0,0 +1,19 @@ +from odoo import fields, models + + +class PropertyType(models.Model): + _name = 'estate.property.type' + _description = 'Real Estate Property Type' + _order = 'name' + + # Custom fields + name = fields.Char(required=True) + sequence = fields.Integer(default=1) + + # Relational fields + property_ids = fields.One2many('estate.property', 'property_type_id', string="Properties") + + # Constraints + _sql_constraints = [ + ('check_name', 'UNIQUE(name)', 'The name of the property type must be unique.') + ] diff --git a/estate/models/res_users.py b/estate/models/res_users.py new file mode 100644 index 00000000000..c3b39fd6081 --- /dev/null +++ b/estate/models/res_users.py @@ -0,0 +1,8 @@ +from odoo import fields, models + + +class Users(models.Model): + _inherit = 'res.users' + + # Custom fields + property_ids = fields.One2many('estate.property', 'salesperson_id', string="Properties", domain=[('state', 'not in', ('accepted', 'sold'))]) diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv new file mode 100644 index 00000000000..aa52982aeeb --- /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 +estate.access_estate_property,access_estate_property,estate.model_estate_property,base.group_user,1,1,1,1 +estate.access_estate_property_offer,access_estate_property_offer,estate.model_estate_property_offer,base.group_user,1,1,1,1 +estate.access_estate_property_tag,access_estate_property_tag,estate.model_estate_property_tag,base.group_user,1,1,1,1 +estate.access_estate_property_type,access_estate_property_type,estate.model_estate_property_type,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..fe5a5d4b1ba --- /dev/null +++ b/estate/views/estate_menus.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/estate/views/estate_property_offer_views.xml b/estate/views/estate_property_offer_views.xml new file mode 100644 index 00000000000..25d200f637d --- /dev/null +++ b/estate/views/estate_property_offer_views.xml @@ -0,0 +1,35 @@ + + + + estate.property.offer.form + estate.property.offer + +
+ + + + + + + + + +
+ + + + + estate.property.offer.list + estate.property.offer + + + + + + +