From 333b72f13543fb990fc3e8925d84a11fbbfcbcdd Mon Sep 17 00:00:00 2001 From: Ahmed Taha Date: Mon, 16 Mar 2026 13:08:19 +0100 Subject: [PATCH 01/20] [ADD] estate_property: Up to chapeter 3 --- estate/__init__.py | 1 + estate/__manifest__.py | 10 ++++++++++ estate/models/__init__.py | 1 + estate/models/estate_property.py | 23 +++++++++++++++++++++++ 4 files changed, 35 insertions(+) create mode 100644 estate/__init__.py create mode 100644 estate/__manifest__.py create mode 100644 estate/models/__init__.py create mode 100644 estate/models/estate_property.py diff --git a/estate/__init__.py b/estate/__init__.py new file mode 100644 index 00000000000..9a7e03eded3 --- /dev/null +++ b/estate/__init__.py @@ -0,0 +1 @@ +from . import models \ No newline at end of file diff --git a/estate/__manifest__.py b/estate/__manifest__.py new file mode 100644 index 00000000000..d26b759a1a5 --- /dev/null +++ b/estate/__manifest__.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + + +{ + 'name': 'Estate', + 'version': '1.9', + 'application': True, + 'installable': True +} \ No newline at end of file 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..bcd255218ff --- /dev/null +++ b/estate/models/estate_property.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import fields, models + + +class RecurringPlan(models.Model): + _name = "estate.property" + _description = "Estate property" + + name = fields.Char(required=True) + description = fields.Text() + postcode = fields.Char() + date_availability = fields.Date() + expected_price = fields.Float(required=True) + selling_price = fields.Float() + bedrooms = fields.Integer() + living_area = fields.Integer() + facades = fields.Integer() + garage = fields.Boolean() + garden = fields.Boolean() + garden_area = fields.Integer() + garden_orientation = fields.Selection(selection=[('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')]) \ No newline at end of file From 95f4033e4d02365d71257cf97e5585006818a0f5 Mon Sep 17 00:00:00 2001 From: Ahmed Taha Date: Mon, 16 Mar 2026 13:40:34 +0100 Subject: [PATCH 02/20] [ADD] estate_property: Chapter 4 --- estate/__manifest__.py | 6 +++++- estate/security/ir.model.access.csv | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 estate/security/ir.model.access.csv diff --git a/estate/__manifest__.py b/estate/__manifest__.py index d26b759a1a5..520399d8776 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -6,5 +6,9 @@ 'name': 'Estate', 'version': '1.9', 'application': True, - 'installable': True + 'installable': True, + + 'data':[ + 'security/ir.model.access.csv' + ] } \ No newline at end of file diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv new file mode 100644 index 00000000000..8efbc0866c3 --- /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_test_model,access_test_model,model_estate_property,base.group_user,1,1,1,1 From ce0c008a449818cf21e2dcbac0d2af770be48a7a Mon Sep 17 00:00:00 2001 From: Ahmed Taha Date: Mon, 16 Mar 2026 15:40:18 +0100 Subject: [PATCH 03/20] [ADD] estate_property: Chapter 5 --- estate/__manifest__.py | 4 +++- estate/models/estate_property.py | 15 +++++++++++---- estate/views/estate_menus.xml | 19 +++++++++++++++++++ estate/views/estate_property_views.xml | 7 +++++++ 4 files changed, 40 insertions(+), 5 deletions(-) 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 520399d8776..d0ebc3f2542 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -9,6 +9,8 @@ 'installable': True, 'data':[ - 'security/ir.model.access.csv' + 'security/ir.model.access.csv', + 'views/estate_property_views.xml', + 'views/estate_menus.xml' ] } \ No newline at end of file diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index bcd255218ff..ae30749f9f6 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -2,6 +2,7 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from odoo import fields, models +from dateutil.relativedelta import relativedelta class RecurringPlan(models.Model): @@ -11,13 +12,19 @@ class RecurringPlan(models.Model): name = fields.Char(required=True) description = fields.Text() postcode = fields.Char() - date_availability = fields.Date() + date_availability = fields.Date(default=fields.Date.today()+relativedelta(months=3), copy=False) expected_price = fields.Float(required=True) - selling_price = fields.Float() - bedrooms = fields.Integer() + 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(selection=[('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')]) \ No newline at end of file + garden_orientation = fields.Selection(selection=[('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')]) + active = fields.Boolean(default=True) # testing the reserved fields thing + state = fields.Selection(selection=[('new', 'New'), ('offer received', 'Offer Received'), ('offer accepted', 'Offer Accepted'), ('sold', 'Sold'), ('cancelled', 'Cancelled')], + default='new', + required=True, + copy=False + ) diff --git a/estate/views/estate_menus.xml b/estate/views/estate_menus.xml new file mode 100644 index 00000000000..80309827a10 --- /dev/null +++ b/estate/views/estate_menus.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml new file mode 100644 index 00000000000..c49852140da --- /dev/null +++ b/estate/views/estate_property_views.xml @@ -0,0 +1,7 @@ + + + Real estates + estate.property + list,form + + \ No newline at end of file From 9f0950b6ba33a6d6f54ad8d3566822533a21d928 Mon Sep 17 00:00:00 2001 From: Ahmed Taha Date: Mon, 16 Mar 2026 17:19:04 +0100 Subject: [PATCH 04/20] [ADD] estate_property: Chapter 6 --- estate/views/estate_menus.xml | 1 + estate/views/estate_property_views.xml | 77 ++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/estate/views/estate_menus.xml b/estate/views/estate_menus.xml index 80309827a10..9d58e893728 100644 --- a/estate/views/estate_menus.xml +++ b/estate/views/estate_menus.xml @@ -16,4 +16,5 @@ + \ No newline at end of file diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index c49852140da..c7b9c6ba7fd 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -1,4 +1,81 @@ + + estate.property.list + estate.property + + + + + + + + + + + + + + + estate.property.form + estate.property + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + estate.property.search + estate.property + + + + + + + + + + + + + + + Real estates estate.property From 81d3bb98e44bce1c759dafbbbe56e376c240ba57 Mon Sep 17 00:00:00 2001 From: Ahmed Taha Date: Tue, 17 Mar 2026 15:54:27 +0100 Subject: [PATCH 05/20] [ADD] estate_property: Chapters 7 and 8 --- estate/__manifest__.py | 2 + estate/models/__init__.py | 5 ++- estate/models/estate_property.py | 33 +++++++++++++- estate/models/estate_property_offer.py | 30 +++++++++++++ estate/models/estate_property_tag.py | 12 +++++ estate/models/estate_property_type.py | 12 +++++ estate/security/ir.model.access.csv | 3 ++ estate/views/estate_menus.xml | 11 +++-- estate/views/estate_property_offers_views.xml | 42 ++++++++++++++++++ estate/views/estate_property_types_views.xml | 7 +++ estate/views/estate_property_views.xml | 44 ++++++++++++++----- 11 files changed, 182 insertions(+), 19 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_offers_views.xml create mode 100644 estate/views/estate_property_types_views.xml diff --git a/estate/__manifest__.py b/estate/__manifest__.py index d0ebc3f2542..d79b0b8c4d3 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -10,6 +10,8 @@ 'data':[ 'security/ir.model.access.csv', + 'views/estate_property_offers_views.xml', + 'views/estate_property_types_views.xml', 'views/estate_property_views.xml', 'views/estate_menus.xml' ] 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 ae30749f9f6..3ea7f44b7ca 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import fields, models +from odoo import api, fields, models from dateutil.relativedelta import relativedelta -class RecurringPlan(models.Model): +class EstateProperty(models.Model): _name = "estate.property" _description = "Estate property" @@ -28,3 +28,32 @@ class RecurringPlan(models.Model): required=True, copy=False ) + property_type_id = fields.Many2one('estate.property.type', string='Property Type') + seller_id = fields.Many2one('res.users', string='Salesman', default=lambda self: self.env.user) + buyer_id = fields.Many2one('res.partner', string='Buyer', copy=False) + + property_tags_ids = fields.Many2many('estate.property.tag', string='Property Tags') + + offer_ids = fields.One2many('estate.property.offer', 'property_id', string="Offers") + + total_area = fields.Float(compute="_compute_total_area") + best_offer = fields.Float(compute="_compute_best_offer") + + @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_offer(self): + for record in self: + record.best_offer = max(record.offer_ids.mapped('price')) + + @api.onchange('garden') + def _onchange_garden(self): + if self.garden: + self.garden_area = 10 + self.garden_orientation = 'north' + else: + self.garden_area = False + self.garden_orientation = False diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py new file mode 100644 index 00000000000..a50131e7e4e --- /dev/null +++ b/estate/models/estate_property_offer.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import api, fields, models +from dateutil.relativedelta import relativedelta + + +class EstatePropertyOffer(models.Model): + _name = "estate.property.offer" + _description = "Estate property offer" + + price = fields.Float() + status = fields.Selection(copy=False, selection=[('accepted', 'Accepted'), ('refused', 'Refused')]) + partner_id = fields.Many2one('res.partner', string='Partner', required=True) + property_id = fields.Many2one('estate.property', string='Property', required=True) + validity = fields.Integer(default=7) + date_deadline = fields.Date(compute="_compute_date_deadline", inverse="_inverse_date_deadline") + + @api.depends('validity') + def _compute_date_deadline(self): + for record in self: + print("HERE2", record.validity) + if record.create_date: + record.date_deadline = record.create_date+relativedelta(days=record.validity) + else: + record.date_deadline = fields.Date.today()+relativedelta(days=record.validity) + + def _inverse_date_deadline(self): + for record in self: + record.validity = (record.date_deadline-fields.Date.to_date(record.create_date)).days diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py new file mode 100644 index 00000000000..a1a1eb452f6 --- /dev/null +++ b/estate/models/estate_property_tag.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import fields, models +from dateutil.relativedelta import relativedelta + + +class EstatePropertyTag(models.Model): + _name = "estate.property.tag" + _description = "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..eaeca8045e3 --- /dev/null +++ b/estate/models/estate_property_type.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import fields, models +from dateutil.relativedelta import relativedelta + + +class EstatePropertyType(models.Model): + _name = "estate.property.type" + _description = "Estate property Tag" + + name = fields.Char(required=True) diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv index 8efbc0866c3..978b532ba1f 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_test_model,access_test_model,model_estate_property,base.group_user,1,1,1,1 +access_test_model2,access_test_model2,model_estate_property_type,base.group_user,1,1,1,1 +access_test_model3,access_test_model3,model_estate_property_tag,base.group_user,1,1,1,1 +access_test_model4,access_test_model4,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 index 9d58e893728..0704e82c580 100644 --- a/estate/views/estate_menus.xml +++ b/estate/views/estate_menus.xml @@ -1,19 +1,22 @@ - - + + + + + - + - + diff --git a/estate/views/estate_property_offers_views.xml b/estate/views/estate_property_offers_views.xml new file mode 100644 index 00000000000..4aa387d2498 --- /dev/null +++ b/estate/views/estate_property_offers_views.xml @@ -0,0 +1,42 @@ + + + estate.property.offer.list + estate.property.offer + + + + + + + + + + + + + estate.property.offerform + estate.property.offer + +
+ + + + + + + + + + + + + + + + + +
+ + + + \ No newline at end of file diff --git a/estate/views/estate_property_types_views.xml b/estate/views/estate_property_types_views.xml new file mode 100644 index 00000000000..5c02b8f1008 --- /dev/null +++ b/estate/views/estate_property_types_views.xml @@ -0,0 +1,7 @@ + + + Property Types + estate.property.type + list,form + + \ No newline at end of file diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index c7b9c6ba7fd..2650b88a080 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -1,10 +1,12 @@ - + estate.property.list estate.property + + @@ -25,12 +27,21 @@ + + + + + + + + + @@ -40,17 +51,26 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + From 871531915baf4f70be09cccb993638e200c5fe9c Mon Sep 17 00:00:00 2001 From: Ahmed Taha Date: Tue, 17 Mar 2026 17:17:33 +0100 Subject: [PATCH 06/20] [ADD] estate_property: Chapter 9 --- estate/models/estate_property.py | 20 ++++++++++++++++--- estate/models/estate_property_offer.py | 17 ++++++++++++++-- estate/views/estate_property_offers_views.xml | 6 ++++++ estate/views/estate_property_views.xml | 7 +++++++ 4 files changed, 45 insertions(+), 5 deletions(-) diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 3ea7f44b7ca..f68f4a64dec 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import api, fields, models +from odoo import api, fields, models, exceptions from dateutil.relativedelta import relativedelta @@ -23,7 +23,7 @@ class EstateProperty(models.Model): garden_area = fields.Integer() garden_orientation = fields.Selection(selection=[('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')]) active = fields.Boolean(default=True) # testing the reserved fields thing - state = fields.Selection(selection=[('new', 'New'), ('offer received', 'Offer Received'), ('offer accepted', 'Offer Accepted'), ('sold', 'Sold'), ('cancelled', 'Cancelled')], + state = fields.Selection(selection=[('new', 'New'), ('offer received', 'Offer Received'), ('offer accepted', 'Offer Accepted'), ('sold', 'Sold'), ('canceled', 'Canceled')], default='new', required=True, copy=False @@ -37,7 +37,7 @@ class EstateProperty(models.Model): offer_ids = fields.One2many('estate.property.offer', 'property_id', string="Offers") total_area = fields.Float(compute="_compute_total_area") - best_offer = fields.Float(compute="_compute_best_offer") + best_offer = fields.Float(default=0, compute="_compute_best_offer") @api.depends('living_area', 'garden_area') def _compute_total_area(self): @@ -57,3 +57,17 @@ def _onchange_garden(self): else: self.garden_area = False self.garden_orientation = False + + def action_mark_as_sold(self): + for record in self: + if record.state != 'canceled': + record.state = 'sold' + else: + raise exceptions.UserError("Canceled properties cannot be sold!") + + def action_mark_as_canceled(self): + for record in self: + if record.state != 'sold': + record.state = 'canceled' + else: + raise exceptions.UserError("Sold properties cannot be canceled!") diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py index a50131e7e4e..daf54880bcb 100644 --- a/estate/models/estate_property_offer.py +++ b/estate/models/estate_property_offer.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import api, fields, models +from odoo import api, fields, models, exceptions from dateutil.relativedelta import relativedelta @@ -19,7 +19,6 @@ class EstatePropertyOffer(models.Model): @api.depends('validity') def _compute_date_deadline(self): for record in self: - print("HERE2", record.validity) if record.create_date: record.date_deadline = record.create_date+relativedelta(days=record.validity) else: @@ -28,3 +27,17 @@ def _compute_date_deadline(self): def _inverse_date_deadline(self): for record in self: record.validity = (record.date_deadline-fields.Date.to_date(record.create_date)).days + + def action_accept_offer(self): + for record in self: + if record.status == 'accepted': + continue + for offer in record.property_id.offer_ids: + if offer.status == 'accepted': + raise exceptions.UserError("There is an offer already accepted, you can accept another one!") + record.status = 'accepted' + + + def action_refuse_offer(self): + for record in self: + record.status = 'refused' \ No newline at end of file diff --git a/estate/views/estate_property_offers_views.xml b/estate/views/estate_property_offers_views.xml index 4aa387d2498..5c1182b6160 100644 --- a/estate/views/estate_property_offers_views.xml +++ b/estate/views/estate_property_offers_views.xml @@ -8,6 +8,8 @@ + + @@ -27,7 +43,8 @@ - - +
+ +
diff --git a/estate/views/res_users_views.xml b/estate/views/res_users_views.xml new file mode 100644 index 00000000000..6fc3927cabe --- /dev/null +++ b/estate/views/res_users_views.xml @@ -0,0 +1,16 @@ + + + res.users.view.form.inherit.gamification + res.users + + + + + + + + + + + + \ No newline at end of file From 1658cf80f72dfe2c71ff53f7fad4b46a465b2723 Mon Sep 17 00:00:00 2001 From: Ahmed Taha Date: Thu, 19 Mar 2026 14:25:51 +0100 Subject: [PATCH 11/20] [ADD] estate_property: Chapter 13 --- estate_account/__init__.py | 1 + estate_account/__manifest__.py | 18 ++++++++++ estate_account/models/__init__.py | 1 + estate_account/models/estate_property.py | 38 +++++++++++++++++++++ estate_account/security/ir.model.access.csv | 1 + 5 files changed, 59 insertions(+) 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 create mode 100644 estate_account/security/ir.model.access.csv diff --git a/estate_account/__init__.py b/estate_account/__init__.py new file mode 100644 index 00000000000..9a7e03eded3 --- /dev/null +++ b/estate_account/__init__.py @@ -0,0 +1 @@ +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..faba9694fcb --- /dev/null +++ b/estate_account/__manifest__.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + + +{ + 'name': 'Estate Accounting', + 'version': '1.9', + 'author': 'Abo Taha', + 'license': 'AGPL-3', + 'application': True, + 'installable': True, + + 'depends': ['account', 'estate'], + + 'data':[ + 'security/ir.model.access.csv', + ] +} \ 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..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..6bd75919363 --- /dev/null +++ b/estate_account/models/estate_property.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import api, fields, models, exceptions, Command + +class EstateProperty(models.Model): + _inherit = 'estate.property' + + def action_mark_as_sold(self): + res = super().action_mark_as_sold() + journal = self.env['account.journal'].search([('type', '=', 'sale')], limit=1) + if not journal: + raise UserError("Please define a 'Sale' journal in Accounting settings.") + + self.env['account.move'].create({ + 'partner_id': self.buyer_id.id, + 'move_type': 'out_invoice', + 'journal_id': journal.id, + 'invoice_line_ids': [ + Command.create({ + 'name': self.name, + 'quantity': 1, + 'price_unit': self.selling_price + }), + Command.create({ + 'name': "Stella", + 'quantity': 1, + 'price_unit': 0.06*self.selling_price + }), + Command.create({ + 'name': "Additional Fees", + 'quantity': 1, + 'price_unit': 100.00 + }) + ] + } + ) + return res \ No newline at end of file diff --git a/estate_account/security/ir.model.access.csv b/estate_account/security/ir.model.access.csv new file mode 100644 index 00000000000..301b7dab167 --- /dev/null +++ b/estate_account/security/ir.model.access.csv @@ -0,0 +1 @@ +id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink From 53b098f0ae233d67a579809398b471578557fae1 Mon Sep 17 00:00:00 2001 From: Ahmed Taha Date: Thu, 19 Mar 2026 15:20:32 +0100 Subject: [PATCH 12/20] [ADD] estate_property: Chapter 14 --- estate/views/estate_property_views.xml | 36 +++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index b3b067fe885..0c7bada1b16 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -83,6 +83,40 @@ + + estate.property.kanban + estate.property + + + + + + +
+ +
+ Expected Price: + +
+
+ Best Price: + +
+
+ Selling Price: + +
+
+ +
+
+ + + + + + estate.property.search estate.property @@ -105,7 +139,7 @@ Real estates estate.property - list,form + list,form,kanban {'search_default_available': True} \ No newline at end of file From 0c6ac1d61620d4998a3cf1f842d5e4cb2a7b98cf Mon Sep 17 00:00:00 2001 From: Ahmed Taha Date: Fri, 20 Mar 2026 09:04:23 +0100 Subject: [PATCH 13/20] [REF] estate_property: refactoring the code --- .vscode/settings.json | 3 ++ estate/models/estate_property.py | 56 ++++++++++++++---------- estate/models/estate_property_offer.py | 30 ++++++++----- estate/models/estate_property_type.py | 3 +- estate/models/res_users.py | 8 ++-- estate/views/estate_menus.xml | 8 ++-- estate/views/estate_property_views.xml | 2 +- estate_account/models/estate_property.py | 35 ++++++++------- 8 files changed, 84 insertions(+), 61 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000000..ff5300ef481 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "python.languageServer": "None" +} \ No newline at end of file diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 9eae222d1d1..4f4cf995e66 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -14,7 +14,8 @@ class EstateProperty(models.Model): name = fields.Char(required=True) description = fields.Text() postcode = fields.Char() - date_availability = fields.Date(default=fields.Date.today()+relativedelta(months=3), copy=False) + date_availability = fields.Date( + default=fields.Date.today()+relativedelta(months=3), copy=False) expected_price = fields.Float(required=True) selling_price = fields.Float(readonly=True, copy=False) bedrooms = fields.Integer(default=2) @@ -23,20 +24,24 @@ class EstateProperty(models.Model): garage = fields.Boolean() garden = fields.Boolean() garden_area = fields.Integer() - garden_orientation = fields.Selection(selection=[('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')]) - active = fields.Boolean(default=True) # testing the reserved fields thing + garden_orientation = fields.Selection(selection=[( + 'north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')]) + active = fields.Boolean(default=True) # testing the reserved fields thing state = fields.Selection(selection=[('new', 'New'), ('offer received', 'Offer Received'), ('offer accepted', 'Offer Accepted'), ('sold', 'Sold'), ('canceled', 'Canceled')], - default='new', - required=True, - copy=False - ) - property_type_id = fields.Many2one('estate.property.type', string='Property Type') - seller_id = fields.Many2one('res.users', string='Salesman', default=lambda self: self.env.user) + default='new', + required=True, + copy=False + ) + property_type_id = fields.Many2one( + 'estate.property.type', string='Property Type') + seller_id = fields.Many2one( + 'res.users', string='Salesman', default=lambda self: self.env.user) buyer_id = fields.Many2one('res.partner', string='Buyer', copy=False) tag_ids = fields.Many2many('estate.property.tag', string='Tags') - offer_ids = fields.One2many('estate.property.offer', 'property_id', string="Offers") + offer_ids = fields.One2many( + 'estate.property.offer', 'property_id', string="Offers") total_area = fields.Float(compute="_compute_total_area") best_offer = fields.Float(compute="_compute_best_offer") @@ -50,15 +55,6 @@ class EstateProperty(models.Model): 'The selling price of a property must be strictly positive!' ) - @api.constrains('selling_price', 'expected_price') - def _check_price(self): - for record in self: - if float_is_zero(record.selling_price, 3): - continue - if float_compare(record.selling_price, 0.9*record.expected_price, 3) == -1: - raise exceptions.ValidationError("The selling price cannot be less than 90% of the expected price") - - @api.depends('living_area', 'garden_area') def _compute_total_area(self): for record in self: @@ -72,12 +68,21 @@ def _compute_best_offer(self): else: record.best_offer = 0 + @api.constrains('selling_price', 'expected_price') + def _check_price(self): + for record in self: + if float_is_zero(record.selling_price, 3): + continue + if float_compare(record.selling_price, 0.9*record.expected_price, 3) == -1: + raise exceptions.ValidationError( + "The selling price cannot be less than 90% of the expected price") + + @api.onchange('offer_ids') def _onchange_receive_offer(self): for record in self.filtered(lambda record: record.state == 'new'): if record.offer_ids: record.state = 'offer received' - @api.onchange('garden') def _onchange_garden(self): @@ -92,18 +97,21 @@ def _onchange_garden(self): def _unlike_property(self): for record in self: if record.state != 'new' and record.state != 'canceled': - raise exceptions.UserError("You cannot delete this property: only new and canceled properities can be deleted.") + raise exceptions.UserError( + "You cannot delete this property: only new and canceled properities can be deleted.") def action_mark_as_sold(self): for record in self: if record.state != 'canceled': record.state = 'sold' else: - raise exceptions.UserError("Canceled properties cannot be sold!") - + raise exceptions.UserError( + "Canceled properties cannot be sold!") + def action_mark_as_canceled(self): for record in self: if record.state != 'sold': record.state = 'canceled' else: - raise exceptions.UserError("Sold properties cannot be canceled!") + raise exceptions.UserError( + "Sold properties cannot be canceled!") diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py index d76c992bf61..353f4740e2b 100644 --- a/estate/models/estate_property_offer.py +++ b/estate/models/estate_property_offer.py @@ -15,32 +15,41 @@ class EstatePropertyOffer(models.Model): 'CHECK(price > 0)', 'The offer price of must be strictly positive!' ) - status = fields.Selection(copy=False, selection=[('accepted', 'Accepted'), ('refused', 'Refused')]) - partner_id = fields.Many2one('res.partner', string='Partner', required=True) - property_id = fields.Many2one('estate.property', string='Property', required=True) + status = fields.Selection(copy=False, selection=[( + 'accepted', 'Accepted'), ('refused', 'Refused')]) + partner_id = fields.Many2one( + 'res.partner', string='Partner', required=True) + property_id = fields.Many2one( + 'estate.property', string='Property', required=True) validity = fields.Integer(default=7) - date_deadline = fields.Date(compute="_compute_date_deadline", inverse="_inverse_date_deadline") - property_type_id = fields.Many2one(related="property_id.property_type_id", store=True) + date_deadline = fields.Date( + compute="_compute_date_deadline", inverse="_inverse_date_deadline") + property_type_id = fields.Many2one( + related="property_id.property_type_id", store=True) @api.depends('validity') def _compute_date_deadline(self): for record in self: if record.create_date: - record.date_deadline = record.create_date+relativedelta(days=record.validity) + record.date_deadline = record.create_date + \ + relativedelta(days=record.validity) else: record.date_deadline = fields.Date.today()+relativedelta(days=record.validity) def _inverse_date_deadline(self): for record in self: - record.validity = (record.date_deadline-fields.Date.to_date(record.create_date)).days + record.validity = (record.date_deadline - + fields.Date.to_date(record.create_date)).days @api.model def create(self, vals_list): for vals in vals_list: - related_property = self.env['estate.property'].browse(vals['property_id']) + related_property = self.env['estate.property'].browse( + vals['property_id']) for offer in related_property.offer_ids: if offer.price > vals['price']: - raise exceptions.UserError("This offer price is lower than the current ones") + raise exceptions.UserError( + "This offer price is lower than the current ones") return super().create(vals_list) @@ -56,7 +65,6 @@ def action_accept_offer(self): record.property_id.selling_price = record.price record.property_id.state = 'offer accepted' - def action_refuse_offer(self): for record in self: - record.status = 'refused' \ No newline at end of file + record.status = 'refused' diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py index f0cf87021d5..88befa3cd78 100644 --- a/estate/models/estate_property_type.py +++ b/estate/models/estate_property_type.py @@ -11,7 +11,8 @@ class EstatePropertyType(models.Model): _order = "sequence, name" name = fields.Char(required=True) - sequence = fields.Integer('Sequence', default=1, help="Used to order stages, Lower is better.") + sequence = fields.Integer('Sequence', default=1, + help="Used to order stages, Lower is better.") property_ids = fields.One2many('estate.property', 'property_type_id') offer_ids = fields.One2many('estate.property.offer', 'property_type_id') offer_count = fields.Integer(compute="_compute_offer_count") diff --git a/estate/models/res_users.py b/estate/models/res_users.py index 1ab1919dc38..d0818dfd8c8 100644 --- a/estate/models/res_users.py +++ b/estate/models/res_users.py @@ -3,8 +3,8 @@ class ResUsers(models.Model): - _inherit = 'res.users' - _name = 'res.users' + _inherit = 'res.users' + _name = 'res.users' - property_ids = fields.One2many('estate.property', 'seller_id', - domain=['|', ('state', '=', 'new'), ('state', '=', 'offer received')]) \ No newline at end of file + property_ids = fields.One2many('estate.property', 'seller_id', + domain=['|', ('state', '=', 'new'), ('state', '=', 'offer received')]) diff --git a/estate/views/estate_menus.xml b/estate/views/estate_menus.xml index 0704e82c580..a37769a04e5 100644 --- a/estate/views/estate_menus.xml +++ b/estate/views/estate_menus.xml @@ -1,7 +1,7 @@ - + - + @@ -10,13 +10,13 @@ - + - + diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index 0c7bada1b16..31c23337ef6 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -136,7 +136,7 @@ - + Real estates estate.property list,form,kanban diff --git a/estate_account/models/estate_property.py b/estate_account/models/estate_property.py index 6bd75919363..11ca926c6c8 100644 --- a/estate_account/models/estate_property.py +++ b/estate_account/models/estate_property.py @@ -3,36 +3,39 @@ from odoo import api, fields, models, exceptions, Command + class EstateProperty(models.Model): _inherit = 'estate.property' def action_mark_as_sold(self): res = super().action_mark_as_sold() - journal = self.env['account.journal'].search([('type', '=', 'sale')], limit=1) + journal = self.env['account.journal'].search( + [('type', '=', 'sale')], limit=1) if not journal: - raise UserError("Please define a 'Sale' journal in Accounting settings.") - + raise UserError( + "Please define a 'Sale' journal in Accounting settings.") + self.env['account.move'].create({ - 'partner_id': self.buyer_id.id, - 'move_type': 'out_invoice', - 'journal_id': journal.id, - 'invoice_line_ids': [ - Command.create({ + 'partner_id': self.buyer_id.id, + 'move_type': 'out_invoice', + 'journal_id': journal.id, + 'invoice_line_ids': [ + Command.create({ 'name': self.name, 'quantity': 1, 'price_unit': self.selling_price - }), - Command.create({ + }), + Command.create({ 'name': "Stella", 'quantity': 1, 'price_unit': 0.06*self.selling_price - }), - Command.create({ + }), + Command.create({ 'name': "Additional Fees", 'quantity': 1, 'price_unit': 100.00 - }) - ] - } + }) + ] + } ) - return res \ No newline at end of file + return res From 26a03f66b79c063344b5cf2db2c79cedc7097e4a Mon Sep 17 00:00:00 2001 From: Ahmed Taha Date: Fri, 20 Mar 2026 10:02:53 +0100 Subject: [PATCH 14/20] [REF] estate_module: refactoring the code --- estate/__init__.py | 2 +- estate/__manifest__.py | 14 ++-- estate/models/__init__.py | 2 +- estate/models/estate_property.py | 73 ++++++++++++------- estate/models/estate_property_offer.py | 40 ++++++---- estate/models/estate_property_tag.py | 4 - estate/models/estate_property_type.py | 4 - estate/models/res_users.py | 3 +- estate/views/estate_menus.xml | 22 +----- estate/views/estate_property_offers_views.xml | 22 +++--- estate/views/estate_property_types_views.xml | 6 +- estate/views/estate_property_views.xml | 59 +++++++-------- estate_account/__init__.py | 2 +- estate_account/__manifest__.py | 12 +-- estate_account/models/estate_property.py | 18 ++--- 15 files changed, 139 insertions(+), 144 deletions(-) diff --git a/estate/__init__.py b/estate/__init__.py index 9a7e03eded3..0650744f6bc 100644 --- a/estate/__init__.py +++ b/estate/__init__.py @@ -1 +1 @@ -from . import models \ No newline at end of file +from . import models diff --git a/estate/__manifest__.py b/estate/__manifest__.py index 71e69eaac0e..0d032d715ad 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -1,16 +1,14 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - - { 'name': 'Estate', - 'version': '1.9', - 'author': 'Abo Taha', + 'version': '1.0', + 'author': 'Odoo S.A.', 'license': 'AGPL-3', 'application': True, 'installable': True, - 'data':[ + 'depends': ['base'], + + 'data': [ 'security/ir.model.access.csv', 'views/estate_property_offers_views.xml', 'views/estate_property_types_views.xml', @@ -18,4 +16,4 @@ 'views/estate_menus.xml', 'views/res_users_views.xml' ] -} \ No newline at end of file +} diff --git a/estate/models/__init__.py b/estate/models/__init__.py index a9459ed5906..9a2189b6382 100644 --- a/estate/models/__init__.py +++ b/estate/models/__init__.py @@ -2,4 +2,4 @@ from . import estate_property_type from . import estate_property_tag from . import estate_property_offer -from . import res_users \ No newline at end of file +from . import res_users diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 4f4cf995e66..c4c2a2fadbc 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - from odoo import api, fields, models, exceptions from odoo.tools.float_utils import float_compare, float_is_zero from dateutil.relativedelta import relativedelta @@ -11,27 +8,46 @@ class EstateProperty(models.Model): _description = "Estate property" _order = "id desc" - name = fields.Char(required=True) - description = fields.Text() - postcode = fields.Char() + name = fields.Char(required=True, string="Title") + description = fields.Text(string="Description") + postcode = fields.Char(string="Postcode") date_availability = fields.Date( - default=fields.Date.today()+relativedelta(months=3), copy=False) - expected_price = fields.Float(required=True) - 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(selection=[( - 'north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')]) - active = fields.Boolean(default=True) # testing the reserved fields thing - state = fields.Selection(selection=[('new', 'New'), ('offer received', 'Offer Received'), ('offer accepted', 'Offer Accepted'), ('sold', 'Sold'), ('canceled', 'Canceled')], - default='new', - required=True, - copy=False - ) + default=lambda self: fields.Date.today() + relativedelta(months=3), + copy=False, + string="Available From", + ) + expected_price = fields.Float(required=True, string="Expected Price") + selling_price = fields.Float( + readonly=True, copy=False, string="Selling Price") + bedrooms = fields.Integer(default=2, string="Bedrooms") + 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", + ) + active = fields.Boolean(default=True) + state = fields.Selection( + selection=[ + ('new', "New"), + ('offer received', "Offer Received"), + ('offer accepted', "Offer Accepted"), + ('sold', "Sold"), + ('canceled', "Canceled") + ], + default='new', + required=True, + copy=False, + string="Status", + ) property_type_id = fields.Many2one( 'estate.property.type', string='Property Type') seller_id = fields.Many2one( @@ -43,8 +59,10 @@ class EstateProperty(models.Model): offer_ids = fields.One2many( 'estate.property.offer', 'property_id', string="Offers") - total_area = fields.Float(compute="_compute_total_area") - best_offer = fields.Float(compute="_compute_best_offer") + total_area = fields.Float( + compute="_compute_total_area", string="Total Area (sqm)") + best_offer = fields.Float( + compute="_compute_best_offer", string="Best Offer") _check_expected_price = models.Constraint( 'CHECK(expected_price > 0)', @@ -58,7 +76,7 @@ class EstateProperty(models.Model): @api.depends('living_area', 'garden_area') def _compute_total_area(self): for record in self: - record.total_area = record.living_area+record.garden_area + record.total_area = record.living_area + record.garden_area @api.depends('offer_ids') def _compute_best_offer(self): @@ -73,11 +91,10 @@ def _check_price(self): for record in self: if float_is_zero(record.selling_price, 3): continue - if float_compare(record.selling_price, 0.9*record.expected_price, 3) == -1: + if float_compare(record.selling_price, 0.9 * record.expected_price, 3) == -1: raise exceptions.ValidationError( "The selling price cannot be less than 90% of the expected price") - @api.onchange('offer_ids') def _onchange_receive_offer(self): for record in self.filtered(lambda record: record.state == 'new'): diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py index 353f4740e2b..fc2ce298672 100644 --- a/estate/models/estate_property_offer.py +++ b/estate/models/estate_property_offer.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - from odoo import api, fields, models, exceptions from dateutil.relativedelta import relativedelta @@ -10,22 +7,35 @@ class EstatePropertyOffer(models.Model): _description = "Estate property offer" _order = "price desc" - price = fields.Float() - _check_price = models.Constraint( - 'CHECK(price > 0)', - 'The offer price of must be strictly positive!' + price = fields.Float(string="Price") + status = fields.Selection( + copy=False, + selection=[ + ('accepted', 'Accepted'), + ('refused', 'Refused'), + ], + string="Status", ) - status = fields.Selection(copy=False, selection=[( - 'accepted', 'Accepted'), ('refused', 'Refused')]) partner_id = fields.Many2one( - 'res.partner', string='Partner', required=True) + 'res.partner', string="Partner", required=True + ) property_id = fields.Many2one( - 'estate.property', string='Property', required=True) - validity = fields.Integer(default=7) + 'estate.property', string="Property", required=True + ) + validity = fields.Integer(default=7, string="Validity (Days)") date_deadline = fields.Date( - compute="_compute_date_deadline", inverse="_inverse_date_deadline") + compute="_compute_date_deadline", + inverse="_inverse_date_deadline", + string="Deadline", + ) property_type_id = fields.Many2one( - related="property_id.property_type_id", store=True) + related="property_id.property_type_id", store=True + ) + + _check_price = models.Constraint( + 'CHECK(price > 0)', + 'The offer price of must be strictly positive!' + ) @api.depends('validity') def _compute_date_deadline(self): @@ -34,7 +44,7 @@ def _compute_date_deadline(self): record.date_deadline = record.create_date + \ relativedelta(days=record.validity) else: - record.date_deadline = fields.Date.today()+relativedelta(days=record.validity) + record.date_deadline = fields.Date.today() + relativedelta(days=record.validity) def _inverse_date_deadline(self): for record in self: diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py index e7d3ddb2c06..d558dc3a1ad 100644 --- a/estate/models/estate_property_tag.py +++ b/estate/models/estate_property_tag.py @@ -1,8 +1,4 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - from odoo import fields, models -from dateutil.relativedelta import relativedelta class EstatePropertyTag(models.Model): diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py index 88befa3cd78..0a961d4fc29 100644 --- a/estate/models/estate_property_type.py +++ b/estate/models/estate_property_type.py @@ -1,8 +1,4 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - from odoo import fields, models, api -from dateutil.relativedelta import relativedelta class EstatePropertyType(models.Model): diff --git a/estate/models/res_users.py b/estate/models/res_users.py index d0818dfd8c8..2f55949fa5d 100644 --- a/estate/models/res_users.py +++ b/estate/models/res_users.py @@ -1,5 +1,4 @@ -from odoo import api, fields, models, exceptions -from dateutil.relativedelta import relativedelta +from odoo import fields, models class ResUsers(models.Model): diff --git a/estate/views/estate_menus.xml b/estate/views/estate_menus.xml index a37769a04e5..ddf0959bfde 100644 --- a/estate/views/estate_menus.xml +++ b/estate/views/estate_menus.xml @@ -1,23 +1,7 @@ - - - - - - - - - - - - - - - - - - + + + - \ No newline at end of file diff --git a/estate/views/estate_property_offers_views.xml b/estate/views/estate_property_offers_views.xml index 548e4af2946..b638ffbbc0f 100644 --- a/estate/views/estate_property_offers_views.xml +++ b/estate/views/estate_property_offers_views.xml @@ -4,11 +4,11 @@ estate.property.offer - - - - - + + + + + + + + + + + + + diff --git a/awesome_owl/static/src/counter/counter.js b/awesome_owl/static/src/counter/counter.js new file mode 100644 index 00000000000..6aa9e3ed7b4 --- /dev/null +++ b/awesome_owl/static/src/counter/counter.js @@ -0,0 +1,21 @@ +import { Component, useState } from "@odoo/owl"; + +export class Counter extends Component { + static template = "awesome_owl.counter"; + + + static props = { + onChange: { type: Function, optional: true }, + }; + + setup() { + this.state = useState({ value: 0 }); + } + + increment() { + this.state.value++; + if (this.props.onChange) { + this.props.onChange(this.state.value); + } + } +} diff --git a/awesome_owl/static/src/counter/counter.xml b/awesome_owl/static/src/counter/counter.xml new file mode 100644 index 00000000000..70a2b0655fa --- /dev/null +++ b/awesome_owl/static/src/counter/counter.xml @@ -0,0 +1,11 @@ + + + + +
+

Counter:

+ +
+ + + \ No newline at end of file diff --git a/awesome_owl/static/src/playground.js b/awesome_owl/static/src/playground.js index 4ac769b0aa5..830c53cf106 100644 --- a/awesome_owl/static/src/playground.js +++ b/awesome_owl/static/src/playground.js @@ -1,5 +1,23 @@ -import { Component } from "@odoo/owl"; +import { markup, Component, useState } from "@odoo/owl"; +import { Counter } from "./counter/counter"; +import { Card } from "./card/card"; +import { TodoList } from "./TodoList/TodoList"; export class Playground extends Component { static template = "awesome_owl.playground"; + + static components = { Counter, Card, TodoList }; + + static props = {}; + + html1 = markup("
some text 2
"); + html2 = "
some text 2
"; + + setup() { + this.state = useState({ sum: 0 }); + } + + incrementSum() { + this.state.sum++; + } } diff --git a/awesome_owl/static/src/playground.xml b/awesome_owl/static/src/playground.xml index 4fb905d59f9..5476045e386 100644 --- a/awesome_owl/static/src/playground.xml +++ b/awesome_owl/static/src/playground.xml @@ -4,6 +4,20 @@
hello world + + +
Sum:
+ + +

+ + + + + + + +
diff --git a/awesome_owl/static/src/utils.js b/awesome_owl/static/src/utils.js new file mode 100644 index 00000000000..750b2d354e3 --- /dev/null +++ b/awesome_owl/static/src/utils.js @@ -0,0 +1,18 @@ +import { useRef, onMounted } from "@odoo/owl"; + +/** + * Custom hook to automatically focus an element when + * the component is mounted. + * @param {string} name - The t-ref name used in the XML + */ +export function useAutofocus(name) { + const ref = useRef(name); + + onMounted(() => { + if (ref.el) { + ref.el.focus(); + } + }); + + return ref; +} diff --git a/awesome_owl/views/templates.xml b/awesome_owl/views/templates.xml index aa54c1a7241..3df6b44bd5b 100644 --- a/awesome_owl/views/templates.xml +++ b/awesome_owl/views/templates.xml @@ -5,6 +5,7 @@ + From 08f9f31dd42fffe006b12e3959b5c1ff1a7b3886 Mon Sep 17 00:00:00 2001 From: Ahmed Taha Date: Wed, 25 Mar 2026 14:51:17 +0100 Subject: [PATCH 17/20] [ADD] awesome_dashboard: Chapter 2 in the web framework --- awesome_dashboard/__manifest__.py | 3 + awesome_dashboard/static/src/dashboard.js | 8 -- awesome_dashboard/static/src/dashboard.xml | 8 -- .../static/src/dashboard/dashboard.js | 108 ++++++++++++++++++ .../static/src/dashboard/dashboard.scss | 3 + .../static/src/dashboard/dashboard.xml | 26 +++++ .../dashboard/dashboardItem/dashboardItem.js | 14 +++ .../dashboard/dashboardItem/dashboardItem.xml | 10 ++ .../static/src/dashboard/dashboard_items.js | 47 ++++++++ .../src/dashboard/numberCard/numberCard.js | 10 ++ .../src/dashboard/numberCard/numberCard.xml | 11 ++ .../static/src/dashboard/pieChart/pieChart.js | 80 +++++++++++++ .../src/dashboard/pieChart/pieChart.xml | 11 ++ .../dashboard/pieChartCard/pieChartCard.js | 30 +++++ .../dashboard/pieChartCard/pieChartCard.xml | 11 ++ .../src/dashboard/utils/statistics_service.js | 28 +++++ .../static/src/dashboard_action.js | 17 +++ 17 files changed, 409 insertions(+), 16 deletions(-) delete mode 100644 awesome_dashboard/static/src/dashboard.js delete mode 100644 awesome_dashboard/static/src/dashboard.xml create mode 100644 awesome_dashboard/static/src/dashboard/dashboard.js create mode 100644 awesome_dashboard/static/src/dashboard/dashboard.scss create mode 100644 awesome_dashboard/static/src/dashboard/dashboard.xml create mode 100644 awesome_dashboard/static/src/dashboard/dashboardItem/dashboardItem.js create mode 100644 awesome_dashboard/static/src/dashboard/dashboardItem/dashboardItem.xml create mode 100644 awesome_dashboard/static/src/dashboard/dashboard_items.js create mode 100644 awesome_dashboard/static/src/dashboard/numberCard/numberCard.js create mode 100644 awesome_dashboard/static/src/dashboard/numberCard/numberCard.xml create mode 100644 awesome_dashboard/static/src/dashboard/pieChart/pieChart.js create mode 100644 awesome_dashboard/static/src/dashboard/pieChart/pieChart.xml create mode 100644 awesome_dashboard/static/src/dashboard/pieChartCard/pieChartCard.js create mode 100644 awesome_dashboard/static/src/dashboard/pieChartCard/pieChartCard.xml create mode 100644 awesome_dashboard/static/src/dashboard/utils/statistics_service.js create mode 100644 awesome_dashboard/static/src/dashboard_action.js diff --git a/awesome_dashboard/__manifest__.py b/awesome_dashboard/__manifest__.py index a1cd72893d7..995e6ac1119 100644 --- a/awesome_dashboard/__manifest__.py +++ b/awesome_dashboard/__manifest__.py @@ -25,6 +25,9 @@ 'web.assets_backend': [ 'awesome_dashboard/static/src/**/*', ], + 'awesome_dashboard.dashboard': [ + 'awesome_dashboard/static/src/dashboard/**/*', + ], }, 'license': 'AGPL-3' } diff --git a/awesome_dashboard/static/src/dashboard.js b/awesome_dashboard/static/src/dashboard.js deleted file mode 100644 index c4fb245621b..00000000000 --- a/awesome_dashboard/static/src/dashboard.js +++ /dev/null @@ -1,8 +0,0 @@ -import { Component } from "@odoo/owl"; -import { registry } from "@web/core/registry"; - -class AwesomeDashboard extends Component { - static template = "awesome_dashboard.AwesomeDashboard"; -} - -registry.category("actions").add("awesome_dashboard.dashboard", AwesomeDashboard); diff --git a/awesome_dashboard/static/src/dashboard.xml b/awesome_dashboard/static/src/dashboard.xml deleted file mode 100644 index 1a2ac9a2fed..00000000000 --- a/awesome_dashboard/static/src/dashboard.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - hello dashboard - - - diff --git a/awesome_dashboard/static/src/dashboard/dashboard.js b/awesome_dashboard/static/src/dashboard/dashboard.js new file mode 100644 index 00000000000..e96b0f3aeb3 --- /dev/null +++ b/awesome_dashboard/static/src/dashboard/dashboard.js @@ -0,0 +1,108 @@ +import { Component, useState, xml } from "@odoo/owl"; +import { registry } from "@web/core/registry"; +import { Layout } from "@web/search/layout"; +import { useService } from "@web/core/utils/hooks"; +import { _t } from "@web/core/l10n/translation"; +import { DashboardItem } from "./dashboardItem/dashboardItem"; +import { Dialog } from "@web/core/dialog/dialog"; +import { CheckBox } from "@web/core/checkbox/checkbox"; + +class AwesomeDashboard extends Component { + static template = "awesome_dashboard.AwesomeDashboard"; + + static components = { Layout, DashboardItem }; + + static props = { + statistics: { type: Array, optional: true }, + }; + + setup() { + this.display = { + controlPanel: {}, + } + + this.action = useService("action"); + + const statisticsService = useService("awesome_dashboard.statistics"); + + this.statistics = useState(statisticsService.statistics); + + this.items = registry.category("awesome_dashboard").getAll(); + + this.dialog = useService("dialog"); + + this.state = useState({ disabledItemsIds: [] }); + } + + openCustomersKanban() { + this.action.doAction("base.action_partner_form"); + } + + openCrmLeads() { + this.action.doAction({ + type: "ir.actions.act_window", + name: _t("Leads"), + target: "current", + res_model: "crm.lead", + views: [[false, "list"], [false, "form"]], + }); + } + + openConfiguration() { + this.dialog.add(ConfigurationDialog, { + title: _t("Dashboard Items Configuration"), + items: this.items, + disabledItemsIds: this.state.disabledItemsIds, + onApply: (newDisabledItemsIds) => { + this.state.disabledItemsIds = newDisabledItemsIds; + }, + size: "medium", + showFooter: true, + }); + } + +} + + +class ConfigurationDialog extends Component { + static template = xml` + +
+

+ + + + + +

+ + + + + `; + + static components = { Dialog, CheckBox }; + + setup() { + this._t = _t; + this.newDisabledItemsIds = [...this.props.disabledItemsIds]; + } + + toggleItem(itemId) { + if (this.newDisabledItemsIds.includes(itemId)) { + this.newDisabledItemsIds = this.newDisabledItemsIds.filter(id => id !== itemId); + } else { + this.newDisabledItemsIds = [...this.newDisabledItemsIds, itemId]; + } + } + + onApply() { + this.props.onApply(this.newDisabledItemsIds); + this.props.close(); + } +} + +registry.category("lazy_components").add("AwesomeDashboard", AwesomeDashboard); diff --git a/awesome_dashboard/static/src/dashboard/dashboard.scss b/awesome_dashboard/static/src/dashboard/dashboard.scss new file mode 100644 index 00000000000..769fc1e72f9 --- /dev/null +++ b/awesome_dashboard/static/src/dashboard/dashboard.scss @@ -0,0 +1,3 @@ +.o_dashboard { + background-color: gray; +} \ No newline at end of file diff --git a/awesome_dashboard/static/src/dashboard/dashboard.xml b/awesome_dashboard/static/src/dashboard/dashboard.xml new file mode 100644 index 00000000000..04e67fa3724 --- /dev/null +++ b/awesome_dashboard/static/src/dashboard/dashboard.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/awesome_dashboard/static/src/dashboard/dashboardItem/dashboardItem.js b/awesome_dashboard/static/src/dashboard/dashboardItem/dashboardItem.js new file mode 100644 index 00000000000..36ce90a49b2 --- /dev/null +++ b/awesome_dashboard/static/src/dashboard/dashboardItem/dashboardItem.js @@ -0,0 +1,14 @@ +import { Component, useState } from "@odoo/owl"; + +export class DashboardItem extends Component { + static template = "awesome_dashboard.dashboardItem"; + + static props = { + size: { type: Number, optional: true}, + slots: { type: Object, optional: true }, + }; + + static defaultProps = { + size: 1, + }; +} diff --git a/awesome_dashboard/static/src/dashboard/dashboardItem/dashboardItem.xml b/awesome_dashboard/static/src/dashboard/dashboardItem/dashboardItem.xml new file mode 100644 index 00000000000..4bfbe82d128 --- /dev/null +++ b/awesome_dashboard/static/src/dashboard/dashboardItem/dashboardItem.xml @@ -0,0 +1,10 @@ + + + + +
+ +
+ + + diff --git a/awesome_dashboard/static/src/dashboard/dashboard_items.js b/awesome_dashboard/static/src/dashboard/dashboard_items.js new file mode 100644 index 00000000000..475086b9ea7 --- /dev/null +++ b/awesome_dashboard/static/src/dashboard/dashboard_items.js @@ -0,0 +1,47 @@ +import { _t } from "@web/core/l10n/translation"; +import { NumberCard } from "./numberCard/numberCard"; +import { PieChartCard } from "./pieChartCard/pieChartCard"; +import { registry } from "@web/core/registry"; + +const dashboardRegistry = registry.category("awesome_dashboard"); + +dashboardRegistry.add("average_quantity", { + id: "average_quantity", + description: _t("Average amount of t-shirts"), + Component: NumberCard, + size: 3, + props: (data) => ({ + title: _t("Average Quantity"), + value: data.average_quantity + }), +}); + +dashboardRegistry.add("average_time", { + id: "average_time", + description: _t("Average time for an order"), + Component: NumberCard, + props: (data) => ({ + title: _t("Average Time"), + value: data.average_time + }), +}); + +dashboardRegistry.add("nb_cancelled_orders", { + id: "nb_cancelled_orders", + description: _t("Number of cancelled orders"), + Component: NumberCard, + props: (data) => ({ + title: _t("Cancelled Orders"), + value: data.nb_cancelled_orders + }), +}); + +dashboardRegistry.add("orders_by_size", { + id: "orders_by_size", + description: _t("Shirt orders by size"), + Component: PieChartCard, + props: (data) => ({ + title: _t("Shirt orders by size"), + values: data.orders_by_size, + }) +}); diff --git a/awesome_dashboard/static/src/dashboard/numberCard/numberCard.js b/awesome_dashboard/static/src/dashboard/numberCard/numberCard.js new file mode 100644 index 00000000000..8f342a63002 --- /dev/null +++ b/awesome_dashboard/static/src/dashboard/numberCard/numberCard.js @@ -0,0 +1,10 @@ +import { Component } from "@odoo/owl"; + +export class NumberCard extends Component { + static template = "awesome_dashboard.numberCard"; + + static props = { + title: { type: String}, + value: { type: Number, optional: true }, + }; +} diff --git a/awesome_dashboard/static/src/dashboard/numberCard/numberCard.xml b/awesome_dashboard/static/src/dashboard/numberCard/numberCard.xml new file mode 100644 index 00000000000..ac1f82e8de9 --- /dev/null +++ b/awesome_dashboard/static/src/dashboard/numberCard/numberCard.xml @@ -0,0 +1,11 @@ + + + + +
+

+

+
+ + + diff --git a/awesome_dashboard/static/src/dashboard/pieChart/pieChart.js b/awesome_dashboard/static/src/dashboard/pieChart/pieChart.js new file mode 100644 index 00000000000..e9da874992d --- /dev/null +++ b/awesome_dashboard/static/src/dashboard/pieChart/pieChart.js @@ -0,0 +1,80 @@ +import { Component, onWillStart, onWillUnmount, useEffect, useRef } from "@odoo/owl"; +import { loadJS } from "@web/core/assets"; + + +export class PieChart extends Component { + static template = "awesome_dashboard.pieChart"; + + static props = { + title: { type: String }, + values: { type: Object }, + onSelect: { type: Function, optional: true }, + } + + setup() { + this.canvasRef = useRef("canvas"); + this.chart = null; + + onWillStart(() => loadJS("/web/static/lib/Chart/Chart.js")); + + useEffect(() => { + this.renderChart(); + }, () => [this.props.values]); + onWillUnmount(this.onWillUnmount); + } + + onWillUnmount() { + if (this.chart) { + this.chart.destroy(); + } + } + + renderChart() { + const labels = Object.keys(this.props.values); + + const data = Object.values(this.props.values); + + if (this.chart) { + this.chart.destroy(); + } + + this.chart = new Chart(this.canvasRef.el, { + type: 'pie', + data: { + labels: labels, + datasets: [{ + data: data, + backgroundColor: [ + '#00A09D', + '#E9A13B', + '#212529', + '#D9534F', + '#5BC0DE', + ], + }] + }, + options: { + responsive: true, + plugins: { + legend: { + position: 'bottom', + } + }, + }, + }); + } + + onChartClick(ev) { + const chart = Chart.getChart(this.canvasRef.el); + const activePoints = chart.getElementsAtEventForMode(ev, 'nearest', { intersect: true }, true); + + if (activePoints.length > 0) { + const index = activePoints[0].index; + const label = chart.data.labels[index]; + + if (this.props.onSelect) { + this.props.onSelect(label); + } + } + } +} diff --git a/awesome_dashboard/static/src/dashboard/pieChart/pieChart.xml b/awesome_dashboard/static/src/dashboard/pieChart/pieChart.xml new file mode 100644 index 00000000000..8d136aae859 --- /dev/null +++ b/awesome_dashboard/static/src/dashboard/pieChart/pieChart.xml @@ -0,0 +1,11 @@ + + + + +
+ + +
+ + + \ No newline at end of file diff --git a/awesome_dashboard/static/src/dashboard/pieChartCard/pieChartCard.js b/awesome_dashboard/static/src/dashboard/pieChartCard/pieChartCard.js new file mode 100644 index 00000000000..28d201d5b60 --- /dev/null +++ b/awesome_dashboard/static/src/dashboard/pieChartCard/pieChartCard.js @@ -0,0 +1,30 @@ +import { Component } from "@odoo/owl"; +import { PieChart } from "../pieChart/pieChart"; +import { useService } from "@web/core/utils/hooks"; +import { _t } from "@web/core/l10n/translation"; + +export class PieChartCard extends Component { + static template = "awesome_dashboard.pieChartCard"; + + static components = { PieChart }; + + static props = { + title: { type: String }, + values: { type: Object }, + }; + + setup() { + this.action = useService("action"); + } + + onSelectLabel(label) { + this.action.doAction({ + type: 'ir.actions.act_window', + name: _t("Orders with size %s", [label]), + res_model: 'awesome_dashboard.orders', + domain: [['size', '=', label]], + views: [[false, 'list']], + target: 'current', + }); + } +} diff --git a/awesome_dashboard/static/src/dashboard/pieChartCard/pieChartCard.xml b/awesome_dashboard/static/src/dashboard/pieChartCard/pieChartCard.xml new file mode 100644 index 00000000000..cfed814964a --- /dev/null +++ b/awesome_dashboard/static/src/dashboard/pieChartCard/pieChartCard.xml @@ -0,0 +1,11 @@ + + + + +
+

+ +
+ + + diff --git a/awesome_dashboard/static/src/dashboard/utils/statistics_service.js b/awesome_dashboard/static/src/dashboard/utils/statistics_service.js new file mode 100644 index 00000000000..ac565fb12da --- /dev/null +++ b/awesome_dashboard/static/src/dashboard/utils/statistics_service.js @@ -0,0 +1,28 @@ +import { reactive } from "@odoo/owl"; +import { registry } from "@web/core/registry"; +import { rpc } from "@web/core/network/rpc"; + + +const statisticsService = { + + start() { + + const statistics = reactive({}); + + async function loadStatistics() { + const data = await rpc("/awesome_dashboard/statistics"); + Object.assign(statistics, data); + }; + + setInterval(loadStatistics, 600000); + + loadStatistics(); + + return { + statistics + }; + }, + +}; + +registry.category("services").add("awesome_dashboard.statistics", statisticsService); \ No newline at end of file diff --git a/awesome_dashboard/static/src/dashboard_action.js b/awesome_dashboard/static/src/dashboard_action.js new file mode 100644 index 00000000000..9a87c7eb428 --- /dev/null +++ b/awesome_dashboard/static/src/dashboard_action.js @@ -0,0 +1,17 @@ +import { Component, xml } from "@odoo/owl"; +import { registry } from "@web/core/registry"; +import { LazyComponent } from "@web/core/assets"; + + +class DashboardAction extends Component { + static template = xml` + + `; + + static components = { LazyComponent }; +} + +registry.category("actions").add("awesome_dashboard.dashboard", DashboardAction); From b4b2836ba75d46c1b55569a0b7f5f1e8992c4455 Mon Sep 17 00:00:00 2001 From: Ahmed Taha Date: Thu, 26 Mar 2026 13:11:08 +0100 Subject: [PATCH 18/20] [ADD] estate_proprety: define module data --- estate/__manifest__.py | 11 ++- estate/data/estate_property_type_data.xml | 18 +++++ estate/demo/estate_property_demo_data.xml | 67 +++++++++++++++++++ .../demo/estate_property_offer_demo_data.xml | 32 +++++++++ .../estate_property_partners_demo_data.xml | 11 +++ 5 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 estate/data/estate_property_type_data.xml create mode 100644 estate/demo/estate_property_demo_data.xml create mode 100644 estate/demo/estate_property_offer_demo_data.xml create mode 100644 estate/demo/estate_property_partners_demo_data.xml diff --git a/estate/__manifest__.py b/estate/__manifest__.py index 9bec0181065..249aca651f0 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -13,6 +13,13 @@ 'views/estate_property_types_views.xml', 'views/estate_property_views.xml', 'views/estate_menus.xml', - 'views/res_users_views.xml' - ] + 'views/res_users_views.xml', + 'data/estate_property_type_data.xml', + ], + + 'demo': [ + 'demo/estate_property_partners_demo_data.xml', + 'demo/estate_property_demo_data.xml', + 'demo/estate_property_offer_demo_data.xml', + ], } diff --git a/estate/data/estate_property_type_data.xml b/estate/data/estate_property_type_data.xml new file mode 100644 index 00000000000..f9eee5ebf5a --- /dev/null +++ b/estate/data/estate_property_type_data.xml @@ -0,0 +1,18 @@ + + + + Residential + + + + Commercial + + + + Industrial + + + + Land + + \ No newline at end of file diff --git a/estate/demo/estate_property_demo_data.xml b/estate/demo/estate_property_demo_data.xml new file mode 100644 index 00000000000..1fd48170c3d --- /dev/null +++ b/estate/demo/estate_property_demo_data.xml @@ -0,0 +1,67 @@ + + + + + Big Villa + + new + A nice and big villa + 12345 + 2020-02-02 + 1600000 + 6 + 100 + 4 + True + True + 100000 + south + + + + Trailer Home + + canceled + Home in a trailer park + 54321 + 1970-01-01 + 100000 + 120000 + 1 + 10 + 4 + False + + + + Small Apartment + + new + A small cozy apartment + 67890 + 1973-01-01 + 100000 + 1 + 30 + 4 + False + + + + \ No newline at end of file diff --git a/estate/demo/estate_property_offer_demo_data.xml b/estate/demo/estate_property_offer_demo_data.xml new file mode 100644 index 00000000000..eac02f978a8 --- /dev/null +++ b/estate/demo/estate_property_offer_demo_data.xml @@ -0,0 +1,32 @@ + + + + + + + 10000 + + + + + + + 1500000 + + + + + + + 1500001 + + + + + + + + + + + \ No newline at end of file diff --git a/estate/demo/estate_property_partners_demo_data.xml b/estate/demo/estate_property_partners_demo_data.xml new file mode 100644 index 00000000000..e506e55d301 --- /dev/null +++ b/estate/demo/estate_property_partners_demo_data.xml @@ -0,0 +1,11 @@ + + + + + Azure Interior + + + Deco Addict + + + From 41fcc51f7ef95ff05f58761905adf630cbc0f182 Mon Sep 17 00:00:00 2001 From: Ahmed Taha Date: Thu, 26 Mar 2026 16:47:03 +0100 Subject: [PATCH 19/20] [ADD] estate_property: Safeguard your code with unit tests --- estate/models/estate_property.py | 15 ++++--- estate/models/estate_property_offer.py | 8 +++- estate/models/res_users.py | 2 +- estate/tests/__init__.py | 1 + estate/tests/test_estate.py | 55 ++++++++++++++++++++++++++ estate/views/estate_property_views.xml | 12 +++--- 6 files changed, 76 insertions(+), 17 deletions(-) create mode 100644 estate/tests/__init__.py create mode 100644 estate/tests/test_estate.py diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 1de0fce7550..dc553e02e81 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -39,8 +39,8 @@ class EstateProperty(models.Model): state = fields.Selection( selection=[ ('new', "New"), - ('offer received', "Offer Received"), - ('offer accepted', "Offer Accepted"), + ('offer_received', "Offer Received"), + ('offer_accepted', "Offer Accepted"), ('sold', "Sold"), ('canceled', "Canceled") ], @@ -101,7 +101,7 @@ def _check_price(self): def _onchange_receive_offer(self): for record in self.filtered(lambda record: record.state == 'new'): if record.offer_ids: - record.state = 'offer received' + record.state = 'offer_received' @api.onchange('garden') def _onchange_garden(self): @@ -122,12 +122,11 @@ def _unlike_property(self): def action_mark_as_sold(self): for record in self: - if record.state != 'canceled': - record.state = 'sold' - else: - raise UserError(self.env._( - "Canceled properties cannot be sold!") + if record.state != 'offer_accepted': + raise ValidationError(self.env._( + "Only properties with an accepted offer can be sold!") ) + record.state = 'sold' def action_mark_as_canceled(self): for record in self: diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py index ccd5e1919aa..d7e756fd3e4 100644 --- a/estate/models/estate_property_offer.py +++ b/estate/models/estate_property_offer.py @@ -1,5 +1,5 @@ from odoo import api, fields, models -from odoo.exceptions import UserError +from odoo.exceptions import UserError, ValidationError from dateutil.relativedelta import relativedelta @@ -57,6 +57,10 @@ def create(self, vals_list): for vals in vals_list: related_property = self.env['estate.property'].browse( vals['property_id']) + if related_property.state in ['sold', 'canceled', 'offer_accepted']: + raise ValidationError(self.env._( + "You cannot make an offer on a sold or canceled property!") + ) for offer in related_property.offer_ids: if offer.price > vals['price']: raise UserError(self.env._("This offer price is lower than the current ones")) @@ -73,7 +77,7 @@ def action_accept_offer(self): record.status = 'accepted' record.property_id.buyer_id = record.partner_id record.property_id.selling_price = record.price - record.property_id.state = 'offer accepted' + record.property_id.state = 'offer_accepted' def action_refuse_offer(self): for record in self: diff --git a/estate/models/res_users.py b/estate/models/res_users.py index 2f55949fa5d..ba0b5e47df5 100644 --- a/estate/models/res_users.py +++ b/estate/models/res_users.py @@ -6,4 +6,4 @@ class ResUsers(models.Model): _name = 'res.users' property_ids = fields.One2many('estate.property', 'seller_id', - domain=['|', ('state', '=', 'new'), ('state', '=', 'offer received')]) + domain=['|', ('state', '=', 'new'), ('state', '=', 'offer_received')]) diff --git a/estate/tests/__init__.py b/estate/tests/__init__.py new file mode 100644 index 00000000000..dfd37f0be11 --- /dev/null +++ b/estate/tests/__init__.py @@ -0,0 +1 @@ +from . import test_estate diff --git a/estate/tests/test_estate.py b/estate/tests/test_estate.py new file mode 100644 index 00000000000..581afe2023f --- /dev/null +++ b/estate/tests/test_estate.py @@ -0,0 +1,55 @@ +from odoo.tests.common import TransactionCase +from odoo.exceptions import ValidationError +from odoo.tests import tagged + + +@tagged('post_install', '-at_install') +class TestEstate(TransactionCase): + + @classmethod + def setUpClass(cls): + """This runs once to set up the data for all tests in this class.""" + super().setUpClass() + + cls.type_id = cls.env.ref('estate.estate_property_type_residential') + + cls.property = cls.env['estate.property'].create({ + 'name': 'Test Villa', + 'property_type_id': cls.type_id.id, + 'expected_price': 100000, + 'state': 'new', + }) + + cls.buyer = cls.env['res.partner'].create({'name': 'John Doe'}) + + def test_01_create_offer_on_restricted_states(self): + """Test: Cannot create offer if property is sold or canceled""" + for restricted_state in ['sold', 'canceled', 'offer_accepted']: + self.property.state = restricted_state + + with self.assertRaises(ValidationError, msg=f"Should fail on {restricted_state}"): + self.env['estate.property.offer'].create({ + 'property_id': self.property.id, + 'price': 50000, + 'partner_id': self.buyer.id, + }) + + def test_02_sell_without_accepted_offer(self): + """Test: Cannot sell property if no offers are 'accepted'""" + self.property.state = 'new' + with self.assertRaises(ValidationError): + self.property.action_mark_as_sold() + + def test_03_successful_sell_flow(self): + """Test: Property marks as 'sold' correctly when an offer is accepted""" + offer = self.env['estate.property.offer'].create({ + 'property_id': self.property.id, + 'price': 90000, + 'partner_id': self.buyer.id, + }) + + offer.action_accept_offer() + + self.property.action_mark_as_sold() + + self.assertEqual(self.property.state, 'sold', "The property should be in 'sold' state.") diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index 898c53b2afe..83f24d43c4b 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -3,7 +3,7 @@ estate.property.list estate.property - + @@ -23,9 +23,9 @@
-
@@ -61,7 +61,7 @@ - @@ -95,7 +95,7 @@ Best Price: -
Selling Price: @@ -123,7 +123,7 @@ - + From 8bb598287ac1a775fa69afbf111292857cb917f9 Mon Sep 17 00:00:00 2001 From: Ahmed Taha Date: Fri, 27 Mar 2026 15:27:26 +0100 Subject: [PATCH 20/20] [ADD] estate_property: a part from the restrict access tuturial --- estate/__manifest__.py | 3 +++ estate/security/ir.model.access.csv | 16 ++++++++++++---- estate/security/security.xml | 20 ++++++++++++++++++++ 3 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 estate/security/security.xml diff --git a/estate/__manifest__.py b/estate/__manifest__.py index 249aca651f0..f41e0250fb7 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -7,7 +7,10 @@ 'depends': ['base'], + 'category': 'Real Estate/Brokerage', + 'data': [ + 'security/security.xml', 'security/ir.model.access.csv', 'views/estate_property_offers_views.xml', 'views/estate_property_types_views.xml', diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv index 914fe2e076f..47acf06f921 100644 --- a/estate/security/ir.model.access.csv +++ b/estate/security/ir.model.access.csv @@ -1,5 +1,13 @@ id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink -access_estate_property_user,model_access_estate_property,model_estate_property,base.group_user,1,1,1,1 -access_estate_property_type_user,model_access_estate_property_type,model_estate_property_type,base.group_user,1,1,1,1 -access_estate_property_tag_user,model_access_estate_property_tag,model_estate_property_tag,base.group_user,1,1,1,1 -access_estate_property_offer_user,model_access_estate_property_offer,model_estate_property_offer,base.group_user,1,1,1,1 +access_estate_property_user,access_estate_property,model_estate_property,base.group_user,1,1,0,0 +access_estate_property_agent,access_estate_property,model_estate_property,estate_group_user,1,1,0,0 +access_estate_property_manager,access_estate_property,model_estate_property,estate_group_manager,1,1,1,1 + +access_estate_property_type_user,access_estate_property_type,model_estate_property_type,estate_group_user,1,1,0,0 +access_estate_property_type_manager,access_estate_property_type,model_estate_property_type,estate_group_manager,1,1,1,1 + +access_estate_property_tag_user,access_estate_property_tag,model_estate_property_tag,estate_group_user,1,1,0,0 +access_estate_property_tag_manager,access_estate_property_tag,model_estate_property_tag,estate_group_manager,1,1,1,1 + +access_estate_property_offer_user,access_estate_property_offer,model_estate_property_offer,estate_group_user,1,1,0,0 +access_estate_property_offer_manager,access_estate_property_offer,model_estate_property_offer,estate_group_manager,1,1,1,1 diff --git a/estate/security/security.xml b/estate/security/security.xml new file mode 100644 index 00000000000..0e5a6dd5fcc --- /dev/null +++ b/estate/security/security.xml @@ -0,0 +1,20 @@ + + + + Real Estate + + + + + Agent + + + + + + Manager + + + + + \ No newline at end of file