From 652c5c063cf764fbbc680cf6b1631893d0340315 Mon Sep 17 00:00:00 2001
From: David Beal <david.beal@akretion.com>
Date: Mon, 7 Feb 2022 16:08:16 +0100
Subject: [PATCH 1/3] FIX animal: security on animal_species

---
 animal/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/animal/security/ir.model.access.csv b/animal/security/ir.model.access.csv
index e52e11b05..c84981597 100644
--- a/animal/security/ir.model.access.csv
+++ b/animal/security/ir.model.access.csv
@@ -5,4 +5,4 @@ access_animal_color_manager,animal.color.manaager,model_animal_color,animal.grou
 access_animal_breed_user,animal.breed.user,model_animal_breed,base.group_user,1,0,0,0
 access_animal_breed_manager,animal.breed.manager,model_animal_breed,animal.group_animal_manager,1,1,1,1
 access_animal_species_user,animal.species.user,model_animal_species,base.group_user,1,0,0,0
-access_animal_species_manager,animal.species.manager,model_animal_species,animal.group_animal_manager,1,1,1,0
+access_animal_species_manager,animal.species.manager,model_animal_species,animal.group_animal_manager,1,1,1,1

From 389f37de19acbb2c669bdb396c4bea893c069687 Mon Sep 17 00:00:00 2001
From: David Beal <david.beal@akretion.com>
Date: Mon, 7 Feb 2022 16:12:42 +0100
Subject: [PATCH 2/3] IMP animal: ergonomy with fields sequence, active

---
 animal/models/animal_breed.py   | 2 ++
 animal/models/animal_species.py | 2 ++
 animal/views/animal_breed.xml   | 8 ++++++++
 animal/views/animal_species.xml | 8 ++++++++
 4 files changed, 20 insertions(+)

diff --git a/animal/models/animal_breed.py b/animal/models/animal_breed.py
index 901544426..ac03ae25e 100644
--- a/animal/models/animal_breed.py
+++ b/animal/models/animal_breed.py
@@ -10,3 +10,5 @@ class AnimalBreed(models.Model):
 
     name = fields.Char(string="Name", translate=True)
     species_id = fields.Many2one("animal.species", string="Species", required=True)
+    active = fields.Boolean(default=True)
+    sequence = fields.Integer()
diff --git a/animal/models/animal_species.py b/animal/models/animal_species.py
index 4afb8b2db..4d281369b 100644
--- a/animal/models/animal_species.py
+++ b/animal/models/animal_species.py
@@ -9,4 +9,6 @@ class AnimalSpecies(models.Model):
     _order = "name"
 
     name = fields.Char(string="Name", translate=True)
+    active = fields.Boolean(default=True)
+    sequence = fields.Integer()
     breed_ids = fields.One2many("animal.breed", "species_id", string="Breeds")
diff --git a/animal/views/animal_breed.xml b/animal/views/animal_breed.xml
index 52875e619..11ffdefa1 100644
--- a/animal/views/animal_breed.xml
+++ b/animal/views/animal_breed.xml
@@ -6,6 +6,7 @@
         <field name="model">animal.breed</field>
         <field name="arch" type="xml">
             <tree string="Breeds">
+                <field name="sequence" widget="handle" />
                 <field name="name" />
                 <field name="species_id" />
             </tree>
@@ -21,6 +22,13 @@
                 <header />
                 <sheet>
                     <div class="oe_button_box" name="button_box" />
+                    <widget
+                        name="web_ribbon"
+                        title="Archived"
+                        bg_color="bg-danger"
+                        attrs="{'invisible': [('active', '=', True)]}"
+                    />
+                    <field name="active" invisible="1" />
                     <div class="oe_title">
                         <h1>
                             <field name="name" />
diff --git a/animal/views/animal_species.xml b/animal/views/animal_species.xml
index 32f69d20b..a5b7842d6 100644
--- a/animal/views/animal_species.xml
+++ b/animal/views/animal_species.xml
@@ -6,6 +6,7 @@
         <field name="model">animal.species</field>
         <field name="arch" type="xml">
             <tree string="Species">
+                <field name="sequence" widget="handle" />
                 <field name="name" />
             </tree>
         </field>
@@ -20,6 +21,13 @@
                 <header />
                 <sheet>
                     <div class="oe_button_box" name="button_box" />
+                    <widget
+                        name="web_ribbon"
+                        title="Archived"
+                        bg_color="bg-danger"
+                        attrs="{'invisible': [('active', '=', True)]}"
+                    />
+                    <field name="active" invisible="1" />
                     <div class="oe_title">
                         <h1>
                             <field name="name" />

From 9609669261edb8b225328c3ae01087dd9b784b5e Mon Sep 17 00:00:00 2001
From: David Beal <david.beal@akretion.com>
Date: Mon, 7 Feb 2022 16:13:40 +0100
Subject: [PATCH 3/3] IMP animal_owner: ergonomy, move partner_id

---
 animal_owner/views/animal.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/animal_owner/views/animal.xml b/animal_owner/views/animal.xml
index 49bb4cfc1..80cf3befd 100644
--- a/animal_owner/views/animal.xml
+++ b/animal_owner/views/animal.xml
@@ -18,7 +18,7 @@
         <field name="model">animal</field>
         <field name="inherit_id" ref="animal.view_animal_form" />
         <field name="arch" type="xml">
-            <field name="birth_date" position="after">
+            <field name="species_id" position="after">
                 <field name="partner_id" />
             </field>
         </field>