From a3a69c8ab288ad58ae8336f711c68af5a1b5a6e9 Mon Sep 17 00:00:00 2001 From: AnutToc Date: Tue, 9 Jan 2024 19:06:20 +0700 Subject: [PATCH 1/6] Chapter 4: Models And Basic Fields --- estate/__manifest__.py | 2 +- estate/models.py | 0 estate/models/__init__.py | 1 + estate/models/estate_property.py | 22 ++++++++++++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-) delete mode 100644 estate/models.py create mode 100644 estate/models/__init__.py create mode 100644 estate/models/estate_property.py diff --git a/estate/__manifest__.py b/estate/__manifest__.py index d7cfa57d4c5..d16a3b3412f 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -1,6 +1,6 @@ { "name": "Estate", # The name that will appear in the App list - "version": "16.0.0", # Version + "version": "1.0.0", # Version "application": True, # This line says the module is an App, and not a module "depends": ["base"], # dependencies "data": [ 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..f4c8fd6db6d --- /dev/null +++ b/estate/models/__init__.py @@ -0,0 +1 @@ +from . import estate_property \ No newline at end of file diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py new file mode 100644 index 00000000000..b80bc79b854 --- /dev/null +++ b/estate/models/estate_property.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +from odoo import fields, models + +class EstateProperty(models.Model): + _name = "estate.property" + _description = "Real Estate" + + name = fields.Char(required=True) + description = fields.Text() + postcode = fields.Char() + date_availability = fields.Date() + expected_price = fields.Float(required=True) + selling_price = fields.Integer() + bedrooms = fields.Integer() + living_area = fields.Integer() + facades = fields.Integer() + garage = fields.Boolean() + garden = fields.Boolean() + garden_area = fields.Integer() + # garden_orientation = fields.Selection() + + From 5621b912f27b001795307696f9865e6666ee6b02 Mon Sep 17 00:00:00 2001 From: AnutToc Date: Fri, 12 Jan 2024 19:31:30 +0700 Subject: [PATCH 2/6] Chapter 7: Basic Views --- estate/__manifest__.py | 6 +- estate/models/estate_property.py | 18 ++++-- estate/security/ir.model.access.csv | 2 + estate/views/estate_menus.xml | 8 +++ estate/views/estate_property_views.xml | 86 ++++++++++++++++++++++++++ 5 files changed, 112 insertions(+), 8 deletions(-) create mode 100644 estate/security/ir.model.access.csv create mode 100644 estate/views/estate_menus.xml create mode 100644 estate/views/estate_property_views.xml diff --git a/estate/__manifest__.py b/estate/__manifest__.py index d16a3b3412f..72bf1be7776 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -1,10 +1,12 @@ { - "name": "Estate", # The name that will appear in the App list + "name": "Real Estate", # The name that will appear in the App list "version": "1.0.0", # 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_views.xml", + "views/estate_menus.xml", ], "installable": True, 'license': 'LGPL-3', diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index b80bc79b854..84f5cfdb35d 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -1,22 +1,28 @@ # -*- coding: utf-8 -*- from odoo import fields, models +from dateutil.relativedelta import relativedelta + class EstateProperty(models.Model): _name = "estate.property" _description = "Real Estate" - name = fields.Char(required=True) + def _default_date_availability(self): + return fields.Datetime.today(self) + relativedelta(months=3) + + name = fields.Char(required=True, string="Title") description = fields.Text() postcode = fields.Char() - date_availability = fields.Date() + date_availability = fields.Date(copy=False, default=lambda self: self._default_date_availability()) expected_price = fields.Float(required=True) - selling_price = fields.Integer() - bedrooms = fields.Integer() + selling_price = fields.Integer(readonly=True, copy=False) + bedrooms = fields.Integer(default=2) living_area = fields.Integer() facades = fields.Integer() garage = fields.Boolean() garden = fields.Boolean() garden_area = fields.Integer() - # garden_orientation = fields.Selection() - + garden_orientation = fields.Selection([('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')], default='north') + active = fields.Boolean(default=False) + state = fields.Selection([('new', 'New'), ('offer_received', 'Offer Received'), ('offer_accepted', 'Offer Accepted'), ('sold', 'Sold'), ('canceled', 'Canceled')], required=True, copy=False, default='new') diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv new file mode 100644 index 00000000000..cad149a37a9 --- /dev/null +++ b/estate/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_estate_property,access_estate_property,estate.model_estate_property,base.group_user,1,1,1,1 \ No newline at end of file diff --git a/estate/views/estate_menus.xml b/estate/views/estate_menus.xml new file mode 100644 index 00000000000..4bba87bf5d7 --- /dev/null +++ b/estate/views/estate_menus.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml new file mode 100644 index 00000000000..07d123139df --- /dev/null +++ b/estate/views/estate_property_views.xml @@ -0,0 +1,86 @@ + + + + estate.property.form + estate.property + +
+ +
+

+ +

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + estate.property.tree + estate.property + + + + + + + + + + + + + + + estate.property.search + estate.property + + + + + + + + + + + + + + + + + + + Properties + estate.property + tree,form + + From afa134b5b9fa19d8d78914daf89d97ceea18a53f Mon Sep 17 00:00:00 2001 From: AnutToc Date: Mon, 15 Jan 2024 21:59:04 +0700 Subject: [PATCH 3/6] Chapter 8: Relations Between Models --- estate/__manifest__.py | 5 ++- estate/models/__init__.py | 5 ++- estate/models/estate_property.py | 5 +++ estate/models/estate_property_offer.py | 10 +++++ estate/models/estate_property_tag.py | 7 ++++ estate/models/estate_property_type.py | 7 ++++ estate/security/ir.model.access.csv | 5 ++- estate/views/estate_menus.xml | 8 +++- estate/views/estate_property_offer_views.xml | 40 ++++++++++++++++++ estate/views/estate_property_tag_views.xml | 44 ++++++++++++++++++++ estate/views/estate_property_type_views.xml | 44 ++++++++++++++++++++ estate/views/estate_property_views.xml | 13 ++++++ 12 files changed, 188 insertions(+), 5 deletions(-) create mode 100644 estate/models/estate_property_offer.py create mode 100644 estate/models/estate_property_tag.py create mode 100644 estate/models/estate_property_type.py create mode 100644 estate/views/estate_property_offer_views.xml create mode 100644 estate/views/estate_property_tag_views.xml create mode 100644 estate/views/estate_property_type_views.xml diff --git a/estate/__manifest__.py b/estate/__manifest__.py index 72bf1be7776..7e0844cd0ee 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -5,8 +5,11 @@ "depends": ["base"], # dependencies "data": [ "security/ir.model.access.csv", - "views/estate_property_views.xml", "views/estate_menus.xml", + "views/estate_property_views.xml", + "views/estate_property_type_views.xml", + "views/estate_property_tag_views.xml", + "views/estate_property_offer_views.xml", ], "installable": True, 'license': 'LGPL-3', diff --git a/estate/models/__init__.py b/estate/models/__init__.py index f4c8fd6db6d..09b2099fe84 100644 --- a/estate/models/__init__.py +++ b/estate/models/__init__.py @@ -1 +1,4 @@ -from . import estate_property \ No newline at end of file +from . import estate_property +from . import estate_property_type +from . import estate_property_tag +from . import estate_property_offer \ No newline at end of file diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 84f5cfdb35d..c86e2564346 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -26,3 +26,8 @@ def _default_date_availability(self): active = fields.Boolean(default=False) state = fields.Selection([('new', 'New'), ('offer_received', 'Offer Received'), ('offer_accepted', 'Offer Accepted'), ('sold', 'Sold'), ('canceled', 'Canceled')], required=True, copy=False, default='new') + property_type_id = fields.Many2one("estate.property.type", string="Property Type") + user_id = fields.Many2one("res.users", string="Salesman", default=lambda self: self.env.user) + buyer_id = fields.Many2one("res.partner", string="Buyer", readonly=True, copy=False) + tag_ids = fields.Many2many("estate.property.tag", string="Tags") + offer_ids = fields.One2many("estate.property.offer", "property_id", string="Offers") \ 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..66e18bc24ec --- /dev/null +++ b/estate/models/estate_property_offer.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +from odoo import fields, models + +class EstatePropertyOffer(models.Model): + _name = "estate.property.offer" + + 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) diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py new file mode 100644 index 00000000000..4472cf4f48a --- /dev/null +++ b/estate/models/estate_property_tag.py @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +from odoo import fields, models + +class EstatePropertyTag(models.Model): + _name = "estate.property.tag" + + name = fields.Char(required=True) diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py new file mode 100644 index 00000000000..7a8e8f2f077 --- /dev/null +++ b/estate/models/estate_property_type.py @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +from odoo import fields, models + +class EstatePropertyType(models.Model): + _name = "estate.property.type" + + name = fields.Char(required=True) diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv index cad149a37a9..6398ab5d5a4 100644 --- a/estate/security/ir.model.access.csv +++ b/estate/security/ir.model.access.csv @@ -1,2 +1,5 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_estate_property,access_estate_property,estate.model_estate_property,base.group_user,1,1,1,1 \ No newline at end of file +access_estate_property,access_estate_property,estate.model_estate_property,base.group_user,1,1,1,1 +access_estate_property_type,access_estate_property_type,estate.model_estate_property_type,base.group_user,1,1,1,1 +access_estate_property_tag,access_estate_property_tag,estate.model_estate_property_tag,base.group_user,1,1,1,1 +access_estate_property_offer,access_estate_property_offer,estate.model_estate_property_offer,base.group_user,1,1,1,1 \ No newline at end of file diff --git a/estate/views/estate_menus.xml b/estate/views/estate_menus.xml index 4bba87bf5d7..0a61fcc2f4d 100644 --- a/estate/views/estate_menus.xml +++ b/estate/views/estate_menus.xml @@ -1,8 +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..f1072ac1d36 --- /dev/null +++ b/estate/views/estate_property_offer_views.xml @@ -0,0 +1,40 @@ + + + + estate.property.offer.form + estate.property.offer + +
+ + + + + +
+ + + + + estate.property.offer.tree + estate.property.offer + + + + + + + + + + + estate.property.offer.search + 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..5fc2408fc44 --- /dev/null +++ b/estate/views/estate_property_tag_views.xml @@ -0,0 +1,44 @@ + + + + estate.property.tag.form + estate.property.tag + +
+ +
+

+ +

+
+ +
+ + + + + estate.property.tag.tree + estate.property.tag + + + + + + + + + estate.property.tag.search + estate.property.tag + + + + + + + + + Property Tags + estate.property.tag + tree,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..22641f3b434 --- /dev/null +++ b/estate/views/estate_property_type_views.xml @@ -0,0 +1,44 @@ + + + + estate.property.type.form + estate.property.type + +
+ +
+

+ +

+
+ +
+ + + + + estate.property.type.tree + estate.property.type + + + + + + + + + estate.property.type.search + estate.property.type + + + + + + + + + Property Types + estate.property.type + tree,form + + diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index 07d123139df..b4271362d1e 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -10,9 +10,11 @@

+ + @@ -36,6 +38,17 @@ + + + + + + + + + + + From 8a8214af435fc0b18ace4ea54bb1573ebff13437 Mon Sep 17 00:00:00 2001 From: AnutToc Date: Tue, 16 Jan 2024 17:28:14 +0700 Subject: [PATCH 4/6] Chapter 10: Ready For Some Action? --- estate/models/estate_property.py | 59 ++++++++++++++++-- estate/models/estate_property_offer.py | 63 +++++++++++++++++++- estate/views/estate_property_offer_views.xml | 6 ++ estate/views/estate_property_views.xml | 11 +++- 4 files changed, 131 insertions(+), 8 deletions(-) diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index c86e2564346..b77da885b92 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -from odoo import fields, models +from odoo import fields, models, api, _ from dateutil.relativedelta import relativedelta - +from odoo.exceptions import UserError class EstateProperty(models.Model): _name = "estate.property" _description = "Real Estate" @@ -15,14 +15,14 @@ def _default_date_availability(self): postcode = fields.Char() date_availability = fields.Date(copy=False, default=lambda self: self._default_date_availability()) expected_price = fields.Float(required=True) - selling_price = fields.Integer(readonly=True, copy=False) + selling_price = fields.Float(readonly=True, copy=False) bedrooms = fields.Integer(default=2) living_area = fields.Integer() facades = fields.Integer() garage = fields.Boolean() garden = fields.Boolean() garden_area = fields.Integer() - garden_orientation = fields.Selection([('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')], default='north') + garden_orientation = fields.Selection([('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')]) active = fields.Boolean(default=False) state = fields.Selection([('new', 'New'), ('offer_received', 'Offer Received'), ('offer_accepted', 'Offer Accepted'), ('sold', 'Sold'), ('canceled', 'Canceled')], required=True, copy=False, default='new') @@ -30,4 +30,53 @@ def _default_date_availability(self): user_id = fields.Many2one("res.users", string="Salesman", default=lambda self: self.env.user) buyer_id = fields.Many2one("res.partner", string="Buyer", readonly=True, copy=False) tag_ids = fields.Many2many("estate.property.tag", string="Tags") - offer_ids = fields.One2many("estate.property.offer", "property_id", string="Offers") \ No newline at end of file + offer_ids = fields.One2many("estate.property.offer", "property_id", string="Offers") + + total_area = fields.Float(copy=False, string='Total Area (sqm)', compute='_compute_total_area') + best_price = fields.Float(copy=False, string='Best Offer', compute='_compute_best_price') + + @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.price') + def _compute_best_price(self): + for record in self: + if record.offer_ids: + record.best_price = max(record.offer_ids.mapped("price")) + else: + record.best_price = 0.0 + + @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 = False + + def action_sold(self): + if self.state == 'canceled': + raise UserError(_("Canceled properties cannot be sold.")) + else: + self.state = 'sold' + + # Recommend This Way + # def action_sold(self): + # if "canceled" in self.mapped("state"): + # raise UserError("Canceled properties cannot be sold.") + # return self.write({"state": "sold"}) + + def action_cancel(self): + if self.state == 'sold': + raise UserError(_("Sold properties cannot be canceled.")) + else: + self.state = 'canceled' + + # Recommend This Way + # def action_cancel(self): + # if "sold" in self.mapped("state"): + # raise UserError("Sold properties cannot be canceled.") + # return self.write({"state": "canceled"}) \ No newline at end of file diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py index 66e18bc24ec..e10911e7e95 100644 --- a/estate/models/estate_property_offer.py +++ b/estate/models/estate_property_offer.py @@ -1,5 +1,8 @@ # -*- coding: utf-8 -*- -from odoo import fields, models +from odoo import fields, models, api, _ + +from dateutil.relativedelta import relativedelta +from odoo.exceptions import UserError class EstatePropertyOffer(models.Model): _name = "estate.property.offer" @@ -8,3 +11,61 @@ class EstatePropertyOffer(models.Model): 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) + + validity = fields.Integer(default=7) + date_deadline = fields.Date(compute='_compute_date_deadline', inverse='_inverse_date_deadline') + + @api.depends('create_date', 'validity') + def _compute_date_deadline(self): + for record in self: + if record.create_date: + date = record.create_date.date() + else: + date = fields.Date.today() + + record.date_deadline = date + relativedelta(days=record.validity) + + def _inverse_date_deadline(self): + for record in self: + if record.create_date: + date = record.create_date.date() + else: + date = fields.Date.today() + + record.validity = (record.date_deadline - date).days + + def action_accepted(self): + if "accepted" in self.mapped("property_id.offer_ids.status"): + raise UserError(_("An offer has already been accepted.")) + else: + self.status = 'accepted' + self.property_id.selling_price = self.price + self.property_id.buyer_id = self.partner_id + + # Recommend This Way + # def action_accept(self): + # if "accepted" in self.mapped("property_id.offer_ids.state"): + # raise UserError("An offer as already been accepted.") + # self.write( + # { + # "state": "accepted", + # } + # ) + # return self.mapped("property_id").write( + # { + # "state": "offer_accepted", + # "selling_price": self.price, + # "buyer_id": self.partner_id.id, + # } + # ) + + def action_refused(self): + self.status = 'refused' + + # Recommend This Way + # def action_refuse(self): + # return self.write( + # { + # "state": "refused", + # } + # ) \ No newline at end of file diff --git a/estate/views/estate_property_offer_views.xml b/estate/views/estate_property_offer_views.xml index f1072ac1d36..2f4b1527a27 100644 --- a/estate/views/estate_property_offer_views.xml +++ b/estate/views/estate_property_offer_views.xml @@ -8,6 +8,8 @@ + + @@ -21,6 +23,10 @@ + + + +

-

+
+ + + + + + + + + + + @@ -21,6 +37,7 @@ estate.property.type + diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index 27e9a5acd68..1a787ac1f8d 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -6,20 +6,21 @@
-

- +
- + @@ -66,14 +67,17 @@ estate.property.tree estate.property - + + + - + + @@ -87,10 +91,9 @@ - + - @@ -102,5 +105,6 @@ Properties estate.property tree,form + {'search_default_available': True} From 12a36f2636747252e10e5fadf09d2b618005a15c Mon Sep 17 00:00:00 2001 From: AnutToc Date: Mon, 22 Jan 2024 16:37:58 +0700 Subject: [PATCH 6/6] Chapter 16: The final word --- estate/__manifest__.py | 1 + estate/models/__init__.py | 3 +- estate/models/estate_property.py | 7 ++++- estate/models/estate_property_offer.py | 32 +++++++++++++------ estate/models/res_users.py | 8 +++++ estate/views/estate_property_views.xml | 31 ++++++++++++++++++ estate/views/res_users_views.xml | 15 +++++++++ estate_account/__init__.py | 3 ++ estate_account/__manifest__.py | 10 ++++++ estate_account/models/__init__.py | 1 + estate_account/models/estate_property.py | 40 ++++++++++++++++++++++++ 11 files changed, 139 insertions(+), 12 deletions(-) create mode 100644 estate/models/res_users.py create mode 100644 estate/views/res_users_views.xml create mode 100644 estate_account/__init__.py create mode 100644 estate_account/__manifest__.py create mode 100644 estate_account/models/__init__.py create mode 100644 estate_account/models/estate_property.py diff --git a/estate/__manifest__.py b/estate/__manifest__.py index 7e0844cd0ee..edae98ea504 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -10,6 +10,7 @@ "views/estate_property_type_views.xml", "views/estate_property_tag_views.xml", "views/estate_property_offer_views.xml", + "views/res_users_views.xml", ], "installable": True, 'license': 'LGPL-3', diff --git a/estate/models/__init__.py b/estate/models/__init__.py index 09b2099fe84..a9459ed5906 100644 --- a/estate/models/__init__.py +++ b/estate/models/__init__.py @@ -1,4 +1,5 @@ from . import estate_property from . import estate_property_type from . import estate_property_tag -from . import estate_property_offer \ No newline at end of file +from . import estate_property_offer +from . import res_users \ No newline at end of file diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 0ccf62aa1b7..d7117ed2a2b 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -94,4 +94,9 @@ def action_cancel(self): def _check_selling_price(self): for record in self: if not float_is_zero(record.selling_price, precision_rounding=0.01) and float_compare(record.selling_price, record.expected_price * 90 / 100, precision_rounding=0.01) < 0: - raise ValidationError("The selling price cannot be lower than 90% of the expected price.") \ No newline at end of file + raise ValidationError("The selling price cannot be lower than 90% of the expected price.") + + def unlink(self): + if not set(self.mapped("state")) <= {"new", "canceled"}: + raise UserError("Only new and canceled properties can be deleted.") + return super().unlink() \ No newline at end of file diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py index 2413b2081f5..8b7687aac74 100644 --- a/estate/models/estate_property_offer.py +++ b/estate/models/estate_property_offer.py @@ -3,6 +3,8 @@ from dateutil.relativedelta import relativedelta from odoo.exceptions import UserError +from odoo.tools import float_compare + class EstatePropertyOffer(models.Model): _name = "estate.property.offer" @@ -46,17 +48,27 @@ def _inverse_date_deadline(self): @api.model def create(self, vals): - record = super().create(vals) - if record: - record.update_state() - return record + if vals.get("property_id") and vals.get("price"): + record = self.env["estate.property"].browse(vals["property_id"]) + if record.offer_ids: + max_offer = max(record.mapped("offer_ids.price")) + if float_compare(vals["price"], max_offer, precision_rounding=0.01) <= 0: + raise UserError("The offer must be higher that %.2f" % max_offer) + record.state = "offer_received" + return super().create(vals) - def update_state(self): - return self.mapped("property_id").write( - { - "state": "offer_received", - } - ) + # def create(self, vals): + # record = super().create(vals) + # if record: + # record.update_state() + # return record + # + # def update_state(self): + # return self.mapped("property_id").write( + # { + # "state": "offer_received", + # } + # ) # def action_accepted(self): # if "accepted" in self.mapped("property_id.offer_ids.status"): # raise UserError(_("An offer has already been accepted.")) diff --git a/estate/models/res_users.py b/estate/models/res_users.py new file mode 100644 index 00000000000..7cd18d68033 --- /dev/null +++ b/estate/models/res_users.py @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- +from odoo import fields, models + +class ResUsers(models.Model): + _inherit = "res.users" + + property_ids = fields.One2many( + "estate.property", "user_id", string="Properties", domain=[("state", "in", ["new", "offer_received"])]) \ No newline at end of file diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index 1a787ac1f8d..9954874ed28 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -101,6 +101,37 @@ + + estate.property.kanban + estate.property + + + + + +
+
+ + + +
+
+ Expected Price: +
+
+ Best Offer: +
+
+ Selling Price: +
+ +
+ + + + + + Properties estate.property diff --git a/estate/views/res_users_views.xml b/estate/views/res_users_views.xml new file mode 100644 index 00000000000..63c4c9729a1 --- /dev/null +++ b/estate/views/res_users_views.xml @@ -0,0 +1,15 @@ + + + + res.users.form.inherit.estate + res.users + + + + + + + + + + \ No newline at end of file diff --git a/estate_account/__init__.py b/estate_account/__init__.py new file mode 100644 index 00000000000..5305644df14 --- /dev/null +++ b/estate_account/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + +from . import models \ No newline at end of file diff --git a/estate_account/__manifest__.py b/estate_account/__manifest__.py new file mode 100644 index 00000000000..87916382b4d --- /dev/null +++ b/estate_account/__manifest__.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- + +{ + "name": "Real Estate Accounting", + "depends": [ + "estate", + "account", + ], + "auto_install": True, +} \ No newline at end of file diff --git a/estate_account/models/__init__.py b/estate_account/models/__init__.py new file mode 100644 index 00000000000..f4c8fd6db6d --- /dev/null +++ b/estate_account/models/__init__.py @@ -0,0 +1 @@ +from . import estate_property \ No newline at end of file diff --git a/estate_account/models/estate_property.py b/estate_account/models/estate_property.py new file mode 100644 index 00000000000..9ffa366cc16 --- /dev/null +++ b/estate_account/models/estate_property.py @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- + +from odoo import models + + +class EstateProperty(models.Model): + _inherit = "estate.property" + + def action_sold(self): + res = super().action_sold() + journal = self.env["account.journal"].search([("type", "=", "sale")], limit=1) + for prop in self: + self.env["account.move"].create( + { + "partner_id": prop.buyer_id.id, + "move_type": "out_invoice", + "journal_id": journal.id, + "invoice_line_ids": [ + ( + 0, + 0, + { + "name": prop.name, + "quantity": 1.0, + "price_unit": prop.selling_price * 6.0 / 100.0, + }, + ), + ( + 0, + 0, + { + "name": "Administrative fees", + "quantity": 1.0, + "price_unit": 100.0, + }, + ), + ], + } + ) + return res \ No newline at end of file