Skip to content

Commit 0618f39

Browse files
author
Ana Zurabashvili [anzu]
committed
[REF] estate,estate_account: Refactoring code
- refactoring the code [email protected]
1 parent a3f4d61 commit 0618f39

File tree

5 files changed

+43
-54
lines changed

5 files changed

+43
-54
lines changed

‎estate/__manifest__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"views/res_users_views.xml",
2323
"views/estate_menus.xml",
2424

25-
"data/master_data.xml",
26-
"demo/demo_data.xml",
25+
# "data/master_data.xml",
26+
# "demo/demo_data.xml",
2727
],
2828
'license': "LGPL-3",
2929
}

‎estate/demo/demo_data.xml

+32-47
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,35 @@
11
<odoo>
2-
<record id="estate_property_object_1" model="estate.property">
3-
<field name="type_id" ref="estate.estate_property_type_object_1"/>
4-
<field name="name">Big Villa</field>
5-
<field name="state">new</field>
6-
<field name="description">A nice and big villa</field>
7-
<field name="postcode">12345</field>
8-
<field name="date_availability">2020-02-02</field>
9-
<field name="expected_price">1600000</field>
10-
<field name="bedrooms">6</field>
11-
<field name="living_area">100</field>
12-
<field name="facades">4</field>
13-
<field name="garage">True</field>
14-
<field name="garden">True</field>
15-
<field name="garden_area">100000</field>
16-
<field name="garden_orientation">south</field>
17-
<field name="offer_ids" eval="[
18-
Command.create({
19-
'price': 10000,
20-
'validity': 14,
21-
'partner_id': ref('base.res_partner_12')
22-
}),
23-
Command.create({
24-
'price': 1500000,
25-
'validity': 14,
26-
'partner_id': ref('base.res_partner_12')
27-
}),
28-
Command.create({
29-
'price': 1500001,
30-
'validity': 14,
31-
'partner_id': ref('base.res_partner_2')
32-
}),
33-
]"/>
34-
</record>
2+
<!-- <record id="estate_property_object_4" model="estate.property">-->
3+
<!-- <field name="type_id" ref="estate.estate_property_type_object_1"/>-->
4+
<!-- <field name="name">Big Villa</field>-->
5+
<!-- <field name="state">new</field>-->
6+
<!-- <field name="description">A nice and big villa</field>-->
7+
<!-- <field name="postcode">12345</field>-->
8+
<!-- <field name="date_availability">2020-02-02</field>-->
9+
<!-- <field name="expected_price">1600000</field>-->
10+
<!-- <field name="bedrooms">6</field>-->
11+
<!-- <field name="living_area">100</field>-->
12+
<!-- <field name="facades">4</field>-->
13+
<!-- <field name="garage">True</field>-->
14+
<!-- <field name="garden">True</field>-->
15+
<!-- <field name="garden_area">100000</field>-->
16+
<!-- <field name="garden_orientation">south</field>-->
17+
<!-- </record>-->
18+
19+
<!-- <record id="estate_property_object_2" model="estate.property">-->
20+
<!-- <field name="type_id" ref="estate.estate_property_type_object_1"/>-->
21+
<!-- <field name="name">Trailer Home</field>-->
22+
<!-- <field name="state">cancelled</field>-->
23+
<!-- <field name="description">Home in a trailer park</field>-->
24+
<!-- <field name="postcode">54321</field>-->
25+
<!-- <field name="date_availability">1970-01-01</field>-->
26+
<!-- <field name="expected_price">100000</field>-->
27+
<!-- <field name="selling_price">120000</field>-->
28+
<!-- <field name="bedrooms">1</field>-->
29+
<!-- <field name="living_area">10</field>-->
30+
<!-- <field name="facades">4</field>-->
31+
<!-- <field name="garage">False</field>-->
32+
<!-- </record>-->
33+
3534

36-
<record id="estate_property_object_2" model="estate.property">
37-
<field name="type_id" ref="estate.estate_property_type_object_1"/>
38-
<field name="name">Trailer Home</field>
39-
<field name="state">cancelled</field>
40-
<field name="description">Home in a trailer park</field>
41-
<field name="postcode">54321</field>
42-
<field name="date_availability">1970-01-01</field>
43-
<field name="expected_price">100000</field>
44-
<field name="selling_price">120000</field>
45-
<field name="bedrooms">1</field>
46-
<field name="living_area">10</field>
47-
<field name="facades">4</field>
48-
<field name="garage">False</field>
49-
</record>
5035
</odoo>

‎estate/models/estate_property_offer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def create(self, vals_list):
6666

6767
def action_accept(self):
6868
for val in self:
69-
self.property_id.offer_ids.filtered(
69+
val.property_id.offer_ids.filtered(
7070
lambda x: x.state == 'accepted').write({
7171
'state': 'refused',
7272
})

‎estate/models/res_users.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,8 @@
44
class ResUsers(models.Model):
55
_inherit = 'res.users'
66

7-
property_ids = fields.One2many('estate.property', 'salesman_id',
8-
string='Properties')
7+
property_ids = fields.One2many('estate.property',
8+
'salesman_id',
9+
string='Properties',
10+
domain=[("state", "in", ["new", "received"])],
11+
)

‎estate/views/estate_property_views.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<button name="action_cancel" type="object" class="oe_stat_button" string="Cancel"
6363
invisible="state =='cancelled'"/>
6464
<field name="state" widget="statusbar" options="{'clickable': '1'}"
65-
statusbar_visible="new,received,accepted,sold" invisible="state == 'sold'"/>
65+
statusbar_visible="new,received,accepted,sold"/>
6666
</header>
6767
<sheet string="Property">
6868
<div class="oe_title">
@@ -150,7 +150,8 @@
150150
<field name="living_area" filter_domain="[('living_area', '>=', self)]"
151151
string="Living area more than"/>
152152
<group expand="1" string="Group By">
153-
<filter name="group_by_postcode" string="Postcode" context="{'group_by': 'postcode'}"/>
153+
<filter name="group_by_postcode" string="Postcode"
154+
context="{'group_by': 'postcode'}"/>
154155
</group>
155156
</search>
156157
</field>

0 commit comments

Comments
 (0)