[CLN] estate{,_account}: clean code of estate and estate_account

    " instead of ' for client visible variable
    use of self.env._
    clean of space and lines
    changed name of classes
    changed name of action

Author: thfay-odoo

awesome_clicker/__init__.py

@@ -1,2 +1 @@
 # -*- coding: utf-8 -*-
-

estate/__init__.py

@@ -1 +1 @@
-from . import models
+from . import models

estate/__manifest__.py

@@ -6,7 +6,7 @@
     ],
     'application': True,
     'installable': True,
-    'author': 'thfay',
+    'author': 'Odoo S.A.',
     'data': [
         'security/ir.model.access.csv',
         'views/estate_property_views.xml',
@@ -15,5 +15,6 @@
         'views/estate_property_offer_views.xml',
         'views/inherit_user_views.xml',
         'views/estate_menus.xml',
-    ]
-}
+    ],
+    'license': 'LGPL-3',
+}

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
+from . import res_users

estate/models/estate_property.py

@@ -1,54 +1,78 @@
-from odoo import api, fields, models, exceptions
-from odoo.tools import float_compare
-
 from dateutil.relativedelta import relativedelta
 
+from odoo import api, fields, models
+from odoo.tools import float_compare
+from odoo.exceptions import ValidationError, UserError
+
 
-class Property(models.Model):
+class EstateProperty(models.Model):
     _name = 'estate.property'
-    _description = "when duplicated status and date are not copied"
+    _description = "All property created"
     _order = 'id desc'
-    
-    name = fields.Char(required=True, string='title')
-    description = fields.Text(string="description")
+
+    name = fields.Char(required=True, string="Title")
+    description = fields.Text(string="Description")
     postcode = fields.Char()
-    date_availability = fields.Date(default=(fields.Date.today() + relativedelta(months=3)), copy=False,
-                                     string='available date')
-    expected_price = fields.Float(required=True, string='expected price')
-    selling_price = fields.Float(readonly=True, copy=False, string='selling price')
+    date_availability = fields.Date(default=lambda p: fields.Date.today() + relativedelta(months=3), copy=False,
+                                     string="Available Date")
+    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)
-    living_area = fields.Integer(string='living area')
-    facades = fields.Integer(string="facades")
-    garage = fields.Boolean(string="garage")
-    garden = fields.Boolean(string="garden")
+    living_area = fields.Integer(string="Living Area")
+    facades = fields.Integer(string="Facades")
+    garage = fields.Boolean(string="Garage")
+    garden = fields.Boolean(string="Garden")
     active = fields.Boolean(default=True)
-    garden_area = fields.Integer(string="garden area", default=0)
+    garden_area = fields.Integer(string="Garden Area", default=0)
 
-    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)
+    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)
 
-    tag_ids = fields.Many2many("estate.property.tag")
+    tag_ids = fields.Many2many('estate.property.tag')
 
-    offer_ids = fields.One2many("estate.property.offer", "property_id", string="offer")
+    offer_ids = fields.One2many(comodel_name='estate.property.offer', inverse_name='property_id', string="Offer")
 
     garden_orientation = fields.Selection(
-        string="garden orientation",
-        selection = [('north', "North"), ('south', "South"), ('east', "East"), ('west', "West")]
-    ) 
+        string="Garden Orientation",
+        selection=[('north', "North"), ('south', "South"), ('east', "East"), ('west', "West")]
+    )
 
     state = fields.Selection(
         string="Status",
         required=True,
         default='new',
-        selection = [('new', "New"), ('offer', "Offer"), ('received', "Offer Received"), 
-                     ('accepted', "Offer Accepted"), ('sold', "Sold"), ('cancelled', "Cancelled")]
-)
-
-    total_area = fields.Float(compute="_compute_total_area")
-    
-    best_price = fields.Float(compute="_compute_best_price")
-    
+        selection=[
+            ('new', "New"),
+            ('offer', "Offer"),
+            ('received', "Offer Received"),
+            ('accepted', "Offer Accepted"),
+            ('sold', "Sold"),
+            ('cancelled', "Cancelled"),
+       ]
+    )
+
+    total_area = fields.Float(compute='_compute_total_area')
+
+    best_price = fields.Float(compute='_compute_best_price')
+
+    _check_expected_price = models.Constraint(
+        'CHECK(expected_price > 0)',
+        "The expected price must be strictly positive.",
+    )
+
+    _check_selling_price = models.Constraint(
+        'CHECK(selling_price >= 0)',
+        "The selling price must be positive.",
+    )
+
+    @api.constrains('selling_price', 'expected_price')
+    def _check_sell_price(self):
+        for estate in self:
+            if len(estate.offer_ids) > 0 and float_compare(estate.selling_price, estate.expected_price * 0.9, 2) == -1:
+                raise ValidationError(self.env._("Put a higher price"))
+        return True
+
     @api.depends('garden_area', 'living_area')
     def _compute_total_area(self):
         for estate in self:
@@ -57,61 +81,46 @@ def _compute_total_area(self):
     @api.depends('offer_ids.price')
     def _compute_best_price(self):
         for estate in self:
-            prices = estate.offer_ids.filtered(lambda o:o.status != 'refused').mapped('price')
+            prices = estate.offer_ids.filtered(lambda o: o.status != 'refused').mapped('price')
             estate.best_price = max(prices) if len(prices) > 0 else 0
 
     @api.onchange('garden')
     def _onchange_garden(self):
-        self.garden_area = 10*self.garden
-        self.garden_orientation = 'north' if self.garden else None 
+        self.garden_area = 10 * self.garden
+        self.garden_orientation = 'north' if self.garden else None
 
-    def cancel_sell(self):
+    def action_cancel_sell(self):
         for estate in self:
-            if estate.state == 'sold' :
-                raise exceptions.UserError("Sold properties can not be canceled")
+            if estate.state == 'sold':
+                raise UserError(self.env._("Sold properties can not be canceled"))
 
             estate.state = 'cancelled'
-            return True
-    
-    def set_sell(self):
+        return True
+
+    def action_sell(self):
         for estate in self:
-            if estate.state == 'cancelled' :
-                raise exceptions.UserError("Cancelled properties can not be sell")
+            if estate.state == 'cancelled':
+                raise UserError(self.env._("Cancelled properties can not be sell"))
 
             estate.state = 'sold'
-            return True
-    
+        return True
+
     def set_received(self):
         for estate in self:
             estate.state = 'received'
-            return True
-        
-    def accepted_offer(self,offer):
+        return True
+
+    def accepted_offer(self, offer):
         for estate in self:
             if offer.status == 'accepted':
                 estate.selling_price = offer.price
                 estate.buyer_id = offer.partner_id
-                estate.state='accepted'
+                estate.state = 'accepted'
+        return True
 
-    _check_expected_price = models.Constraint(
-    'CHECK(expected_price > 0)',
-    "The expected price must be strictly positive.",
-)
-    
-    _check_selling_price = models.Constraint(
-    'CHECK(selling_price >= 0)',
-    "The selling price must be positive.",
-)   
-    
-    @api.constrains('selling_price','expected_price')
-    def _check_sell_price(self):
-        for estate in self:
-            if len(estate.offer_ids) > 0 and float_compare(estate.selling_price, estate.expected_price * 0.9 ,2) == -1 :
-                raise exceptions.ValidationError("Put a higher price")
-            
     @api.model
     def ondelete(self):
-        for property in self : 
-            if property.state != 'new' or property.state != 'cancelled' :
-                raise exceptions.ValidationError("Can only delete new or cancelled properties")
-        return super().ondelete()
+        for property in self:
+            if property.state != 'new' or property.state != 'cancelled':
+                raise ValidationError(self.env._("Can only delete new or cancelled properties"))
+        return super().ondelete()

estate/models/estate_property_offer.py

@@ -1,66 +1,66 @@
-from odoo import api, fields, models, exceptions
-
 from dateutil.relativedelta import relativedelta
 
+from odoo import api, fields, models
+from odoo.exceptions import ValidationError, UserError
+
 
-class PropertyOffer(models.Model):
+class EstatePropertyOffer(models.Model):
     _name = 'estate.property.offer'
-    _description = "model of property offer"
+    _description = "All property offer"
     _order = 'price desc'
-    
+
     price = fields.Float()
 
     property_id = fields.Many2one('estate.property', string="property", required=True, readonly=True)
     partner_id = fields.Many2one('res.partner', string="partner", required=True)
-    property_type_id = fields.Many2one(related='property_id.property_type_id') 
-
+    property_type_id = fields.Many2one(related='property_id.property_type_id')
 
     status = fields.Selection(
         copy=False,
-        selection = [('accepted', "Accepted"), ('refused', "Refused")]
+        selection=[('accepted', "Accepted"), ('refused', "Refused")]
     )
-    
+
     validity = fields.Integer(default=7)
 
-    date_deadline = fields.Date(compute="_compute_deadline", inverse="_inverse_deadline", string="deadline")
+    date_deadline = fields.Date(compute='_compute_deadline', inverse='_inverse_deadline', string="Deadline")
 
-    @api.depends("validity")
+    _check_price = models.Constraint(
+        'CHECK(price > 0)',
+        "The price must be strictly positive.",
+    )
+
+    @api.depends('validity')
     def _compute_deadline(self):
         for offer in self:
             offer.date_deadline = fields.Date.today() + relativedelta(days=offer.validity)
 
     def _inverse_deadline(self):
         for offer in self:
-            offer.validity = relativedelta(offer.date_deadline,fields.Date.today()).days
+            offer.validity = relativedelta(offer.date_deadline, fields.Date.today()).days
 
     def offer_cancel(self):
         for offer in self:
             if offer.status == 'accepted':
-                raise exceptions.UserError('you can not cancel an accepted offer')
+                raise UserError(self.env._("You can not cancel an accepted offer"))
             else:
                 offer.status = 'refused'
         return True
-        
+
     def offer_accept(self):
         for offer in self:
             if offer.property_id.state != 'accepted':
                 offer.status = 'accepted'
                 offer.property_id.accepted_offer(offer)
             else:
-                raise exceptions.UserError('there is already an accepted offer for ' + offer.property_id.name )
-            
+                raise UserError(self.env._("There is already an accepted offer for %s.", offer.property_id.name))
+
         return True
-    
+
     @api.model
-    def create(self,vals_list):
-        for vals in vals_list :
-            property = self.env['estate.property'].browse(vals['property_id']) 
-            if vals['price'] < property.best_price :
-                raise exceptions.ValidationError("Can not create an offer lower than an existing offer")
+    def create(self, vals_list):
+        for vals in vals_list:
+            property = self.env['estate.property'].browse(vals['property_id'])
+            if vals['price'] < property.best_price:
+                raise ValidationError(self.env._("Can not create an offer lower than an existing offer"))
             property.set_received()
         return super().create(vals_list)
-    
-    _check_price = models.Constraint(
-        'CHECK(price > 0)',
-        "The price must be strictly positive.",
-    )

estate/models/estate_property_tag.py

@@ -1,13 +1,15 @@
 from odoo import fields, models
 
-class PropertyTag(models.Model):
-    _name = "estate.property.tag"
-    _description = "model of property tag"
+
+class EstatePropertyTag(models.Model):
+    _name = 'estate.property.tag'
+    _description = "All property tag"
     _order = 'name'
-    
+
     name = fields.Char(required=True)
     color = fields.Integer(default=0)
+
     _check_tag_name = models.Constraint(
         'UNIQUE (name)',
         "The tag name must be unique."
-    )
+    )

estate/models/estate_property_type.py

@@ -1,30 +1,30 @@
 from odoo import api, fields, models
 
-class PropertyType(models.Model):
-    _name = "estate.property.type"
-    _description = "model of property type"
+
+class EstatePropertyType(models.Model):
+    _name = 'estate.property.type'
+    _description = "All property type e.g. House, Manor "
     _order = 'sequence asc,name'
 
     name = fields.Char(required=True)
     sequence = fields.Integer(string="Sequence", default=1, help="Used to order stages. Lower is better.")
-    
+
     property_ids = fields.One2many(comodel_name='estate.property', inverse_name='property_type_id')
     offer_ids = fields.One2many(comodel_name='estate.property.offer', inverse_name='property_type_id')
 
-    offer_count = fields.Integer(compute='_compute_ofer_count', string="Offer count")
+    offer_count = fields.Integer(compute='_compute_ofer_count', string="Offer Count")
 
     @api.depends('offer_ids')
     def _compute_ofer_count(self):
         for type in self:
             type.offer_count = len(type.offer_ids)
         return True
 
-
     def action_estate_property_offer_view_by_type(self):
         return {
            'type': 'ir.actions.act_window',
            'res_model': 'estate.property.offer',
-           'name': ("Offer"),
-           'views': [[False, 'list']],
+           'name': self.env._("Offer"),
+           'views': [(False, 'list')],
            'domain': [('property_type_id', '=', self.id)],
-       }
+       }

estate/models/res_users.py

@@ -1,7 +1,8 @@
-from odoo import api, fields, models, exceptions
+from odoo import fields, models
+
 
 class ResUsers(models.Model):
-    _inherit = ["res.users"]
+    _inherit = ['res.users']
     _name = 'res.users'
 
-    property_ids = fields.One2many(comodel_name='estate.property', inverse_name='salesperson_id', domain="['|', ('state', '=', 'New'), ('state', '=', 'Offer Received')]")
+    property_ids = fields.One2many(comodel_name='estate.property', inverse_name='salesperson_id', domain=['|', ('state', '=', 'new'), ('state', '=', 'received')])