diff --git a/estate/__manifest__.py b/estate/__manifest__.py
index d7cfa57d4c5..201b6c43e2f 100644
--- a/estate/__manifest__.py
+++ b/estate/__manifest__.py
@@ -1,10 +1,21 @@
{
"name": "Estate", # The name that will appear in the App list
- "version": "16.0.0", # Version
+ "version": "18.0.0.24", # Version
"application": True, # This line says the module is an App, and not a module
"depends": ["base"], # dependencies
"data": [
+ # views
+ "views/estate_property_views.xml",
+ "views/estate_property_settings_views.xml",
+ "views/estate_property_offer_views.xml",
+ "views/estate_menus.xml",
+ # security
+ "security/res_groups.xml",
+ "security/ir.model.access.csv",
+ ],
+ "demo": [
+ "demo/demo.xml",
],
"installable": True,
'license': 'LGPL-3',
diff --git a/estate/demo/demo.xml b/estate/demo/demo.xml
new file mode 100644
index 00000000000..2e1e80bd528
--- /dev/null
+++ b/estate/demo/demo.xml
@@ -0,0 +1,8 @@
+
+
+
+ House Number 1
+ 100000
+
+
+
\ No newline at end of file
diff --git a/estate/models.py b/estate/models.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/estate/models/__init__.py b/estate/models/__init__.py
new file mode 100644
index 00000000000..09b2099fe84
--- /dev/null
+++ b/estate/models/__init__.py
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 00000000000..716a77f0292
--- /dev/null
+++ b/estate/models/estate_property.py
@@ -0,0 +1,62 @@
+from odoo import models, fields, api
+
+# this is creating a table
+class RealEstate(models.Model):
+ _name = "estate.property"
+ _description = "Real Estate Property"
+
+ # this is creating fields in the table
+ name = fields.Char(default="House", required=True)
+ description = fields.Text()
+ postcode = fields.Char()
+ date_availability = fields.Date(copy=False, default=fields.Date.add(value=fields.Date.today(), months=3))
+ expected_price = fields.Float(required=True)
+ selling_price = fields.Float(readonly=True, copy=False)
+ bedrooms = fields.Integer(default=3)
+ living_area = fields.Integer()
+ facades = fields.Integer()
+ garage = fields.Boolean()
+ garden = fields.Boolean()
+ garden_area = fields.Integer()
+ garden_orientation = fields.Selection(
+ string='Garden Orientation',
+ selection=[('n', 'North'), ('ne', 'Northeast'), ('e', 'East'), ('se', 'Southeast'), ('s', 'South'),
+ ('sw', 'Southwest'), ('w', 'West'), ('nw', 'Northwest')],
+ help="Denotes which direction the garden is facing"
+ )
+ active = fields.Boolean(default=True)
+ state = fields.Selection(
+ required=True, copy= False, default='new', string='Property Status',
+ selection=[('new', 'New'), ('received', 'Offer Received'), ('accepted', 'Offer Accepted'), ('sold', 'Sold'), ('cancelled', 'Cancelled')],
+ help="Reflects the current status in the sales process"
+ )
+ property_type_id = fields.Many2one("estate.property.type", string="Property Type")
+ salesperson_id = fields.Many2one("res.users", string="Salesperson", default=lambda self: self.env.user)
+ buyer_id = fields.Many2one("res.partner", string="Buyer Name", copy=False)
+ tag_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_price = fields.Float(compute="_compute_best_price")
+
+ @api.depends("living_area", "garden_area")
+ def _compute_total_area(self):
+ for record in self:
+ record.total_area = record.living_area + record.garden_area
+
+ @api.depends("offer_ids.price")
+ def _compute_best_price(self):
+
+ for record in self:
+ if not record.offer_ids:
+ record.best_price = 0
+ else:
+ record.best_price = max(record.offer_ids.mapped('price'))
+
+ @api.onchange("garden")
+ def _onchange_garden(self):
+ if self.garden:
+ self.garden_area=10
+ self.garden_orientation='n'
+ else:
+ self.garden_area=0
+ self.garden_orientation=''
\ 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..897d68d8708
--- /dev/null
+++ b/estate/models/estate_property_offer.py
@@ -0,0 +1,32 @@
+from odoo import models, fields, api
+
+# this is creating a table
+class RealEstate(models.Model):
+ _name = "estate.property.offer"
+ _description = "Real Estate Property Offer"
+
+ # this is creating fields in the table
+ price = fields.Float(copy=False, required=True)
+ status = fields.Selection(
+ default="received", required=True,
+ selection=[('received', 'Offer Received'), ('accepted', 'Offer Accepted'), ('refused', 'Refused')],
+ )
+ partner_id = fields.Many2one('res.partner', required=True)
+ property_id = fields.Many2one('estate.property', required=True)
+ validity = fields.Integer(default = 7, required=True)
+ date_deadline = fields.Date(compute="_compute_deadline", inverse="_inverse_deadline")
+
+ @api.depends("validity")
+ def _compute_deadline(self):
+ for record in self:
+ if not record.create_date:
+ record.date_deadline = fields.Date.add(value=fields.Date.today(), days=record.validity)
+ else:
+ record.date_deadline = fields.Date.add(value=record.create_date, days=record.validity)
+
+ def _inverse_deadline(self):
+ for record in self:
+ if not record.create_date:
+ record.validity = (record.date_deadline - fields.Date.today()).days
+ else:
+ record.validity = (record.date_deadline - fields.Date.to_date(record.create_date)).days
\ No newline at end of file
diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py
new file mode 100644
index 00000000000..df83acbd43c
--- /dev/null
+++ b/estate/models/estate_property_tag.py
@@ -0,0 +1,9 @@
+from odoo import models, fields
+
+# this is creating a table
+class RealEstate(models.Model):
+ _name = "estate.property.tag"
+ _description = "Real Estate Property Tags"
+
+ # this is creating fields in the table
+ name = fields.Char(copy=False, 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..c52f045254f
--- /dev/null
+++ b/estate/models/estate_property_type.py
@@ -0,0 +1,9 @@
+from odoo import models, fields
+
+# this is creating a table
+class RealEstate(models.Model):
+ _name = "estate.property.type"
+ _description = "Real Estate Property Type"
+
+ # this is creating fields in the table
+ name = fields.Char(copy=False, required=True)
\ 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..2f6a9a2d3fc
--- /dev/null
+++ b/estate/security/ir.model.access.csv
@@ -0,0 +1,6 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+estate.access_estate_property,access_estate_property,estate.model_estate_property,base.group_user,1,1,1,1
+estate.access_estate_property_manager,access_estate_property_manager,estate.model_estate_property,estate.estate_property_manager,1,1,1,1
+estate.access_estate_property_type,access_estate_property_type,estate.model_estate_property_type,base.group_user,1,1,1,1
+estate.access_estate_property_tag,access_estate_property_tag,estate.model_estate_property_tag,base.group_user,1,1,1,1
+estate.access_estate_property_offer,access_estate_property_offer,estate.model_estate_property_offer,base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/estate/security/res_groups.xml b/estate/security/res_groups.xml
new file mode 100644
index 00000000000..5403e660be0
--- /dev/null
+++ b/estate/security/res_groups.xml
@@ -0,0 +1,5 @@
+
+
+ Estate Property Manager
+
+
diff --git a/estate/views/estate_menus.xml b/estate/views/estate_menus.xml
new file mode 100644
index 00000000000..ba016de9157
--- /dev/null
+++ b/estate/views/estate_menus.xml
@@ -0,0 +1,11 @@
+
+
+
\ 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..40d22511800
--- /dev/null
+++ b/estate/views/estate_property_offer_views.xml
@@ -0,0 +1,30 @@
+
+
+ estate_property_offer_list
+ estate.property.offer
+
+
+
+
+
+
+
+
+
+
+
+
+ estate_property_offer_form
+ estate.property.offer
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/estate/views/estate_property_settings_views.xml b/estate/views/estate_property_settings_views.xml
new file mode 100644
index 00000000000..3f225544d93
--- /dev/null
+++ b/estate/views/estate_property_settings_views.xml
@@ -0,0 +1,14 @@
+
+
+ Estate Property Types
+ estate.property.type
+ list,form
+
+
+
+ Estate Property Tags
+ estate.property.tag
+ list,form
+
+
+
\ 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..2513fdc7c5c
--- /dev/null
+++ b/estate/views/estate_property_views.xml
@@ -0,0 +1,100 @@
+
+
+ Estate Properties
+ 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