Skip to content

Commit 5ebad13

Browse files
josephDeriman-Alonso
joseph
authored and
Deriman-Alonso
committed
[IMP] animal: black, isort, prettier
1 parent 25baaaf commit 5ebad13

7 files changed

+203
-131
lines changed

‎animal/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
33
{
44
"name": "Animal",
5-
"version": "12.0.1.0.0",
5+
"version": "14.0.1.0.0",
66
"license": "AGPL-3",
77
"summary": "Manage animals information",
88
"author": "Open Source Integrators, Odoo Community Association (OCA)",

‎animal/security/res_groups.xml

+5-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
<!-- Animal groups -->
44
<record id="group_animal_manager" model="res.groups">
55
<field name="name">Manager</field>
6-
<field name="category_id" ref="animal"/>
7-
<field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/>
6+
<field name="category_id" ref="animal" />
7+
<field
8+
name="users"
9+
eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"
10+
/>
811
</record>
912

1013
</odoo>

‎animal/views/animal.xml

+129-69
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<field name="model">animal</field>
77
<field name="arch" type="xml">
88
<tree string="Animals">
9-
<field name="ref"/>
10-
<field name="name"/>
11-
<field name="gender"/>
12-
<field name="species_id"/>
13-
<field name="breed_id"/>
14-
<field name="color_id"/>
9+
<field name="ref" />
10+
<field name="name" />
11+
<field name="gender" />
12+
<field name="species_id" />
13+
<field name="breed_id" />
14+
<field name="color_id" />
1515
</tree>
1616
</field>
1717
</record>
@@ -22,44 +22,62 @@
2222
<field name="model">animal</field>
2323
<field name="arch" type="xml">
2424
<form string="Animal">
25-
<header/>
25+
<header />
2626
<sheet>
2727
<div class="oe_button_box" name="button_box">
28-
<button name="toggle_active" type="object"
29-
class="oe_stat_button" icon="fa-archive">
30-
<field name="active" widget="boolean_button"
31-
options='{"terminology": "archive"}'/>
28+
<button
29+
name="toggle_active"
30+
type="object"
31+
class="oe_stat_button"
32+
icon="fa-archive"
33+
>
34+
<field
35+
name="active"
36+
widget="boolean_button"
37+
options='{"terminology": "archive"}'
38+
/>
3239
</button>
3340
</div>
34-
<field name="image" widget='image' class="oe_avatar"/>
41+
<field name="image" widget='image' class="oe_avatar" />
3542
<div class="oe_title">
3643
<h1>
37-
<field name="name"/>
44+
<field name="name" />
3845
</h1>
39-
<field name="gender" widget="radio"
40-
options="{'horizontal': true}"/>
46+
<field
47+
name="gender"
48+
widget="radio"
49+
options="{'horizontal': true}"
50+
/>
4151
</div>
4252
<group id="main">
4353
<group id="left">
44-
<field name="species_id"/>
45-
<field name="breed_id" domain="[('species_id', '=', species_id)]"/>
46-
<field name="color_id" domain="[('breed_id', '=', breed_id)]"/>
47-
<field name="size"/>
54+
<field name="species_id" />
55+
<field
56+
name="breed_id"
57+
domain="[('species_id', '=', species_id)]"
58+
/>
59+
<field
60+
name="color_id"
61+
domain="[('breed_id', '=', breed_id)]"
62+
/>
63+
<field name="size" />
4864
</group>
4965
<group id="right">
50-
<field name="ref"/>
51-
<field name="weight"/>
52-
<field name="birth_date"/>
66+
<field name="ref" />
67+
<field name="weight" />
68+
<field name="birth_date" />
5369
</group>
5470
</group>
55-
<notebook/>
71+
<notebook />
5672
</sheet>
5773
<div class="oe_chatter">
58-
<field name="message_follower_ids"
59-
widget="mail_followers"/>
60-
<field name="activity_ids" widget="mail_activity"/>
61-
<field name="message_ids" widget="mail_thread"
62-
options="{'post_refresh': 'recipients'}"/>
74+
<field name="message_follower_ids" widget="mail_followers" />
75+
<field name="activity_ids" widget="mail_activity" />
76+
<field
77+
name="message_ids"
78+
widget="mail_thread"
79+
options="{'post_refresh': 'recipients'}"
80+
/>
6381
</div>
6482
</form>
6583
</field>
@@ -71,26 +89,46 @@
7189
<field name="model">animal</field>
7290
<field name="arch" type="xml">
7391
<kanban class="o_res_partner_kanban">
74-
<field name="id"/>
75-
<field name="image"/>
76-
<field name="name"/>
92+
<field name="id" />
93+
<field name="image" />
94+
<field name="name" />
7795
<templates>
7896
<t t-name="kanban-box">
79-
<div class="oe_kanban_global_click o_kanban_record_has_image_fill o_res_partner_kanban">
97+
<div
98+
class="oe_kanban_global_click o_kanban_record_has_image_fill o_res_partner_kanban"
99+
>
80100
<t t-if="record.image.raw_value">
81-
<img class="o_kanban_image" t-att-src="kanban_image('animal', 'image', record.id.raw_value)" t-att-alt="record.name"/>
101+
<img
102+
class="o_kanban_image"
103+
t-att-src="kanban_image('animal', 'image', record.id.raw_value)"
104+
t-att-alt="record.name"
105+
/>
82106
</t>
83107
<t t-else="">
84-
<img class="o_kanban_image" alt="Avatar" t-att-src='_s + "/animal/static/img/avatar.png"'/>
108+
<img
109+
class="o_kanban_image"
110+
alt="Avatar"
111+
t-att-src='_s + "/animal/static/img/avatar.png"'
112+
/>
85113
</t>
86114
<div class="oe_kanban_details">
87-
<strong class="o_kanban_record_title oe_partner_heading"><field name="display_name"/></strong>
88-
<div class="o_kanban_tags_section oe_kanban_partner_categories"/>
115+
<strong
116+
class="o_kanban_record_title oe_partner_heading"
117+
><field name="display_name" /></strong>
118+
<div
119+
class="o_kanban_tags_section oe_kanban_partner_categories"
120+
/>
89121
<ul>
90-
<li t-if="record.gender.raw_value"><field name="gender"/></li>
91-
<li t-if="record.species_id.raw_value and record.breed_id.raw_value"><field name="breed_id"/>, <field name="species_id"/></li>
122+
<li t-if="record.gender.raw_value"><field
123+
name="gender"
124+
/></li>
125+
<li
126+
t-if="record.species_id.raw_value and record.breed_id.raw_value"
127+
><field name="breed_id" />, <field
128+
name="species_id"
129+
/></li>
92130
</ul>
93-
<div class="oe_kanban_partner_links"/>
131+
<div class="oe_kanban_partner_links" />
94132
</div>
95133
</div>
96134
</t>
@@ -105,36 +143,58 @@
105143
<field name="model">animal</field>
106144
<field name="arch" type="xml">
107145
<search string="Animals">
108-
<field name="name"
109-
filter_domain="['|', ('name', 'ilike', self), ('ref', 'ilike', self)]"
110-
string="Name"/>
111-
<field name="species_id"/>
112-
<field name="breed_id"/>
113-
<field name="color_id"/>
114-
<field name="size"/>
115-
<separator/>
116-
<filter string="Female"
117-
domain="[('gender', '=', 'female')]"
118-
name="female"/>
119-
<filter string="Male"
120-
domain="[('gender', '=', 'male')]"
121-
name="male"/>
122-
<filter string="Hermaphrodite"
123-
domain="[('gender', '=', 'hermaphrodite')]"
124-
name="hermaphrodite"/>
125-
<filter string="Neutered"
126-
domain="[('gender', '=', 'neutered')]"
127-
name="neutered"/>
128-
<separator/>
146+
<field
147+
name="name"
148+
filter_domain="['|', ('name', 'ilike', self), ('ref', 'ilike', self)]"
149+
string="Name"
150+
/>
151+
<field name="species_id" />
152+
<field name="breed_id" />
153+
<field name="color_id" />
154+
<field name="size" />
155+
<separator />
156+
<filter
157+
string="Female"
158+
domain="[('gender', '=', 'female')]"
159+
name="female"
160+
/>
161+
<filter string="Male" domain="[('gender', '=', 'male')]" name="male" />
162+
<filter
163+
string="Hermaphrodite"
164+
domain="[('gender', '=', 'hermaphrodite')]"
165+
name="hermaphrodite"
166+
/>
167+
<filter
168+
string="Neutered"
169+
domain="[('gender', '=', 'neutered')]"
170+
name="neutered"
171+
/>
172+
<separator />
129173
<group expand="0" string="Group By">
130-
<filter name="gender" string="Gender" domain=""
131-
context="{'group_by': 'gender'}"/>
132-
<filter name="species_id" string="Species" domain=""
133-
context="{'group_by': 'species_id'}"/>
134-
<filter name="breed_id" string="Breed" domain=""
135-
context="{'group_by': 'breed_id'}"/>
136-
<filter name="color_id" string="Color" domain=""
137-
context="{'group_by': 'color_id'}"/>
174+
<filter
175+
name="gender"
176+
string="Gender"
177+
domain=""
178+
context="{'group_by': 'gender'}"
179+
/>
180+
<filter
181+
name="species_id"
182+
string="Species"
183+
domain=""
184+
context="{'group_by': 'species_id'}"
185+
/>
186+
<filter
187+
name="breed_id"
188+
string="Breed"
189+
domain=""
190+
context="{'group_by': 'breed_id'}"
191+
/>
192+
<filter
193+
name="color_id"
194+
string="Color"
195+
domain=""
196+
context="{'group_by': 'color_id'}"
197+
/>
138198
</group>
139199
</search>
140200
</field>
@@ -145,7 +205,7 @@
145205
<field name="res_model">animal</field>
146206
<field name="view_type">form</field>
147207
<field name="view_mode">kanban,tree,form</field>
148-
<field name="search_view_id" ref="view_animal_search"/>
208+
<field name="search_view_id" ref="view_animal_search" />
149209
<field name="help" type="html">
150210
<p class="o_view_nocontent_smiling_face">
151211
Create an animal.

‎animal/views/animal_breed.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<field name="model">animal.breed</field>
77
<field name="arch" type="xml">
88
<tree string="Breeds">
9-
<field name="name"/>
10-
<field name="species_id"/>
9+
<field name="name" />
10+
<field name="species_id" />
1111
</tree>
1212
</field>
1313
</record>
@@ -18,21 +18,21 @@
1818
<field name="model">animal.breed</field>
1919
<field name="arch" type="xml">
2020
<form string="Breed">
21-
<header/>
21+
<header />
2222
<sheet>
23-
<div class="oe_button_box" name="button_box"/>
23+
<div class="oe_button_box" name="button_box" />
2424
<div class="oe_title">
2525
<h1>
26-
<field name="name"/>
26+
<field name="name" />
2727
</h1>
2828
</div>
2929
<group id="main">
3030
<group id="left">
31-
<field name="species_id"/>
31+
<field name="species_id" />
3232
</group>
33-
<group id="right"/>
33+
<group id="right" />
3434
</group>
35-
<notebook/>
35+
<notebook />
3636
</sheet>
3737
</form>
3838
</field>

‎animal/views/animal_color.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<field name="model">animal.color</field>
77
<field name="arch" type="xml">
88
<tree string="colors">
9-
<field name="name"/>
10-
<field name="breed_id"/>
11-
<field name="species_id"/>
9+
<field name="name" />
10+
<field name="breed_id" />
11+
<field name="species_id" />
1212
</tree>
1313
</field>
1414
</record>
@@ -19,22 +19,22 @@
1919
<field name="model">animal.color</field>
2020
<field name="arch" type="xml">
2121
<form string="Color">
22-
<header/>
22+
<header />
2323
<sheet>
24-
<div class="oe_button_box" name="button_box"/>
24+
<div class="oe_button_box" name="button_box" />
2525
<div class="oe_title">
2626
<h1>
27-
<field name="name"/>
27+
<field name="name" />
2828
</h1>
2929
</div>
3030
<group id="main">
3131
<group id="left">
32-
<field name="breed_id"/>
33-
<field name="species_id"/>
32+
<field name="breed_id" />
33+
<field name="species_id" />
3434
</group>
35-
<group id="right"/>
35+
<group id="right" />
3636
</group>
37-
<notebook/>
37+
<notebook />
3838
</sheet>
3939
</form>
4040
</field>

0 commit comments

Comments
 (0)