Skip to content

Commit 7a1ce44

Browse files
moaadbourhimDeriman-Alonso
moaadbourhim
authored and
Deriman-Alonso
committed
[IMP] animal: black, isort, prettier
1 parent a681758 commit 7a1ce44

File tree

9 files changed

+93
-94
lines changed

9 files changed

+93
-94
lines changed

‎animal/__manifest__.py

Lines changed: 1 addition & 1 deletion
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": "14.0.1.0.1",
5+
"version": "15.0.1.0.1",
66
"license": "AGPL-3",
77
"summary": "Manage animals information",
88
"author": "Open Source Integrators, Odoo Community Association (OCA)",

‎animal/models/animal.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,15 @@ class Animal(models.Model):
99
_inherit = ["mail.thread", "mail.activity.mixin"]
1010
_order = "name"
1111

12-
name = fields.Char(string="Name")
12+
name = fields.Char()
1313
ref = fields.Char(string="Reference")
1414
species_id = fields.Many2one("animal.species", string="Species", required=True)
1515
breed_id = fields.Many2one("animal.breed", string="Breed", required=True)
1616
color_id = fields.Many2one("animal.color", string="Color")
17-
size = fields.Char(string="Size")
17+
size = fields.Char()
1818
weight = fields.Float(string="Weight (in kg)")
19-
birth_date = fields.Date(string="Birth Date")
19+
birth_date = fields.Date()
2020
gender = fields.Selection(
21-
string="Gender",
2221
selection=[
2322
("female", "Female"),
2423
("male", "Male"),
@@ -30,7 +29,7 @@ class Animal(models.Model):
3029
)
3130
active = fields.Boolean(default=True)
3231
image = fields.Binary(
33-
"Image", attachment=True, help="This field holds the photo of the animal."
32+
attachment=True, help="This field holds the photo of the animal."
3433
)
3534

3635
@api.onchange("species_id")

‎animal/models/animal_breed.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ class AnimalBreed(models.Model):
88
_description = "Animal Breeds"
99
_order = "name"
1010

11-
name = fields.Char(string="Name", translate=True)
11+
name = fields.Char(translate=True)
1212
species_id = fields.Many2one("animal.species", string="Species", required=True)

‎animal/models/animal_color.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class AnimalColor(models.Model):
77
_name = "animal.color"
88
_description = "Animal Colors"
99

10-
name = fields.Char(string="Name", translate=True)
10+
name = fields.Char(translate=True)
1111
breed_id = fields.Many2one("animal.breed", string="Breed", required=True)
1212
species_id = fields.Many2one(
1313
"animal.species", string="Species", related="breed_id.species_id", readonly=True

‎animal/models/animal_species.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ class AnimalSpecies(models.Model):
88
_description = "Animal Species"
99
_order = "name"
1010

11-
name = fields.Char(string="Name", translate=True)
11+
name = fields.Char(translate=True)
1212
breed_ids = fields.One2many("animal.breed", "species_id", string="Breeds")

‎animal/views/animal.xml

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<odoo>
2-
<data>
2+
33
<!-- Animal Tree View -->
44
<record id="view_animal_tree" model="ir.ui.view">
55
<field name="name">animal.tree</field>
66
<field name="model">animal</field>
77
<field name="arch" type="xml">
8-
<tree string="Animals">
8+
<tree>
99
<field name="ref" />
1010
<field name="name" />
1111
<field name="gender" />
@@ -24,34 +24,34 @@
2424
<form string="Animal">
2525
<sheet>
2626
<widget
27-
name="web_ribbon"
28-
title="Archived"
29-
bg_color="bg-danger"
30-
attrs="{'invisible': [('active', '=', True)]}"
31-
/>
27+
name="web_ribbon"
28+
title="Archived"
29+
bg_color="bg-danger"
30+
attrs="{'invisible': [('active', '=', True)]}"
31+
/>
3232
<field name="active" invisible="1" />
3333
<field name="image" widget='image' class="oe_avatar" />
3434
<div class="oe_title">
3535
<h1>
3636
<field name="name" />
3737
</h1>
3838
<field
39-
name="gender"
40-
widget="radio"
41-
options="{'horizontal': true}"
42-
/>
39+
name="gender"
40+
widget="radio"
41+
options="{'horizontal': true}"
42+
/>
4343
</div>
4444
<group id="main">
4545
<group id="left">
4646
<field name="species_id" />
4747
<field
48-
name="breed_id"
49-
domain="[('species_id', '=', species_id)]"
50-
/>
48+
name="breed_id"
49+
domain="[('species_id', '=', species_id)]"
50+
/>
5151
<field
52-
name="color_id"
53-
domain="[('breed_id', '=', breed_id)]"
54-
/>
52+
name="color_id"
53+
domain="[('breed_id', '=', breed_id)]"
54+
/>
5555
<field name="size" />
5656
</group>
5757
<group id="right">
@@ -65,10 +65,10 @@
6565
<field name="message_follower_ids" widget="mail_followers" />
6666
<field name="activity_ids" widget="mail_activity" />
6767
<field
68-
name="message_ids"
69-
widget="mail_thread"
70-
options="{'post_refresh': 'recipients'}"
71-
/>
68+
name="message_ids"
69+
widget="mail_thread"
70+
options="{'post_refresh': 'recipients'}"
71+
/>
7272
</div>
7373
</form>
7474
</field>
@@ -86,38 +86,38 @@
8686
<templates>
8787
<t t-name="kanban-box">
8888
<div
89-
class="oe_kanban_global_click o_kanban_record_has_image_fill o_res_partner_kanban"
90-
>
89+
class="oe_kanban_global_click o_kanban_record_has_image_fill o_res_partner_kanban"
90+
>
9191
<t t-if="record.image.raw_value">
9292
<img
93-
class="o_kanban_image"
94-
t-att-src="kanban_image('animal', 'image', record.id.raw_value)"
95-
t-att-alt="record.name"
96-
/>
93+
class="o_kanban_image"
94+
t-att-src="kanban_image('animal', 'image', record.id.raw_value)"
95+
t-att-alt="record.name"
96+
/>
9797
</t>
9898
<t t-else="">
9999
<img
100-
class="o_kanban_image"
101-
alt="Avatar"
102-
t-att-src='_s + "/animal/static/img/avatar.png"'
103-
/>
100+
class="o_kanban_image"
101+
alt="Avatar"
102+
t-att-src='_s + "/animal/static/img/avatar.png"'
103+
/>
104104
</t>
105105
<div class="oe_kanban_details">
106106
<strong
107-
class="o_kanban_record_title oe_partner_heading"
108-
>
107+
class="o_kanban_record_title oe_partner_heading"
108+
>
109109
<field name="display_name" />
110110
</strong>
111111
<div
112-
class="o_kanban_tags_section oe_kanban_partner_categories"
113-
/>
112+
class="o_kanban_tags_section oe_kanban_partner_categories"
113+
/>
114114
<ul>
115115
<li t-if="record.gender.raw_value">
116116
<field name="gender" />
117117
</li>
118118
<li
119-
t-if="record.species_id.raw_value and record.breed_id.raw_value"
120-
>
119+
t-if="record.species_id.raw_value and record.breed_id.raw_value"
120+
>
121121
<field name="breed_id" />
122122
<field name="species_id" />
123123
</li>
@@ -138,67 +138,67 @@
138138
<field name="arch" type="xml">
139139
<search string="Animals">
140140
<field
141-
name="name"
142-
filter_domain="['|', ('name', 'ilike', self), ('ref', 'ilike', self)]"
143-
string="Name"
144-
/>
141+
name="name"
142+
filter_domain="['|', ('name', 'ilike', self), ('ref', 'ilike', self)]"
143+
string="Name"
144+
/>
145145
<field name="species_id" />
146146
<field name="breed_id" />
147147
<field name="color_id" />
148148
<field name="size" />
149149
<separator />
150150
<filter
151-
string="Female"
152-
domain="[('gender', '=', 'female')]"
153-
name="female"
154-
/>
151+
string="Female"
152+
domain="[('gender', '=', 'female')]"
153+
name="female"
154+
/>
155155
<filter
156-
string="Male"
157-
domain="[('gender', '=', 'male')]"
158-
name="male"
159-
/>
156+
string="Male"
157+
domain="[('gender', '=', 'male')]"
158+
name="male"
159+
/>
160160
<filter
161-
string="Hermaphrodite"
162-
domain="[('gender', '=', 'hermaphrodite')]"
163-
name="hermaphrodite"
164-
/>
161+
string="Hermaphrodite"
162+
domain="[('gender', '=', 'hermaphrodite')]"
163+
name="hermaphrodite"
164+
/>
165165
<filter
166-
string="Neutered"
167-
domain="[('gender', '=', 'neutered')]"
168-
name="neutered"
169-
/>
166+
string="Neutered"
167+
domain="[('gender', '=', 'neutered')]"
168+
name="neutered"
169+
/>
170170
<separator />
171171
<filter
172-
string="Archived"
173-
name="inactive"
174-
domain="[('active', '=', False)]"
175-
/>
172+
string="Archived"
173+
name="inactive"
174+
domain="[('active', '=', False)]"
175+
/>
176176
<separator />
177177
<group expand="0" string="Group By">
178178
<filter
179-
name="gender"
180-
string="Gender"
181-
domain=""
182-
context="{'group_by': 'gender'}"
183-
/>
179+
name="gender"
180+
string="Gender"
181+
domain=""
182+
context="{'group_by': 'gender'}"
183+
/>
184184
<filter
185-
name="species_id"
186-
string="Species"
187-
domain=""
188-
context="{'group_by': 'species_id'}"
189-
/>
185+
name="species_id"
186+
string="Species"
187+
domain=""
188+
context="{'group_by': 'species_id'}"
189+
/>
190190
<filter
191-
name="breed_id"
192-
string="Breed"
193-
domain=""
194-
context="{'group_by': 'breed_id'}"
195-
/>
191+
name="breed_id"
192+
string="Breed"
193+
domain=""
194+
context="{'group_by': 'breed_id'}"
195+
/>
196196
<filter
197-
name="color_id"
198-
string="Color"
199-
domain=""
200-
context="{'group_by': 'color_id'}"
201-
/>
197+
name="color_id"
198+
string="Color"
199+
domain=""
200+
context="{'group_by': 'color_id'}"
201+
/>
202202
</group>
203203
</search>
204204
</field>
@@ -213,5 +213,5 @@
213213
<p class="o_view_nocontent_smiling_face">Create an animal</p>
214214
</field>
215215
</record>
216-
</data>
216+
217217
</odoo>

‎animal/views/animal_breed.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<field name="name">view.animal.breed.tree</field>
66
<field name="model">animal.breed</field>
77
<field name="arch" type="xml">
8-
<tree string="Breeds">
8+
<tree>
99
<field name="name" />
1010
<field name="species_id" />
1111
</tree>

‎animal/views/animal_color.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<field name="name">view.animal.color.tree</field>
66
<field name="model">animal.color</field>
77
<field name="arch" type="xml">
8-
<tree string="colors">
8+
<tree>
99
<field name="name" />
1010
<field name="breed_id" />
1111
<field name="species_id" />

‎animal/views/animal_species.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<field name="name">view.animal.species.tree</field>
66
<field name="model">animal.species</field>
77
<field name="arch" type="xml">
8-
<tree string="Species">
8+
<tree>
99
<field name="name" />
1010
</tree>
1111
</field>

0 commit comments

Comments
 (0)