diff --git a/estate/__manifest__.py b/estate/__manifest__.py index 10432b5..d1a848f 100644 --- a/estate/__manifest__.py +++ b/estate/__manifest__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- { 'name': 'Real Estate', - 'category': 'Tutorials/Estate', + 'category': 'Real Estate/Brokerage', 'application': True, 'installable': True, 'author': 'Matt Marcha', @@ -15,6 +15,7 @@ 'views/estate_property_views.xml', 'views/res_users_views.xml', 'views/estate_menus.xml', + 'security/security.xml', 'security/ir.model.access.csv', 'data/estate.property.type.csv', ], diff --git a/estate/models/estate_property.py b/estate/models/estate_property.py index 0d87087..b8f673b 100644 --- a/estate/models/estate_property.py +++ b/estate/models/estate_property.py @@ -11,6 +11,7 @@ class EstateProperty(models.Model): _name = "estate.property" _description = "Properties for the Estate module" _order = "id desc" + _check_company_auto = True _sql_constraints = [ ('check_expected_price', 'CHECK (expected_price > 0)', 'Expected rice should be superior to 0'), @@ -39,12 +40,13 @@ class EstateProperty(models.Model): 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", "Property Type") - salesman_id = fields.Many2one("res.users", string="Salesman") - buyer_id = fields.Many2one("res.partner", string="Buyer") + salesman_id = fields.Many2one("res.users", string="Salesman", check_company=True) + buyer_id = fields.Many2one("res.partner", string="Buyer", check_company=True) tag_ids = fields.Many2many("estate.property.tag", string="Tags") offer_ids = fields.One2many("estate.property.offer", "property_id", string="Offers") total_area = fields.Integer(compute="_get_total_area", readonly=True) best_price = fields.Float(compute="_compute_best_price") + company_id = fields.Many2one('res.company', 'Company', required=True, default=lambda self: self.env.company) # ----------------- CRUD methods --------------------------- # diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv index 4c593ed..23e7a1d 100644 --- a/estate/security/ir.model.access.csv +++ b/estate/security/ir.model.access.csv @@ -1,5 +1,9 @@ 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 \ No newline at end of file +access_estate_property_manager,access_estate_property_manager,model_estate_property,estate_group_manager,1,1,1,1 +access_estate_property_type_manager,access_estate_property_type_manager,model_estate_property_type,estate_group_manager,1,1,1,1 +access_estate_property_tag_manager,access_estate_property_tag_manager,model_estate_property_tag,estate_group_manager,1,1,1,1 +access_estate_property_offer_manager,access_estate_property_offer_manager,model_estate_property_offer,estate_group_manager,1,1,1,1 +access_estate_property_agent,access_estate_property_agent,model_estate_property,estate_group_user,1,1,1,0 +access_estate_property_type_agent,access_estate_property_type_agent,model_estate_property_type,estate_group_user,1,0,0,0 +access_estate_property_tag_agent,access_estate_property_tag_agent,model_estate_property_tag,estate_group_user,1,0,0,0 +access_estate_property_offer_agent,access_estate_property_offer_agent,model_estate_property_offer,estate_group_user,1,1,1,1 \ No newline at end of file diff --git a/estate/security/security.xml b/estate/security/security.xml new file mode 100644 index 0000000..211ad07 --- /dev/null +++ b/estate/security/security.xml @@ -0,0 +1,44 @@ + + + + + + Agent + + + + + Manager + + + + + + + Restrict properties management for agents to their owners + + + + [ + '|', ('salesman_id', '=', user.id), + ('salesman_id', '=', False) + ] + + + + Manager rule + + + [(1, '=', 1)] + + + + Restrict properties management for agents of the property's company + + + + [('company_id', 'in', company_ids)] + + + + \ No newline at end of file diff --git a/estate/views/estate_menus.xml b/estate/views/estate_menus.xml index 3961fcf..728e4fe 100644 --- a/estate/views/estate_menus.xml +++ b/estate/views/estate_menus.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml index 7481347..b1390bd 100644 --- a/estate/views/estate_property_views.xml +++ b/estate/views/estate_property_views.xml @@ -13,6 +13,7 @@ + @@ -41,6 +42,7 @@ + @@ -88,6 +90,7 @@ + @@ -111,6 +114,7 @@

+

Expected price :
Best offer :
diff --git a/estate_account/models/estate_property.py b/estate_account/models/estate_property.py index 01ffa08..a114d9a 100644 --- a/estate_account/models/estate_property.py +++ b/estate_account/models/estate_property.py @@ -9,6 +9,9 @@ class EstateProperty(models.Model): """ Create an invoice when a property is sold """ + self.check_access_rights('write') + self.check_access_rule('write') + # Run the parent method first so that nothing is # invoiced if an error is raised parent = super().action_sold() @@ -33,6 +36,6 @@ class EstateProperty(models.Model): ], } # Create the invoice - self.env['account.move'].create(vals) + self.env['account.move'].sudo().create(vals) return parent \ No newline at end of file