From 3e2c5f0289190e65746a111a90b997eec3ef8bcc Mon Sep 17 00:00:00 2001
From: Anna Janiszewska <anna.janiszewska@camptocamp.com>
Date: Tue, 31 Jan 2023 11:00:18 +0100
Subject: [PATCH] fixup! [MIG] pingen: Migration to 16.0

---
 pingen/models/base_config_settings.py | 28 +++++++++++----
 pingen/views/base_config_settings.xml | 50 +++++++++++++++++++--------
 pingen/views/pingen_document_view.xml |  9 +++--
 3 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/pingen/models/base_config_settings.py b/pingen/models/base_config_settings.py
index 60ec128c392..0ac91437e0c 100644
--- a/pingen/models/base_config_settings.py
+++ b/pingen/models/base_config_settings.py
@@ -3,11 +3,27 @@
 from odoo import fields, models
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = "res.config.settings"
 
-    pingen_clientid = fields.Char(related="company_id.pingen_clientid")
-    pingen_client_secretid = fields.Char(related="company_id.pingen_client_secretid")
-    pingen_organization = fields.Char(related="company_id.pingen_organization")
-    pingen_webhook_secret = fields.Char(related="company_id.pingen_webhook_secret")
-    pingen_staging = fields.Boolean(related="company_id.pingen_staging")
+    pingen_clientid = fields.Char(
+        string="Pingen Client ID", related="company_id.pingen_clientid", readonly=False
+    )
+    pingen_client_secretid = fields.Char(
+        string="Pingen Client Secret ID",
+        related="company_id.pingen_client_secretid",
+        readonly=False,
+    )
+    pingen_organization = fields.Char(
+        string="Pingen organization",
+        related="company_id.pingen_organization",
+        readonly=False,
+    )
+    pingen_webhook_secret = fields.Char(
+        string="Pingen webhook secret",
+        related="company_id.pingen_webhook_secret",
+        readonly=False,
+    )
+    pingen_staging = fields.Boolean(
+        string="Pingen Staging", related="company_id.pingen_staging", readonly=False
+    )
diff --git a/pingen/views/base_config_settings.xml b/pingen/views/base_config_settings.xml
index f9f31bf40c0..538d389920b 100644
--- a/pingen/views/base_config_settings.xml
+++ b/pingen/views/base_config_settings.xml
@@ -5,20 +5,42 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="base_setup.res_config_settings_view_form" />
         <field name="arch" type="xml">
-             <xpath expr="//div[@name='integration']" position='inside'>
-                <div class="col-12 col-lg-6 o_setting_box" id="pingen_integraton">
-                    <div class="o_setting_left_pane">
-                        <field name="pingen_clientid" groups="base.group_system" />
-                        <field
-                            name="pingen_client_secretid"
-                            groups="base.group_system"
-                        />
-                        <field name="pingen_organization" groups="base.group_system" />
-                        <field
-                            name="pingen_webhook_secret"
-                            groups="base.group_system"
-                        />
-                        <field name="pingen_staging" groups="base.group_system" />
+             <xpath expr="//div[@name='integration']" position='after'>
+                <h2>Pingen</h2>
+                <div class="o_settings_container" id="pingen_integraton">
+                    <div
+                        id="pingen_configuration_settings"
+                        class="o_settings_box col-12 col-lg-6"
+                    >
+                        <div class="mt16 row">
+                            <label class="o_form_label col-3" for="pingen_clientid" />
+                            <field name="pingen_clientid" />
+                        </div>
+                        <div class="mt16 row">
+                            <label
+                                class="o_form_label col-3"
+                                for="pingen_client_secretid"
+                            />
+                            <field name="pingen_client_secretid" />
+                        </div>
+                        <div class="mt16 row">
+                            <label
+                                class="o_form_label col-3"
+                                for="pingen_organization"
+                            />
+                            <field name="pingen_organization" />
+                        </div>
+                        <div class="mt16 row">
+                            <label
+                                class="o_form_label col-3"
+                                for="pingen_webhook_secret"
+                            />
+                                <field name="pingen_webhook_secret" />
+                        </div>
+                        <div class="mt16 row">
+                            <label class="o_form_label col-3" for="pingen_staging" />
+                            <field name="pingen_staging" />
+                        </div>
                     </div>
                 </div>
             </xpath>
diff --git a/pingen/views/pingen_document_view.xml b/pingen/views/pingen_document_view.xml
index c6d9aef1683..9494ca1f916 100644
--- a/pingen/views/pingen_document_view.xml
+++ b/pingen/views/pingen_document_view.xml
@@ -53,7 +53,7 @@
                         string="Update the letter's informations"
                         icon="fa-refresh"
                     />
-          <field
+        <field
                         name="state"
                         widget="statusbar"
                         statusbar_visible="pending,pushed,sent"
@@ -162,7 +162,6 @@
     <field name="type">search</field>
     <field name="arch" type="xml">
       <search>
-<!--    FIXME: Invalid view pingen.document.search definition in pingen/views/pingen_document_view.xml
         <filter name="pending" string="Pending" domain="[('state','=','pending')]" />
         <filter name="pushed" string="Pushed" domain="[('state','=','pushed')]" />
         <filter
@@ -170,8 +169,8 @@
                     string="In Sendcenter"
                     domain="[('state','=','sendcenter')]"
                 />
-        <filter icon="kanban-apply" string="Sent" domain="[('state','=','sent')]" />
-        <filter icon="kanban-stop" string="Error" domain="[('state','=','error')]" />
+        <filter name="sent" string="Sent" domain="[('state','=','sent')]" />
+        <filter name="error" string="Error" domain="[('state','=','error')]" />
         <filter
                     name="error"
                     string="Pingen Error"
@@ -183,7 +182,7 @@
                     domain="[('state','=','canceled')]"
                 />
         <separator orientation="vertical" />
-        <field name="attachment_id" /> -->
+        <field name="attachment_id" />
       </search>
     </field>
   </record>