pipeline guideline adjustements

Author: baje-odoo

estate/__manifest__.py

@@ -2,19 +2,15 @@
     'name': "estate",
     'version': '0.1',
     'depends': ['base'],
-    'data':[
-<<<<<<< HEAD
+    'data': [
         'security/ir.model.access.csv',
         'views/estate_property_views.xml',
         'views/estate_menus.xml',
-=======
-        'security/ir.model.access.csv'
->>>>>>> 6f53f08 (Security)
         ],
     'author': "baje",
     'category': 'Uncategorized',
     'description': """
     An app to manage a Real Estate Agency
     """,
     'application': True,
-}
+}

estate/models/__init__.py

@@ -1 +1 @@
-from . import estate_property
+from . import estate_property

estate/models/estate_property.py

@@ -2,14 +2,15 @@
 from dateutil.relativedelta import relativedelta
 
 class EstateProperty(models.Model):
+
     _name = "estate.property"
     _description = "estate properties"
     _order = "id"
 
     name = fields.Char("Title", required=True)
     description = fields.Text("Description")
     postcode = fields.Char("Postcode")
-    date_availability = fields.Date("Available From", default=(fields.Date.today()+relativedelta(months=3)))
+    date_availability = fields.Date("Available From", default=(fields.Date.today() + relativedelta(months=3)))
     expected_price = fields.Float("Expected Price", required=True)
     selling_price = fields.Float("Selling Price", readonly=True, copy=False)
     bedrooms = fields.Integer("Bedrooms", default=2)
@@ -20,10 +21,10 @@ class EstateProperty(models.Model):
     garden_area = fields.Integer("Garden Area (sqm)")
     garden_orientation = fields.Selection(
         string="Garden Orientation",
-        selection=[('north',"North"),('south',"South"),('east',"East"),('west',"West")]
+        selection=[('north',"North"), ('south',"South"), ('east',"East"), ('west',"West")]
     )
 
-    active= fields.Boolean("Active", default=True)
+    active = fields.Boolean("Active", default=True)
 
     state = fields.Selection(
         selection=[
@@ -37,4 +38,4 @@ class EstateProperty(models.Model):
         required=True,
         copy=False,
         default="new",
-    )
+    )