Skip to content

[IMP] Real Estate: add security and visibility changes #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: 15.0-core
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions estate/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@

{
"name": "Real Estate",
"license": "LGPL-3",
"category": "Real Estate",
"depends": [
"base",
"web",
],
"data": [
"security/ir.model.access.csv",
"security/security.xml",
"views/estate_property_offer_views.xml",
"views/estate_property_tag_views.xml",
"views/estate_property_type_views.xml",
Expand Down
8 changes: 7 additions & 1 deletion estate/models/estate_property.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class EstateProperty(models.Model):
_name = "estate.property"
_description = "Real Estate Property"
_order = "id desc"
_check_company_auto = True
_sql_constraints = [
("check_expected_price", "CHECK(expected_price > 0)", "The expected price must be strictly positive"),
("check_selling_price", "CHECK(selling_price >= 0)", "The offer price must be positive"),
Expand Down Expand Up @@ -67,7 +68,7 @@ def _default_date_availability(self):

# Relational
property_type_id = fields.Many2one("estate.property.type", string="Property Type")
user_id = fields.Many2one("res.users", string="Salesman", default=lambda self: self.env.user)
user_id = fields.Many2one("res.users", string="Salesman")
buyer_id = fields.Many2one("res.partner", string="Buyer", readonly=True, copy=False)
tag_ids = fields.Many2many("estate.property.tag", string="Tags")
offer_ids = fields.One2many("estate.property.offer", "property_id", string="Offers")
Expand All @@ -80,6 +81,11 @@ def _default_date_availability(self):
)
best_price = fields.Float("Best Offer", compute="_compute_best_price", help="Best offer received")

# Multi-Company
company_id = fields.Many2one(
'res.company', required=True, default=lambda self: self.env.company
)

# ---------------------------------------- Compute methods ------------------------------------

@api.depends("living_area", "garden_area")
Expand Down
16 changes: 12 additions & 4 deletions estate/security/ir.model.access.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_estate_property,access.estate.property,estate.model_estate_property,base.group_user,1,1,1,1
access_estate_property_offer,access.estate.property.offer,estate.model_estate_property_offer,base.group_user,1,1,1,1
access_estate_property_tag,access.estate.property.tag,estate.model_estate_property_tag,base.group_user,1,1,1,1
access_estate_property_type,access.estate.property.type,estate.model_estate_property_type,base.group_user,1,1,1,1
access_estate_property,access_estate_property,model_estate_property,base.group_user,0,0,0,0
access_estate_property_type,access_estate_property_type,model_estate_property_type,base.group_user,0,0,0,0
access_estate_property_tag,access_estate_property_tag,model_estate_property_tag,base.group_user,0,0,0,0
access_estate_property_offer,access_estate_property_offer,model_estate_property_offer,base.group_user,0,0,0,0
access_estate_property_manager,access.estate.property,estate.model_estate_property,estate.estate_group_manager,1,1,1,1
access_estate_property_offer_manager,access.estate.property.offer,estate.model_estate_property_offer,estate.estate_group_manager,1,1,1,1
access_estate_property_tag_manager,access.estate.property.tag,estate.model_estate_property_tag,estate.estate_group_manager,1,1,1,1
access_estate_property_type_manager,access.estate.property.type,estate.model_estate_property_type,estate.estate_group_manager,1,1,1,1
access_estate_property_agent,access.estate.property,estate.model_estate_property,estate.estate_group_user,1,1,1,0
access_estate_property_offer_agent,access.estate.property.offer,estate.model_estate_property_offer,estate.estate_group_user,1,0,0,0
access_estate_property_tag_agent,access.estate.property.tag,estate.model_estate_property_tag,estate.estate_group_user,1,0,0,0
access_estate_property_type_agent,access.estate.property.type,estate.model_estate_property_type,estate.estate_group_user,1,0,0,0
29 changes: 29 additions & 0 deletions estate/security/security.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>

<record id="estate_group_user" model="res.groups">
<field name="name">Agent</field>
<field name="category_id" ref="base.module_category_real_estate_brokerage"/>
</record>

<record id="estate_group_manager" model="res.groups">
<field name="name">Manager</field>
<field name="category_id" ref="base.module_category_real_estate_brokerage"/>
<field name="implied_ids" eval="[([ref('estate_group_user')])]"/>
</record>

<record id="estate_agent_property_limit" model="ir.rule">
<field name="name">limit estate agent access to own properties or unclaimed properties</field>
<field name="model_id" ref="model_estate_property"/>
<field name="groups" eval="[(4, ref('estate.estate_group_user'))]"/>
<field name="domain_force">[('company_id', 'in', company_ids), '|', ('user_id', '=', False), ('user_id', '=', user.id)]</field>
</record>

<record id="estate_manager_rule" model="ir.rule">
<field name="name">Estate manager rule</field>
<field name="model_id" ref="model_estate_property"/>
<field name="groups" eval="[(4, ref('estate.estate_group_manager'))]"/>
<field name="domain_force">[(1, '=', 1)]</field>
</record>

</odoo>
2 changes: 1 addition & 1 deletion estate/views/estate_menus.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<menuitem id="estate_advertisement_menu" name="Advertisements" sequence="5">
<menuitem id="estate_property_menu_action" action="estate_property_action" sequence="5"/>
</menuitem>
<menuitem id="estate_settings_menu" name="Settings" sequence="10">
<menuitem id="estate_settings_menu" name="Settings" sequence="10" groups="estate_group_manager">
<menuitem id="estate_property_type_menu_action" action="estate_property_type_action" sequence="5"/>
<menuitem id="estate_property_tag_menu_action" action="estate_property_tag_action" sequence="10"/>
</menuitem>
Expand Down
5 changes: 4 additions & 1 deletion estate/views/estate_property_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
</div>
<group>
<group>
<field name="company_id"/>
<field name="property_type_id" options="{'no_create': True, 'no_edit': True}"/>
<field name="postcode"/>
<field name="date_availability"/>
Expand Down Expand Up @@ -48,7 +49,8 @@
</group>
</page>
<page string="Offers">
<field name="offer_ids" attrs="{'readonly': [('state', 'in', ('offer_accepted', 'sold', 'canceled'))]}"/>
<field name="offer_ids" />
<!-- attrs="{'readonly': [('state', 'in', ('offer_accepted', 'sold', 'canceled'))]}" -->
</page>
<page string="Other Info">
<group>
Expand Down Expand Up @@ -79,6 +81,7 @@
<field name="selling_price"/>
<field name="date_availability" optional="hide"/>
<field name="state" invisible="1"/>
<field name="company_id" groups="base.group_multi_company"/>
</tree>
</field>
</record>
Expand Down
1 change: 1 addition & 0 deletions estate_account/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

{
"name": "Real Estate Accounting",
"license": "LGPL-3",
"depends": [
"estate",
"account",
Expand Down
3 changes: 3 additions & 0 deletions estate_account/models/estate_property.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ def action_sold(self):
# Another way to get the journal:
# journal = self.env["account.move"].with_context(default_move_type="out_invoice")._get_default_journal()
for prop in self:
if not self.env['estate.property'].check_access_rights('write') or not prop.check_access_rule('write'):
return res
print(" reached ".center(100, '='))
self.env["account.move"].create(
{
"partner_id": prop.buyer_id.id,
Expand Down