diff --git a/.flake8 b/.flake8 new file mode 100644 index 00000000000..20e70b32c5c --- /dev/null +++ b/.flake8 @@ -0,0 +1,4 @@ +[flake8] +ignore = E501,E301,E302,F401 +max-line-length = 88 +exclude = __pycache__,.git \ No newline at end of file diff --git a/.gitignore b/.gitignore index b6e47617de1..e64747d9b18 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,6 @@ dmypy.json # Pyre type checker .pyre/ + +.flake8 +settings.json diff --git a/awesome_clicker/__manifest__.py b/awesome_clicker/__manifest__.py index 56dc2f779b9..155a2286e64 100644 --- a/awesome_clicker/__manifest__.py +++ b/awesome_clicker/__manifest__.py @@ -11,6 +11,7 @@ """, 'author': "Odoo", + 'editor': "jupao", 'website': "https://www.odoo.com/", 'category': 'Tutorials', 'version': '0.1', diff --git a/awesome_dashboard/__init__.py b/awesome_dashboard/__init__.py index b0f26a9a602..153a9e31ebb 100644 --- a/awesome_dashboard/__init__.py +++ b/awesome_dashboard/__init__.py @@ -1,3 +1,2 @@ # -*- coding: utf-8 -*- - from . import controllers diff --git a/awesome_dashboard/controllers/__init__.py b/awesome_dashboard/controllers/__init__.py index 457bae27e11..b0f26a9a602 100644 --- a/awesome_dashboard/controllers/__init__.py +++ b/awesome_dashboard/controllers/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -from . import controllers \ No newline at end of file +from . import controllers diff --git a/awesome_dashboard/controllers/controllers.py b/awesome_dashboard/controllers/controllers.py index 05977d3bd7f..c46cfc63bfa 100644 --- a/awesome_dashboard/controllers/controllers.py +++ b/awesome_dashboard/controllers/controllers.py @@ -33,4 +33,3 @@ def get_statistics(self): }, 'total_amount': random.randint(100, 1000) } - diff --git a/awesome_gallery/models/ir_action.py b/awesome_gallery/models/ir_action.py index eae20acbf5c..d796bc8beae 100644 --- a/awesome_gallery/models/ir_action.py +++ b/awesome_gallery/models/ir_action.py @@ -7,4 +7,4 @@ class ActWindowView(models.Model): view_mode = fields.Selection(selection_add=[ ('gallery', "Awesome Gallery") - ], ondelete={'gallery': 'cascade'}) + ], ondelete={'gallery': 'cascade'}) diff --git a/awesome_owl/__init__.py b/awesome_owl/__init__.py index 457bae27e11..b0f26a9a602 100644 --- a/awesome_owl/__init__.py +++ b/awesome_owl/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -from . import controllers \ No newline at end of file +from . import controllers diff --git a/awesome_owl/controllers/__init__.py b/awesome_owl/controllers/__init__.py index 457bae27e11..b0f26a9a602 100644 --- a/awesome_owl/controllers/__init__.py +++ b/awesome_owl/controllers/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -from . import controllers \ No newline at end of file +from . import controllers diff --git a/estate/__init__.py b/estate/__init__.py new file mode 100644 index 00000000000..0650744f6bc --- /dev/null +++ b/estate/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/estate/__manifest__.py b/estate/__manifest__.py new file mode 100644 index 00000000000..03b06879b35 --- /dev/null +++ b/estate/__manifest__.py @@ -0,0 +1,29 @@ +{ + 'name': "Real Estate", + + 'summary': """ + Starting module for "Master the Odoo web framework, chapter 1: Build a new application" + """, + + 'description': """ + Starting module for "Master the Odoo web framework, chapter 1: Build a new application" + """, + + 'author': "Odoo", + 'website': "https://www.odoo.com/", + 'category': 'Tutorials', + 'version': '0.1', + 'application': True, + 'installable': True, + 'depends': ['base'], + + 'data': [ + 'security/ir.model.access.csv', + 'views/estate_property_offer_views.xml', + 'views/estate_property_views.xml', + 'views/estate_menus.xml' + ], + + 'assets': {}, + 'license': 'AGPL-3' +} diff --git a/estate/models/__init__.py b/estate/models/__init__.py new file mode 100644 index 00000000000..2a1d3a13388 --- /dev/null +++ b/estate/models/__init__.py @@ -0,0 +1,4 @@ +from . import estate_property_type +from . import estate_property_tag +from . import estate_property +from . import estate_property_offer diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py new file mode 100644 index 00000000000..00bfcee8952 --- /dev/null +++ b/estate/models/estate_property.py @@ -0,0 +1,131 @@ +from odoo import models, fields, api +from odoo.exceptions import UserError +from dateutil.relativedelta import relativedelta + + +class EstateProperty(models.Model): + _name = "estate.property" + _description = "Real Estate Property" + + name = fields.Char(required=True) + description = fields.Text() + postcode = fields.Char() + + available_from = fields.Date( + copy=False, + default=lambda self: fields.Date.today() + relativedelta(months=3) + ) + + expected_price = fields.Float(required=True) + + selling_price = fields.Float( + readonly=True, + copy=False + ) + + bedrooms = fields.Integer(default=2) + living_area = fields.Integer("Living Area (sqm)") + facades = fields.Integer() + garage = fields.Boolean() + garden = fields.Boolean() + garden_area = fields.Integer("Garden Area (sqm)") + + garden_orientation = fields.Selection( + [ + ('north', 'North'), + ('south', 'South'), + ('east', 'East'), + ('west', 'West'), + ], + ) + + @api.onchange('garden') + def _onchange_garden(self): + if self.garden: + self.garden_area = 10 + self.garden_orientation = 'north' + else: + self.garden_area = 0 + self.garden_orientation = False + + active = fields.Boolean(default=True) + + state = fields.Selection( + [ + ('new', 'New'), + ('offer_received', 'Offer Received'), + ('offer_accepted', 'Offer Accepted'), + ('sold', 'Sold'), + ('cancelled', 'Cancelled'), + ], + required=True, + copy=False, + default='new' + ) + # Many2one links + property_type_id = fields.Many2one( + 'estate.property.type', + string='Property Type' + ) + buyer_id = fields.Many2one( + 'res.partner', + string='Buyer', + copy=False + ) + salesperson_id = fields.Many2one( + 'res.users', + string='Salesperson', + default=lambda self: self.env.user + ) + # Many2many links + tag_ids = fields.Many2many( + 'estate.property.tag', + string="Tags" + ) + + # One2many links + offer_ids = fields.One2many( + 'estate.property.offer', + 'property_id', + string="Offers" + ) + + # Computed Fields + total_area = fields.Float( + string="Total Area (sqm)", + compute="_compute_total_area", + store=True + ) + + @api.depends('living_area', 'garden_area') + def _compute_total_area(self): + for record in self: + record.total_area = record.living_area + record.garden_area + + best_offer = fields.Float( + string="Best Offer", + compute="_compute_best_offer", + store=True + ) + + @api.depends('offer_ids.price') + def _compute_best_offer(self): + for record in self: + if record.offer_ids: + record.best_offer = max(record.offer_ids.mapped('price')) + else: + record.best_offer = 0.0 + + def action_cancel(self): + for record in self: + if record.state == 'sold': + raise UserError("Sold properties cannot be cancelled.") + record.state = 'cancelled' + return True + + def action_sold(self): + for record in self: + if record.state == 'cancelled': + raise UserError("Cancelled properties cannot be sold.") + record.state = 'sold' + return True diff --git a/estate/models/estate_property_offer.py b/estate/models/estate_property_offer.py new file mode 100644 index 00000000000..d8b7225d367 --- /dev/null +++ b/estate/models/estate_property_offer.py @@ -0,0 +1,65 @@ +from odoo import models, fields, api +from odoo.exceptions import UserError +from datetime import timedelta + + +class EstatePropertyOffer(models.Model): + _name = "estate.property.offer" + _description = "Property Offer" + + price = fields.Float(required=True) + status = fields.Selection( + [('accepted', 'Accepted'), ('refused', 'Refused')], + string="Status", + copy=False + ) + partner_id = fields.Many2one( + 'res.partner', + string="Buyer", + required=True + ) + property_id = fields.Many2one( + 'estate.property', + string="Property", + required=True, + ondelete='cascade' + ) + + validity = fields.Integer( + string="Validity (days)", + default=7 + ) + + date_deadline = fields.Date( + string="Deadline", + compute="_compute_date_deadline", + inverse="_inverse_date_deadline", + store=True + ) + @api.depends('validity', 'create_date') + def _compute_date_deadline(self): + for record in self: + create_date = record.create_date.date() if record.create_date else fields.Date.today() + record.date_deadline = create_date + timedelta(days=record.validity) + + def _inverse_date_deadline(self): + for record in self: + create_date = record.create_date.date() if record.create_date else fields.Date.today() + record.validity = (record.date_deadline - create_date).days + + def action_accept(self): + for offer in self: + property = offer.property_id + # Check if another offer was already accepted + if property.offer_ids.filtered(lambda o: o.status == 'accepted'): + raise UserError("Only one offer can be accepted per property.") + offer.status = 'accepted' + property.selling_price = offer.price + property.buyer_id = offer.partner_id + property.state = 'offer_accepted' + return True + + def action_refuse(self): + for offer in self: + offer.status = 'refused' + return True diff --git a/estate/models/estate_property_tag.py b/estate/models/estate_property_tag.py new file mode 100644 index 00000000000..7d6f197c1eb --- /dev/null +++ b/estate/models/estate_property_tag.py @@ -0,0 +1,8 @@ +from odoo import models, fields + + +class EstatePropertyTag(models.Model): + _name = "estate.property.tag" + _description = "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..ad121b33163 --- /dev/null +++ b/estate/models/estate_property_type.py @@ -0,0 +1,8 @@ +from odoo import models, fields + + +class EstatePropertyType(models.Model): + _name = "estate.property.type" + _description = "Real Estate Property Type" + + name = fields.Char(required=True) diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv new file mode 100644 index 00000000000..89f97c50842 --- /dev/null +++ b/estate/security/ir.model.access.csv @@ -0,0 +1,5 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_estate_property,access_estate_property,model_estate_property,base.group_user,1,1,1,1 +access_estate_property_type,access_estate_property_type,model_estate_property_type,base.group_user,1,1,1,1 +access_estate_property_tag,access_estate_property_tag,model_estate_property_tag,base.group_user,1,1,1,1 +access_estate_property_offer,access_estate_property_offer,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 new file mode 100644 index 00000000000..48f0387f95d --- /dev/null +++ b/estate/views/estate_menus.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + Property Type + estate.property.type + list,form + + + + + Property Tags + estate.property.tag + list,form + + diff --git a/estate/views/estate_property_offer_views.xml b/estate/views/estate_property_offer_views.xml new file mode 100644 index 00000000000..4d9402cc0fd --- /dev/null +++ b/estate/views/estate_property_offer_views.xml @@ -0,0 +1,39 @@ + + + + + estate.property.offer.form + estate.property.offer + +
+
+
+ + + + + + + + + +
+ + + + + + estate.property.offer.list + estate.property.offer + + + + + + + + + + diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml new file mode 100644 index 00000000000..92e1c2bf3a0 --- /dev/null +++ b/estate/views/estate_property_views.xml @@ -0,0 +1,133 @@ + + + + + + Properties + estate.property + list,form + + + + + + estate.property.list + estate.property + + + + + + + + + + + + + + + + + + estate.property.form + estate.property + +
+ +
+
+ +
+

+ +

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +