From e778fbb5e7f73adccff1bada6fbc9b6531016fe7 Mon Sep 17 00:00:00 2001 From: Vincent Janssen Date: Wed, 10 Dec 2025 12:40:41 +0100 Subject: [PATCH 01/15] [IMP] estate: Server101 Finished Chapter 2 --- estate/__init__.py | 0 estate/__manifest__.py | 12 ++++++++++++ 2 files changed, 12 insertions(+) create mode 100644 estate/__init__.py create mode 100644 estate/__manifest__.py diff --git a/estate/__init__.py b/estate/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/estate/__manifest__.py b/estate/__manifest__.py new file mode 100644 index 00000000000..26ba89d707b --- /dev/null +++ b/estate/__manifest__.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- +{ + 'name':"estate", + 'description':"test", + 'depends': [ + 'base_setup' + ], + 'category': "Tutorials", + 'installable': True, + 'application': True + +} \ No newline at end of file From 79dd837a09eeb06086a70c8af2335128be148e68 Mon Sep 17 00:00:00 2001 From: Vincent Janssen Date: Wed, 10 Dec 2025 14:17:28 +0100 Subject: [PATCH 02/15] [IMP] estate: Server101 Finished Chapter 3 --- estate/__init__.py | 1 + estate/models/__init__.py | 1 + estate/models/estate_property.py | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+) 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 index e69de29bb2d..9a7e03eded3 100644 --- a/estate/__init__.py +++ b/estate/__init__.py @@ -0,0 +1 @@ +from . import models \ 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..c66a1442a74 --- /dev/null +++ b/estate/models/estate_property.py @@ -0,0 +1,18 @@ +from odoo import fields, models + +class EstateProperty(models.Model): + _name = "estate.property" + _description = "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')]) From 2e0633cc7f3f3325b4f39c7fc10be3401e2e784e Mon Sep 17 00:00:00 2001 From: Vincent Janssen Date: Wed, 10 Dec 2025 14:35:27 +0100 Subject: [PATCH 03/15] [IMP] estate: Server101 Finished Chapter 4 --- estate/__manifest__.py | 3 ++- estate/security/ir.model.access.csv | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 estate/security/ir.model.access.csv diff --git a/estate/__manifest__.py b/estate/__manifest__.py index 26ba89d707b..43f48ab6ce0 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -7,6 +7,7 @@ ], 'category': "Tutorials", 'installable': True, - 'application': True + 'application': 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..de807a22966 --- /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 \ No newline at end of file From c3b8617a437a9d93909df3ebd07ec0b9571c3c2b Mon Sep 17 00:00:00 2001 From: Vincent Janssen Date: Thu, 11 Dec 2025 09:30:22 +0100 Subject: [PATCH 04/15] [IMP] estate: Server101 Finished Chapter 5 --- estate/__manifest__.py | 2 +- estate/models/estate_property.py | 15 ++++++++++----- estate/security/ir.model.access.csv | 2 +- estate/views/estate_menu_view.xml | 8 ++++++++ estate/views/estate_property_views.xml | 9 +++++++++ 5 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 estate/views/estate_menu_view.xml create mode 100644 estate/views/estate_property_views.xml diff --git a/estate/__manifest__.py b/estate/__manifest__.py index 43f48ab6ce0..5b76ef8fc69 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -8,6 +8,6 @@ 'category': "Tutorials", 'installable': True, 'application': True, - 'data':['security/ir.model.access.csv'] + 'data':['views/estate_property_views.xml','views/estate_menu_view.xml','security/ir.model.access.csv'] } \ No newline at end of file diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index c66a1442a74..08f20e8ca30 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -1,18 +1,23 @@ +from dateutil.relativedelta import relativedelta from odoo import fields, models + class EstateProperty(models.Model): _name = "estate.property" _description = "Property" - name = fields.Char(required=True) + state = fields.Selection(selection = [("New","New"), ("Offer_Received","Offer Received") ,("Offer_Accepted","Offer Accepted"), ("Sold","Sold"), ("Cancelled","Cancelled")]) + active = fields.Boolean('Active',default=True) + name = fields.Char(required=True,default="Unkown") description = fields.Text() postcode = fields.Char() - date_availability = fields.Date() + date_availability = fields.Date(copy=False,default= fields.Datetime.today() + relativedelta(months=3)) + last_seen= fields.Date("Last Seen", default=fields.Datetime.now) 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')]) + garden_orientation = fields.Selection(selection=[('North','North'),('South','South'),('East','East'),('West','West')]) diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv index de807a22966..347176a201b 100644 --- a/estate/security/ir.model.access.csv +++ b/estate/security/ir.model.access.csv @@ -1,2 +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 \ No newline at end of file +access_estate_property_model,access_estate_property_model,model_estate_property,base.group_user,1,1,1,1 \ No newline at end of file diff --git a/estate/views/estate_menu_view.xml b/estate/views/estate_menu_view.xml new file mode 100644 index 00000000000..936c6278cc7 --- /dev/null +++ b/estate/views/estate_menu_view.xml @@ -0,0 +1,8 @@ + + + + + + + + \ 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..270a0d91c74 --- /dev/null +++ b/estate/views/estate_property_views.xml @@ -0,0 +1,9 @@ + + + + + Property + estate.property + list,form + + \ No newline at end of file From 136d519699ab29e80b52db2b17123f78db8713c1 Mon Sep 17 00:00:00 2001 From: Vincent Janssen Date: Thu, 11 Dec 2025 10:34:40 +0100 Subject: [PATCH 05/15] [IMP] estate: Server101 Finished Chapter 6 --- estate/models/estate_property.py | 2 +- estate/views/estate_property_views.xml | 71 ++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 08f20e8ca30..4c44c24649b 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -10,7 +10,7 @@ class EstateProperty(models.Model): name = fields.Char(required=True,default="Unkown") description = fields.Text() postcode = fields.Char() - date_availability = fields.Date(copy=False,default= fields.Datetime.today() + relativedelta(months=3)) + date_availability = fields.Date("Available From",copy=False,default= fields.Datetime.today() + relativedelta(months=3)) last_seen= fields.Date("Last Seen", default=fields.Datetime.now) expected_price = fields.Float(required=True) selling_price = fields.Float(readonly=True,copy=False) diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index 270a0d91c74..744b21ee422 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -6,4 +6,75 @@ estate.property list,form + + + estate.property.list + estate.property + + + + + + + + + + + + + estate.property.form + estate.property + +
+ + +

+ +

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + estate.property.search + estate.property + + + + + + + + + + + + + \ No newline at end of file From 2d93191cc7edb5e47cb82310fd4258ef21f5f2b0 Mon Sep 17 00:00:00 2001 From: Vincent Janssen Date: Thu, 11 Dec 2025 12:54:34 +0100 Subject: [PATCH 06/15] [IMP] estate: Server101 Finished Chapter 7 --- estate/__manifest__.py | 8 ++++- estate/models/__init__.py | 5 ++- estate/models/estate_property.py | 6 ++++ 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_menu_view.xml | 8 ----- estate/views/estate_menu_views.xml | 12 ++++++++ estate/views/estate_property_offer_views.xml | 32 ++++++++++++++++++++ estate/views/estate_property_tag_views.xml | 24 +++++++++++++++ estate/views/estate_property_type_views.xml | 26 ++++++++++++++++ estate/views/estate_property_views.xml | 14 +++++++++ 13 files changed, 153 insertions(+), 11 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 delete mode 100644 estate/views/estate_menu_view.xml create mode 100644 estate/views/estate_menu_views.xml 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 5b76ef8fc69..880872e3b13 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -8,6 +8,12 @@ 'category': "Tutorials", 'installable': True, 'application': True, - 'data':['views/estate_property_views.xml','views/estate_menu_view.xml','security/ir.model.access.csv'] + 'data':[ + 'views/estate_property_views.xml', + 'views/estate_property_type_views.xml', + 'views/estate_property_tag_views.xml', + 'views/estate_property_offer_views.xml', + 'views/estate_menu_views.xml', + 'security/ir.model.access.csv'] } \ No newline at end of file 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 4c44c24649b..299c6a5ff9f 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -21,3 +21,9 @@ class EstateProperty(models.Model): garden = fields.Boolean() garden_area = fields.Integer() garden_orientation = fields.Selection(selection=[('North','North'),('South','South'),('East','East'),('West','West')]) + property_type_id = fields.Many2one("estate.property.type",string="Type") + buyer_id = fields.Many2one("res.partner",string="Buyer") + seller_id = fields.Many2one("res.users",default=lambda self : self.env.user,string="Seller") + 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..bea8e2d9df6 --- /dev/null +++ b/estate/models/estate_property_offer.py @@ -0,0 +1,10 @@ +from odoo import fields, models + + +class EstatePropertyOffer(models.Model): + _name = "estate.property.offer" + _description = "Property Offer" + price = fields.Float(string="Price"); + status = fields.Selection(copy=False,selection = [("Accepted","Accepted"),("Refused","Refused")]) + 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..941f6cd821d --- /dev/null +++ b/estate/models/estate_property_tag.py @@ -0,0 +1,7 @@ +from odoo import fields, models + + +class EstatePropertyTag(models.Model): + _name = "estate.property.tag" + _description = "Property Tag" + name = fields.Char(required=True) \ No newline at end of file diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py new file mode 100644 index 00000000000..513e520e7d5 --- /dev/null +++ b/estate/models/estate_property_type.py @@ -0,0 +1,7 @@ +from odoo import fields, models + + +class EstatePropertyType(models.Model): + _name = "estate.property.type" + _description = "Property Type" + name = fields.Char(required=True) \ No newline at end of file diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv index 347176a201b..6c222d735e3 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_model,access_estate_property_model,model_estate_property,base.group_user,1,1,1,1 \ No newline at end of file +access_estate_property_model,access_estate_property_model,model_estate_property,base.group_user,1,1,1,1 +access_estate_property_type_model,access_estate_property_type_model,model_estate_property_type,base.group_user,1,1,1,1 +access_estate_property_tag_model,access_estate_property_tag_model,model_estate_property_tag,base.group_user,1,1,1,1 +access_estate_property_offer_model,access_estate_property_offer_model,model_estate_property_offer,base.group_user,1,1,1,1 \ No newline at end of file diff --git a/estate/views/estate_menu_view.xml b/estate/views/estate_menu_view.xml deleted file mode 100644 index 936c6278cc7..00000000000 --- a/estate/views/estate_menu_view.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/estate/views/estate_menu_views.xml b/estate/views/estate_menu_views.xml new file mode 100644 index 00000000000..6d70ea7a5ed --- /dev/null +++ b/estate/views/estate_menu_views.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/estate/views/estate_property_offer_views.xml b/estate/views/estate_property_offer_views.xml new file mode 100644 index 00000000000..87e686c04ab --- /dev/null +++ b/estate/views/estate_property_offer_views.xml @@ -0,0 +1,32 @@ + + + + + estate.property.offer.form + estate.property.offer + +
+ + + + + + + +
+ + + + + estate.property.offer.list + estate.property.offer + + + + + + + + + + \ No newline at end of file diff --git a/estate/views/estate_property_tag_views.xml b/estate/views/estate_property_tag_views.xml new file mode 100644 index 00000000000..18330c81c29 --- /dev/null +++ b/estate/views/estate_property_tag_views.xml @@ -0,0 +1,24 @@ + + + + + Property Tag + estate.property.tag + list,form + + + + estate.property.tag.form + estate.property.tag + +
+ + + + + +
+ + + + \ No newline at end of file diff --git a/estate/views/estate_property_type_views.xml b/estate/views/estate_property_type_views.xml new file mode 100644 index 00000000000..d4d9a4c1a5e --- /dev/null +++ b/estate/views/estate_property_type_views.xml @@ -0,0 +1,26 @@ + + + + + Property Type + estate.property.type + list,form + + + + estate.property.type.form + estate.property.type + +
+ + +

+ +

+ + +
+ + + + \ No newline at end of file diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index 744b21ee422..9a875fad798 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -32,8 +32,12 @@ + + + + @@ -55,6 +59,16 @@ + + + + + + + + + + From 5952c234cac6af65580cab7fe3d34fe81eb5c562 Mon Sep 17 00:00:00 2001 From: Vincent Janssen Date: Thu, 11 Dec 2025 16:22:54 +0100 Subject: [PATCH 07/15] [IMP] estate: Server101 Finished Chapter 8 --- estate/models/estate_property.py | 30 ++++++++++++++++++-- estate/models/estate_property_offer.py | 17 +++++++++-- estate/views/estate_property_offer_views.xml | 4 +++ estate/views/estate_property_views.xml | 2 ++ 4 files changed, 49 insertions(+), 4 deletions(-) diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 299c6a5ff9f..5f1a1eed287 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -1,5 +1,5 @@ from dateutil.relativedelta import relativedelta -from odoo import fields, models +from odoo import fields, models,api class EstateProperty(models.Model): @@ -14,6 +14,7 @@ class EstateProperty(models.Model): last_seen= fields.Date("Last Seen", default=fields.Datetime.now) expected_price = fields.Float(required=True) selling_price = fields.Float(readonly=True,copy=False) + best_price = fields.Float(string="Best Price",compute="_get_best_price") bedrooms = fields.Integer(default=2) living_area = fields.Integer() facades = fields.Integer() @@ -21,9 +22,34 @@ class EstateProperty(models.Model): garden = fields.Boolean() garden_area = fields.Integer() garden_orientation = fields.Selection(selection=[('North','North'),('South','South'),('East','East'),('West','West')]) + total_area = fields.Float(compute="_get_total_area",string="Total Area"); property_type_id = fields.Many2one("estate.property.type",string="Type") buyer_id = fields.Many2one("res.partner",string="Buyer") seller_id = fields.Many2one("res.users",default=lambda self : self.env.user,string="Seller") 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 + + @api.depends('living_area','garden_area') + def _get_total_area(self): + for record in self: + record.total_area = record.garden_area + record.living_area; + + + @api.depends('offer_ids') + def _get_best_price(self): + for record in self: + max:int = 0 + + if(len(record.offer_ids)==0): + record.best_price = 0; + continue + + for offer in record.offer_ids: + if(offer.price >= max): + max = offer.price + record.best_price = max + + @api.onchange("garden") + def _garden_pre_fill(self): + self.garden_area = 10 if self.garden else 0 + self.garden_orientation = 'North' if self.garden else '' \ No newline at end of file diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py index bea8e2d9df6..1dc81a540fc 100644 --- a/estate/models/estate_property_offer.py +++ b/estate/models/estate_property_offer.py @@ -1,10 +1,23 @@ -from odoo import fields, models +from datetime import datetime, time +from dateutil.relativedelta import relativedelta +from odoo import fields, models, api class EstatePropertyOffer(models.Model): _name = "estate.property.offer" _description = "Property Offer" - price = fields.Float(string="Price"); + price = fields.Float(string="Price") status = fields.Selection(copy=False,selection = [("Accepted","Accepted"),("Refused","Refused")]) partner_id = fields.Many2one('res.partner',required=True) property_id = fields.Many2one('estate.property', required=True) + validity = fields.Integer(string="Validity Duration",default=7) + date_deadline = fields.Date(string="Deadline",compute="_get_date_deadline",inverse="_set_date_deadline") + + @api.depends("validity") + def _get_date_deadline(self): + for record in self: + record.date_deadline = record.create_date + relativedelta(days=record.validity) + + def _set_date_deadline(self): + for record in self: + record.validity = (datetime.combine(record.date_deadline,time()) - record.create_date).days diff --git a/estate/views/estate_property_offer_views.xml b/estate/views/estate_property_offer_views.xml index 87e686c04ab..008f388f011 100644 --- a/estate/views/estate_property_offer_views.xml +++ b/estate/views/estate_property_offer_views.xml @@ -11,6 +11,8 @@ + + @@ -25,6 +27,8 @@ + + diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index 9a875fad798..0b4864c6771 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -44,6 +44,7 @@ + @@ -57,6 +58,7 @@ + From 54906075c1a6507057c4a2fba9ce9f17c6ada54e Mon Sep 17 00:00:00 2001 From: Vincent Janssen Date: Fri, 12 Dec 2025 09:51:49 +0100 Subject: [PATCH 08/15] [IMP] estate: Server101 Finished Chapter 9 --- estate/models/estate_property.py | 18 ++++++++++++++++-- estate/models/estate_property_offer.py | 20 ++++++++++++++++++++ estate/views/estate_property_offer_views.xml | 4 +++- estate/views/estate_property_views.xml | 5 +++++ 4 files changed, 44 insertions(+), 3 deletions(-) diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 5f1a1eed287..38f372d7758 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -1,5 +1,5 @@ from dateutil.relativedelta import relativedelta -from odoo import fields, models,api +from odoo import fields, models,api,exceptions class EstateProperty(models.Model): @@ -29,6 +29,20 @@ class EstateProperty(models.Model): tag_ids = fields.Many2many("estate.property.tag",string="Tags") offer_ids = fields.One2many("estate.property.offer","property_id",string="Offers") + def sell_property(self): + for record in self: + if(record.state == "Cancelled"): + raise exceptions.UserError("Can't sell cancelled property.") + record.state = "Sold" + return True + + def cancel_property(self): + for record in self: + if(record.state == "Sold"): + raise exceptions.UserError("Can't cancel sold property.") + record.state = "Cancelled" + return True + @api.depends('living_area','garden_area') def _get_total_area(self): for record in self: @@ -41,7 +55,7 @@ def _get_best_price(self): max:int = 0 if(len(record.offer_ids)==0): - record.best_price = 0; + record.best_price = 0 continue for offer in record.offer_ids: diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py index 1dc81a540fc..0fcf85b1d33 100644 --- a/estate/models/estate_property_offer.py +++ b/estate/models/estate_property_offer.py @@ -13,9 +13,29 @@ class EstatePropertyOffer(models.Model): validity = fields.Integer(string="Validity Duration",default=7) date_deadline = fields.Date(string="Deadline",compute="_get_date_deadline",inverse="_set_date_deadline") + def accept_offer(self): + for record in self: + if(record.property_id.selling_price == 0): + record.status = "Accepted"; + print(type(record.property_id.seller_id)) + print(type(record.partner_id)) + record.property_id.buyer_id = record.partner_id; + record.property_id.selling_price = record.price; + + return True; + + def refused_offer(self): + for record in self: + record.status = "Refused"; + return True; + + @api.depends("validity") def _get_date_deadline(self): for record in self: + if(isinstance(record.create_date,bool)): + record.date_deadline = fields.Datetime.now() + relativedelta(days=record.validity) + return record.date_deadline = record.create_date + relativedelta(days=record.validity) def _set_date_deadline(self): diff --git a/estate/views/estate_property_offer_views.xml b/estate/views/estate_property_offer_views.xml index 008f388f011..34c6351a34a 100644 --- a/estate/views/estate_property_offer_views.xml +++ b/estate/views/estate_property_offer_views.xml @@ -26,9 +26,11 @@ - +

diff --git a/estate_account/__init__.py b/estate_account/__init__.py new file mode 100644 index 00000000000..0650744f6bc --- /dev/null +++ b/estate_account/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/estate_account/__manifest__.py b/estate_account/__manifest__.py new file mode 100644 index 00000000000..341b8a7db19 --- /dev/null +++ b/estate_account/__manifest__.py @@ -0,0 +1,14 @@ +{ + 'name': "estate_account", + 'description': "link the estate module to the invoiceing module", + 'depends': [ + 'base_setup', 'estate', 'account' + ], + 'category': "Tutorials", + 'installable': True, + 'application': False, + 'data': [], + 'author': 'Odoo S.A.', + 'license': 'LGPL-3' + +} diff --git a/estate_account/models/__init__.py b/estate_account/models/__init__.py new file mode 100644 index 00000000000..5e1963c9d2f --- /dev/null +++ b/estate_account/models/__init__.py @@ -0,0 +1 @@ +from . import estate_property diff --git a/estate_account/models/estate_property.py b/estate_account/models/estate_property.py new file mode 100644 index 00000000000..b37e980a120 --- /dev/null +++ b/estate_account/models/estate_property.py @@ -0,0 +1,27 @@ +from odoo import models, Command + + +class EstateProperty(models.Model): + _inherit = "estate.property" + + def sell_property(self): + for record in self: + invoice_val = { + 'state': 'draft', + 'move_type': 'out_invoice', + 'partner_id': int(record.buyer_id), + 'line_ids': [ + Command.create({ + "name": "First Payment", + "quantity": 1, + "price_unit": record.selling_price * 0.06 + }), + Command.create({ + "name": "Administrative Fees", + "quantity": 1, + "price_unit": 100.00 + }) + ] + } + self.env['account.move'].sudo().with_context(default_move_type='out_invoice').create(invoice_val) + return super().sell_property() From 165fe70367dd1750c02a6e47f83e926ffd97ac64 Mon Sep 17 00:00:00 2001 From: VincentJanssen-Code Date: Thu, 18 Dec 2025 09:41:51 +0100 Subject: [PATCH 13/15] [IMP] estate: Server101 Finshed Chapter 14 --- estate/views/estate_property_views.xml | 29 +++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index 4a1080e502f..faac3e6775c 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -4,7 +4,7 @@ Property estate.property - list,form + list,form,kanban {'search_default_available':True} @@ -101,4 +101,31 @@ + + + estate.property.kanban + estate.property + + + + + +
+ +

+ +
+ +
+ +
+
+ +
+ + + + + + \ No newline at end of file From e70a0b6b6b05b594a7eb50c46b40bd55b4322ca2 Mon Sep 17 00:00:00 2001 From: VincentJanssen-Code Date: Thu, 18 Dec 2025 13:01:44 +0100 Subject: [PATCH 14/15] [FIX] estate: Added error message translation useing self.env._() and applied fix in the PR --- .gitignore | 1 - estate/i18n/estate.pot | 500 +++++++++++++++++++ estate/models/estate_property.py | 46 +- estate/models/estate_property_offer.py | 13 +- estate/models/estate_property_tag.py | 2 +- estate/models/estate_property_type.py | 4 +- estate/security/ir.model.access.csv | 2 +- estate/views/estate_menu_views.xml | 2 +- estate/views/estate_property_offer_views.xml | 15 +- estate/views/estate_property_tag_views.xml | 17 +- estate/views/estate_property_views.xml | 2 +- 11 files changed, 547 insertions(+), 57 deletions(-) create mode 100644 estate/i18n/estate.pot diff --git a/.gitignore b/.gitignore index b6e47617de1..63a8dfbb408 100644 --- a/.gitignore +++ b/.gitignore @@ -53,7 +53,6 @@ coverage.xml # Translations *.mo -*.pot # Django stuff: *.log diff --git a/estate/i18n/estate.pot b/estate/i18n/estate.pot new file mode 100644 index 00000000000..4e95f72c03b --- /dev/null +++ b/estate/i18n/estate.pot @@ -0,0 +1,500 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * estate +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 19.0+e\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-12-18 09:47+0000\n" +"PO-Revision-Date: 2025-12-18 09:47+0000\n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.estate_property_type_model_form +msgid "" +"\n" +" Offers\n" +" " +msgstr "" + +#. module: estate +#: model:ir.model.constraint,message:estate.constraint_estate_property_offer_postif_price +#: model:ir.model.constraint,message:estate.constraint_estate_property_positif_expected_price +#: model:ir.model.constraint,message:estate.constraint_estate_property_positif_selling_price +msgid "A price can't be negatif" +msgstr "" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.estate_property_offer_view_list +msgid "Accept" +msgstr "" + +#. module: estate +#: model:ir.model.fields.selection,name:estate.selection__estate_property_offer__status__accepted +msgid "Accepted" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__active +msgid "Active" +msgstr "" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.estate_property_model_search +msgid "Available" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__date_availability +msgid "Available From" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__best_price +#: model_terms:ir.ui.view,arch_db:estate.estate_property_model_kanban +msgid "Best Price" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__buyer_id +msgid "Buyer" +msgstr "" + +#. module: estate +#. odoo-python +#: code:addons/estate/models/estate_property.py:0 +msgid "Can't cancel sold property." +msgstr "" + +#. module: estate +#. odoo-python +#: code:addons/estate/models/estate_property.py:0 +msgid "Can't delete non-new and non-cancelled property" +msgstr "" + +#. module: estate +#. odoo-python +#: code:addons/estate/models/estate_property.py:0 +msgid "Can't sell cancelled property." +msgstr "" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.estate_property_model_form +msgid "Cancel" +msgstr "" + +#. module: estate +#: model:ir.model.fields.selection,name:estate.selection__estate_property__state__cancelled +msgid "Cancelled" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property_tag__color +msgid "Color" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__garage +msgid "Contains a Garage ?" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__garden +msgid "Contains a Garden ?" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__create_uid +#: model:ir.model.fields,field_description:estate.field_estate_property_offer__create_uid +#: model:ir.model.fields,field_description:estate.field_estate_property_tag__create_uid +#: model:ir.model.fields,field_description:estate.field_estate_property_type__create_uid +msgid "Created by" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__create_date +#: model:ir.model.fields,field_description:estate.field_estate_property_offer__create_date +#: model:ir.model.fields,field_description:estate.field_estate_property_tag__create_date +#: model:ir.model.fields,field_description:estate.field_estate_property_type__create_date +msgid "Created on" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property_offer__date_deadline +msgid "Deadline" +msgstr "" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.estate_property_model_form +msgid "Description" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__display_name +#: model:ir.model.fields,field_description:estate.field_estate_property_offer__display_name +#: model:ir.model.fields,field_description:estate.field_estate_property_tag__display_name +#: model:ir.model.fields,field_description:estate.field_estate_property_type__display_name +#: model:ir.model.fields,field_description:estate.field_res_users__display_name +msgid "Display Name" +msgstr "" + +#. module: estate +#: model:ir.model.fields.selection,name:estate.selection__estate_property__garden_orientation__east +msgid "East" +msgstr "" + +#. module: estate +#: model:ir.ui.menu,name:estate.estate_menu_root +msgid "Estate" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__expected_price +#: model_terms:ir.ui.view,arch_db:estate.estate_property_model_kanban +msgid "Expected Price" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__garden_area +msgid "Garden Area Size m^2" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__garden_orientation +msgid "Garden orientation" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__id +#: model:ir.model.fields,field_description:estate.field_estate_property_offer__id +#: model:ir.model.fields,field_description:estate.field_estate_property_tag__id +#: model:ir.model.fields,field_description:estate.field_estate_property_type__id +#: model:ir.model.fields,field_description:estate.field_res_users__id +msgid "ID" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__last_seen +msgid "Last Seen" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__write_uid +#: model:ir.model.fields,field_description:estate.field_estate_property_offer__write_uid +#: model:ir.model.fields,field_description:estate.field_estate_property_tag__write_uid +#: model:ir.model.fields,field_description:estate.field_estate_property_type__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__write_date +#: model:ir.model.fields,field_description:estate.field_estate_property_offer__write_date +#: model:ir.model.fields,field_description:estate.field_estate_property_tag__write_date +#: model:ir.model.fields,field_description:estate.field_estate_property_type__write_date +msgid "Last Updated on" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__living_area +msgid "Living Area Size m^2" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__name +#: model:ir.model.fields,field_description:estate.field_estate_property_tag__name +#: model:ir.model.fields,field_description:estate.field_estate_property_type__name +msgid "Name" +msgstr "" + +#. module: estate +#: model:ir.model.fields.selection,name:estate.selection__estate_property__state__new +msgid "New" +msgstr "" + +#. module: estate +#: model:ir.model.fields.selection,name:estate.selection__estate_property__garden_orientation__north +msgid "North" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__facades +msgid "Number of Facades" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property_type__offer_count +msgid "Number of Offers" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__bedrooms +msgid "Number of bedrooms" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property_type__offer_ids +msgid "Offer" +msgstr "" + +#. module: estate +#: model:ir.model.fields.selection,name:estate.selection__estate_property__state__offer_accepted +msgid "Offer Accepted" +msgstr "" + +#. module: estate +#: model:ir.model.fields.selection,name:estate.selection__estate_property__state__offer_received +msgid "Offer Received" +msgstr "" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.estate_property_offer_view_list +msgid "Offer Sender" +msgstr "" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.estate_property_offer_view_list +msgid "Offer deadline" +msgstr "" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.estate_property_offer_view_list +msgid "Offer validity time (days)" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__offer_ids +#: model_terms:ir.ui.view,arch_db:estate.estate_property_model_form +#: model_terms:ir.ui.view,arch_db:estate.estate_property_type_model_form +msgid "Offers" +msgstr "" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.estate_property_model_form +msgid "Other Info" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property_offer__partner_id +#: model_terms:ir.ui.view,arch_db:estate.estate_property_offer_model_form +msgid "Partner" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__postcode +msgid "Postcode" +msgstr "" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.estate_property_model_search +msgid "Postcodes" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property_offer__price +#: model_terms:ir.ui.view,arch_db:estate.estate_property_offer_model_form +#: model_terms:ir.ui.view,arch_db:estate.estate_property_offer_view_list +msgid "Price" +msgstr "" + +#. module: estate +#: model:ir.actions.act_window,name:estate.estate_property_model_action +#: model:ir.model,name:estate.model_estate_property +#: model:ir.model.fields,field_description:estate.field_estate_property_offer__property_id +#: model:ir.model.fields,field_description:estate.field_estate_property_type__property_ids +#: model:ir.model.fields,field_description:estate.field_res_users__property_ids +#: model:ir.ui.menu,name:estate.estate_property_menu +#: model:ir.ui.menu,name:estate.estate_property_menu_action +msgid "Property" +msgstr "" + +#. module: estate +#: model:ir.actions.act_window,name:estate.estate_property_offer_model_action +#: model:ir.model,name:estate.model_estate_property_offer +msgid "Property Offer" +msgstr "" + +#. module: estate +#: model:ir.actions.act_window,name:estate.estate_property_tag_model_action +#: model:ir.model,name:estate.model_estate_property_tag +#: model:ir.ui.menu,name:estate.estate_property_tag_menu_acion +msgid "Property Tag" +msgstr "" + +#. module: estate +#: model:ir.actions.act_window,name:estate.estate_property_type_model_action +#: model:ir.model,name:estate.model_estate_property_type +#: model:ir.ui.menu,name:estate.estate_property_type_menu_acion +msgid "Property Type" +msgstr "" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.estate_property_model_form +#: model_terms:ir.ui.view,arch_db:estate.estate_property_tag_model_form +#: model_terms:ir.ui.view,arch_db:estate.estate_property_view_list +msgid "Property list" +msgstr "" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.estate_property_offer_model_form +msgid "Property offer form" +msgstr "" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.estate_property_offer_view_list +msgid "Property offer list" +msgstr "" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.estate_property_model_search +msgid "Property search" +msgstr "" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.estate_property_tag_model_list +msgid "Property tag list" +msgstr "" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.estate_property_offer_view_list +msgid "Property type" +msgstr "" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.estate_property_type_model_form +msgid "Property type Form" +msgstr "" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.estate_property_type_model_list +msgid "Property type list" +msgstr "" + +#. module: estate +#: model:ir.model.constraint,message:estate.constraint_estate_property_type_unique_type +msgid "Property type name must be unique in database" +msgstr "" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.res_users_view_form +msgid "Real Estate Properties" +msgstr "" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.estate_property_offer_view_list +msgid "Refuse" +msgstr "" + +#. module: estate +#: model:ir.model.fields.selection,name:estate.selection__estate_property_offer__status__refused +msgid "Refused" +msgstr "" + +#. module: estate +#: model_terms:ir.ui.view,arch_db:estate.estate_property_model_form +msgid "Sell" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__seller_id +msgid "Seller" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__selling_price +#: model_terms:ir.ui.view,arch_db:estate.estate_property_model_kanban +msgid "Selling Price" +msgstr "" + +#. module: estate +#. odoo-python +#: code:addons/estate/models/estate_property.py:0 +msgid "Selling price is too low %(price)s" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property_type__sequence +msgid "Sequence" +msgstr "" + +#. module: estate +#: model:ir.ui.menu,name:estate.estate_settings_menu +msgid "Settings" +msgstr "" + +#. module: estate +#: model:ir.model.fields.selection,name:estate.selection__estate_property__state__sold +msgid "Sold" +msgstr "" + +#. module: estate +#: model:ir.model.fields.selection,name:estate.selection__estate_property__garden_orientation__south +msgid "South" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__state +msgid "State" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property_offer__status +msgid "Status" +msgstr "" + +#. module: estate +#: model:ir.model.constraint,message:estate.constraint_estate_property_tag_unique_tag +msgid "Tag name must be unique in database" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__tag_ids +msgid "Tags" +msgstr "" + +#. module: estate +#. odoo-python +#: code:addons/estate/models/estate_property_offer.py:0 +msgid "This offer is lower than what has already been offered." +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__total_area +msgid "Total Area m^2" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__property_type_id +#: model:ir.model.fields,field_description:estate.field_estate_property_offer__property_type_id +msgid "Type" +msgstr "" + +#. module: estate +#: model:ir.model,name:estate.model_res_users +msgid "User" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property_offer__validity +msgid "Validity Duration" +msgstr "" + +#. module: estate +#: model:ir.model.fields.selection,name:estate.selection__estate_property__garden_orientation__west +msgid "West" +msgstr "" + +#. module: estate +#: model:ir.model.fields,field_description:estate.field_estate_property__description +msgid "description" +msgstr "" + +#. module: estate +#: model:ir.model.fields,help:estate.field_estate_property_type__sequence +msgid "use to order the list inside the type view" +msgstr "" diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 930e5f282a0..6515699f95e 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -21,27 +21,27 @@ class EstateProperty(models.Model): ], default='new') active = fields.Boolean('Active', default=True) - name = fields.Char(required=True, default="Unkown") - description = fields.Text() - postcode = fields.Char() - date_availability = fields.Date("Available From", copy=False, default=lambda self: fields.Datetime.today() + relativedelta(months=3)) - last_seen = fields.Date("Last Seen", default=lambda self: fields.Datetime.now()) - expected_price = fields.Float(required=True) - selling_price = fields.Float(readonly=True, copy=False) + name = fields.Char(required=True, default="Unknown", string="Name") + description = fields.Text(string="description") + postcode = fields.Char(string="Postcode") + date_availability = fields.Date(string="Available From", copy=False, default=lambda self: fields.Datetime.today() + relativedelta(months=3)) + last_seen = fields.Date(string="Last Seen", default=lambda self: fields.Datetime.now()) + expected_price = fields.Float(required=True, string="Expected Price") + selling_price = fields.Float(readonly=True, copy=False, string="Selling Price") best_price = fields.Float(string="Best Price", compute="_compute_best_price") - 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=[ + bedrooms = fields.Integer(default=2, string="Number of bedrooms") + living_area = fields.Integer(string="Living Area Size m^2") + facades = fields.Integer(string="Number of Facades") + garage = fields.Boolean(string="Contains a Garage ?") + garden = fields.Boolean(string="Contains a Garden ?") + garden_area = fields.Integer(string="Garden Area Size m^2") + garden_orientation = fields.Selection(string="Garden orientation", selection=[ ('north', 'North'), ('south', 'South'), ('east', 'East'), ('west', 'West')]) - total_area = fields.Float(compute="_compute_total_area", string="Total Area") + total_area = fields.Float(string="Total Area m^2", compute="_compute_total_area") property_type_id = fields.Many2one("estate.property.type", string="Type") buyer_id = fields.Many2one("res.partner", string="Buyer") seller_id = fields.Many2one("res.users", default=lambda self: self.env.user, string="Seller") @@ -51,14 +51,14 @@ class EstateProperty(models.Model): def sell_property(self): for record in self: if (record.state == "cancelled"): - raise UserError("Can't sell cancelled property.") + raise UserError(self.env._("Can't sell cancelled property.")) record.state = "sold" return True def cancel_property(self): for record in self: if (record.state == "sold"): - raise UserError("Can't cancel sold property.") + raise UserError(self.env._("Can't cancel sold property.")) record.state = "cancelled" return True @@ -73,9 +73,13 @@ def _compute_best_price(self): if (not record.offer_ids): record.best_price = 0 continue - record.best_price = max(record.offer_ids.mapped('price')) + @api.onchange("offer_ids") + def _on_change_offer_ids(self): + if (self.state == 'new' and len(self.offer_ids) != 0): + self.state = 'offer_received' + @api.onchange("garden") def _on_change_garden(self): self.garden_area = 10 if self.garden else 0 @@ -87,10 +91,10 @@ def _constrain_prices(self): if float_is_zero(record.selling_price, 2): continue if (float_compare(record.selling_price, record.expected_price * 0.8, 2) == -1): - raise ValidationError(f"Selling price is too low {record.selling_price}") + raise ValidationError(self.env._("Selling price is too low %(price)s", price=record.selling_price)) @api.ondelete(at_uninstall=False) def _unlink_excpet_cancel_new(self): for record in self: - if (record.state != 'new' and record.state != 'cancel'): - raise UserError("Can't delete non-new and non-cancelled property") + if (record.state != 'new' and record.state != 'cancelled'): + raise UserError(self.env._("Can't delete non-new and non-cancelled property")) diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py index aba1fd27c7e..2725617a495 100644 --- a/estate/models/estate_property_offer.py +++ b/estate/models/estate_property_offer.py @@ -18,7 +18,7 @@ class EstatePropertyOffer(models.Model): ("refused", "Refused")]) partner_id = fields.Many2one('res.partner', required=True) - property_id = fields.Many2one('estate.property', required=True) + property_id = fields.Many2one('estate.property', ondelete='cascade', required=True) property_type_id = fields.Many2one(related="property_id.property_type_id", store=True) validity = fields.Integer(string="Validity Duration", default=7) date_deadline = fields.Date(string="Deadline", compute="_compute_date_deadline", inverse="_inverse_date_deadline") @@ -51,9 +51,10 @@ def _inverse_date_deadline(self): @api.model def create(self, vals_list): - for record in vals_list: - property = self.env['estate.property'].browse(record['property_id']) - if (float_compare(record['price'], property.best_price, 2) == -1): - raise UserError("This offer is lower than what has already been offered.") - property.state = 'offer_received' + property_ids = (val['property_id'] for val in vals_list) + property = self.env['estate.property'].browse(property_ids) + + for i, record in enumerate(vals_list): + if (float_compare(record['price'], property[i].best_price, 2) == -1): + raise UserError(self.env._("This offer is lower than what has already been offered.")) return super().create(vals_list) diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py index 29bd4bd8a18..93b5a4f5606 100644 --- a/estate/models/estate_property_tag.py +++ b/estate/models/estate_property_tag.py @@ -8,5 +8,5 @@ class EstatePropertyTag(models.Model): _unique_tag = models.UniqueIndex("(name)", "Tag name must be unique in database") - name = fields.Char(required=True) + name = fields.Char(string="Name", required=True) color = fields.Integer() diff --git a/estate/models/estate_property_type.py b/estate/models/estate_property_type.py index 300e3a7b443..5b25ae43da9 100644 --- a/estate/models/estate_property_type.py +++ b/estate/models/estate_property_type.py @@ -8,11 +8,11 @@ class EstatePropertyType(models.Model): _unique_type = models.UniqueIndex("(name)", "Property type name must be unique in database") - name = fields.Char(required=True) + name = fields.Char(string="Name", required=True) property_ids = fields.One2many("estate.property", "property_type_id") sequence = fields.Integer('Sequence', default=1, help="use to order the list inside the type view") offer_ids = fields.One2many('estate.property.offer', 'property_type_id') - offer_count = fields.Integer(compute='_compute_offer_count') + offer_count = fields.Integer(string="Number of Offers", compute='_compute_offer_count') @api.depends("offer_ids") def _compute_offer_count(self): diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv index 6c222d735e3..4073dc03078 100644 --- a/estate/security/ir.model.access.csv +++ b/estate/security/ir.model.access.csv @@ -2,4 +2,4 @@ id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink access_estate_property_model,access_estate_property_model,model_estate_property,base.group_user,1,1,1,1 access_estate_property_type_model,access_estate_property_type_model,model_estate_property_type,base.group_user,1,1,1,1 access_estate_property_tag_model,access_estate_property_tag_model,model_estate_property_tag,base.group_user,1,1,1,1 -access_estate_property_offer_model,access_estate_property_offer_model,model_estate_property_offer,base.group_user,1,1,1,1 \ No newline at end of file +access_estate_property_offer_model,access_estate_property_offer_model,model_estate_property_offer,base.group_user,1,1,1,1 diff --git a/estate/views/estate_menu_views.xml b/estate/views/estate_menu_views.xml index 6d70ea7a5ed..20051185c6e 100644 --- a/estate/views/estate_menu_views.xml +++ b/estate/views/estate_menu_views.xml @@ -9,4 +9,4 @@ - \ 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 7186f044cee..f0f32300bcc 100644 --- a/estate/views/estate_property_offer_views.xml +++ b/estate/views/estate_property_offer_views.xml @@ -15,9 +15,8 @@ - + - @@ -31,15 +30,15 @@ estate.property.offer - - - - - + + + + + + + + \ No newline at end of file diff --git a/awesome_owl/static/src/playground.js b/awesome_owl/static/src/playground.js index 4ac769b0aa5..1ed7a1c67b2 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 { Component, useState, markup } 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 }; + todo= {id: 3, description: "buy milk", isCompleted: false }; + html = markup("

Hi

"); + + setup() + { + this.sum = useState({value: 0}); + } + incrementSum() + { + console.log("test this"); + this.sum.value ++; + } + + } diff --git a/awesome_owl/static/src/playground.xml b/awesome_owl/static/src/playground.xml index 4fb905d59f9..ca81b185a35 100644 --- a/awesome_owl/static/src/playground.xml +++ b/awesome_owl/static/src/playground.xml @@ -1,10 +1,12 @@ - -
- hello world + + + + +
+
-