From cc9686973b8771d830bf48427b39a2946385e41d Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis.delattre@akretion.com>
Date: Mon, 6 Jan 2025 14:31:12 +0000
Subject: [PATCH] [IMP] l10n_fr_chorus_account: backport view improvements from
 v18

Fix accounting config view for boolean options
---
 l10n_fr_chorus_account/security/group.xml     |  4 ++
 .../security/ir.model.access.csv              |  1 +
 l10n_fr_chorus_account/views/account_move.xml | 28 +++++----
 l10n_fr_chorus_account/views/chorus_flow.xml  |  7 ++-
 .../views/chorus_partner_service.xml          |  4 +-
 .../views/config_settings.xml                 | 60 ++++++++++++-------
 l10n_fr_chorus_account/views/res_partner.xml  | 22 ++++++-
 7 files changed, 90 insertions(+), 36 deletions(-)

diff --git a/l10n_fr_chorus_account/security/group.xml b/l10n_fr_chorus_account/security/group.xml
index 3be6d5727..02c611201 100644
--- a/l10n_fr_chorus_account/security/group.xml
+++ b/l10n_fr_chorus_account/security/group.xml
@@ -9,6 +9,10 @@
             <field name="name">Chorus API</field>
             <field name="category_id" ref="base.module_category_hidden" />
         </record>
+        <record id="group_chorus_api_debug" model="res.groups">
+            <field name="name">Chorus API Debugging</field>
+            <field name="category_id" ref="base.module_category_hidden" />
+        </record>
     </data>
     <data noupdate="1">
         <record id="chorus_flow_rule" model="ir.rule">
diff --git a/l10n_fr_chorus_account/security/ir.model.access.csv b/l10n_fr_chorus_account/security/ir.model.access.csv
index 128c49d89..603b157fd 100644
--- a/l10n_fr_chorus_account/security/ir.model.access.csv
+++ b/l10n_fr_chorus_account/security/ir.model.access.csv
@@ -1,4 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_chorus_flow_readonly,Read-only access on chorus.flow to account viewer,model_chorus_flow,account.group_account_readonly,1,0,0,0
 access_chorus_flow_user,Read/Write/Create access on chorus.flow to invoicing grp,model_chorus_flow,account.group_account_invoice,1,1,1,0
 access_chorus_flow_full,Full access on chorus.flow to system grp,model_chorus_flow,base.group_system,1,1,1,1
 access_chorus_partner_service_full,Full access on chorus.partner.service to system grp,model_chorus_partner_service,base.group_system,1,1,1,1
diff --git a/l10n_fr_chorus_account/views/account_move.xml b/l10n_fr_chorus_account/views/account_move.xml
index 2bcf02701..89b040fcd 100644
--- a/l10n_fr_chorus_account/views/account_move.xml
+++ b/l10n_fr_chorus_account/views/account_move.xml
@@ -30,17 +30,25 @@
                 <group name="chorus-tab">
                     <group name="chorus-main">
                         <field name="chorus_flow_id" />
-                        <field name="chorus_identifier" />
-                        <field name="chorus_status" />
-                        <field name="chorus_status_date" />
-                        <button
-                                name="chorus_update_invoice_status"
-                                type="object"
-                                string="Update Chorus Invoice Status"
-                                attrs="{'invisible': [('chorus_identifier', 'in', (False, 0))]}"
-                                colspan="2"
-                                class="btn-default"
+                        <field name="chorus_identifier" invisible="1" />
+                        <field
+                                name="chorus_identifier"
+                                groups="l10n_fr_chorus_account.group_chorus_api_debug"
                             />
+                        <field name="chorus_status" />
+                        <label for="chorus_status_date" />
+                        <div name="chorus_status_date" class="o_row">
+                            <field name="chorus_status_date" />
+                            <button
+                                    name="chorus_update_invoice_status"
+                                    type="object"
+                                    string="Update"
+                                    help="Update Chorus Invoice Status"
+                                    class="btn-link mb-1 px-0"
+                                    icon="fa-refresh"
+                                    attrs="{'invisible': [('chorus_identifier', '=', False)]}"
+                                />
+                        </div>
                     </group>
                 <group name="chorus-attachments" string="Attachments">
                         <field
diff --git a/l10n_fr_chorus_account/views/chorus_flow.xml b/l10n_fr_chorus_account/views/chorus_flow.xml
index eea0673d5..140da4286 100644
--- a/l10n_fr_chorus_account/views/chorus_flow.xml
+++ b/l10n_fr_chorus_account/views/chorus_flow.xml
@@ -51,7 +51,10 @@
                             <field name="currency_id" invisible="1" />
                             <field name="state" invisible="1" />
                             <field name="payment_state" />
-                            <field name="chorus_identifier" />
+                            <field
+                                name="chorus_identifier"
+                                groups="l10n_fr_chorus_account.group_chorus_api_debug"
+                            />
                             <field name="chorus_status" />
                             <field name="chorus_status_date" />
                         </tree>
@@ -92,6 +95,8 @@
         <field name="arch" type="xml">
             <search>
                 <field name="name" />
+                <separator />
+                <filter string="Date" name="date" date="date" />
                 <group string="Group By" name="groupby">
                     <filter
                         name="status_groupby"
diff --git a/l10n_fr_chorus_account/views/chorus_partner_service.xml b/l10n_fr_chorus_account/views/chorus_partner_service.xml
index b9a4cd3b1..44f45af12 100644
--- a/l10n_fr_chorus_account/views/chorus_partner_service.xml
+++ b/l10n_fr_chorus_account/views/chorus_partner_service.xml
@@ -21,7 +21,7 @@
                     <field name="active" />
                     <field
                         name="chorus_identifier"
-                        groups="l10n_fr_chorus_account.group_chorus_api"
+                        groups="l10n_fr_chorus_account.group_chorus_api_debug"
                     />
                 </group>
             </form>
@@ -41,7 +41,7 @@
                 <field name="engagement_required" />
                 <field
                     name="chorus_identifier"
-                    groups="l10n_fr_chorus_account.group_chorus_api"
+                    groups="l10n_fr_chorus_account.group_chorus_api_debug"
                 />
             </tree>
         </field>
diff --git a/l10n_fr_chorus_account/views/config_settings.xml b/l10n_fr_chorus_account/views/config_settings.xml
index 5bd16c9c2..53207085a 100644
--- a/l10n_fr_chorus_account/views/config_settings.xml
+++ b/l10n_fr_chorus_account/views/config_settings.xml
@@ -31,20 +31,33 @@
                     >
                         <div class="o_setting_left_pane" />
                         <div class="o_setting_right_pane">
-                            <div class="row">
-                                <label
-                                    for="fr_chorus_invoice_format"
-                                    class="col-md-5 o_light_label"
-                                />
-                                <field name="fr_chorus_invoice_format" />
-                            </div>
-                            <div class="row">
+                            <label
+                                for="fr_chorus_invoice_format"
+                                class="col-md-5 o_light_label"
+                            />
+                            <field name="fr_chorus_invoice_format" />
+                        </div>
+                    </div>
+                    <div
+                        class="col-xs-12 col-md-12 o_setting_box"
+                        attrs="{'invisible': [('group_chorus_api', '=', False)]}"
+                    >
+                        <div class="o_setting_left_pane">
+                            <field name="fr_chorus_check_commitment_number" />
+                        </div>
+                        <div class="o_setting_right_pane">
                                 <label
-                                    for="fr_chorus_check_commitment_number"
-                                    class="col-md-5 o_light_label"
-                                />
-                                <field name="fr_chorus_check_commitment_number" />
-                            </div>
+                                for="fr_chorus_check_commitment_number"
+                                class="col-md-5 o_light_label"
+                            />
+                        </div>
+                    </div>
+                    <div
+                        class="col-xs-12 col-md-12 o_setting_box"
+                        attrs="{'invisible': [('group_chorus_api', '=', False)]}"
+                    >
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
                             <div class="row">
                                 <label
                                     for="fr_chorus_api_login"
@@ -76,13 +89,20 @@
                                     widget="many2many_tags"
                                 />
                             </div>
-                            <div class="row">
-                                <label
-                                    for="fr_chorus_qualif"
-                                    class="col-md-5 o_light_label"
-                                />
-                                <field name="fr_chorus_qualif" />
-                            </div>
+                        </div>
+                    </div>
+                    <div
+                        class="col-xs-12 col-md-12 o_setting_box"
+                        attrs="{'invisible': [('group_chorus_api', '=', False)]}"
+                    >
+                        <div class="o_setting_left_pane">
+                            <field name="fr_chorus_qualif" />
+                        </div>
+                        <div class="o_setting_right_pane">
+                            <label
+                                for="fr_chorus_qualif"
+                                class="col-md-5 o_light_label"
+                            />
                         </div>
                     </div>
                 </div>
diff --git a/l10n_fr_chorus_account/views/res_partner.xml b/l10n_fr_chorus_account/views/res_partner.xml
index 580af6942..4d0299ecd 100644
--- a/l10n_fr_chorus_account/views/res_partner.xml
+++ b/l10n_fr_chorus_account/views/res_partner.xml
@@ -41,21 +41,37 @@
                     <button
                         name="fr_chorus_identifier_and_required_button"
                         type="object"
-                        string="Update Chorus Info and Services"
+                        string="Get Chorus Info and Services"
                         colspan="2"
                         class="btn-primary"
                         groups="l10n_fr_chorus_account.group_chorus_api"
+                        attrs="{'invisible': [('fr_chorus_required', '!=', False)]}"
                     />
-                    <field name="fr_chorus_required" />
+
+                    <label for="fr_chorus_required" />
+                    <div name="fr_chorus_required" class="o_row">
+                        <field name="fr_chorus_required" />
+                        <button
+                            name="fr_chorus_identifier_and_required_button"
+                            type="object"
+                            string="Update"
+                            class="btn-link mb-1 px-0"
+                            icon="fa-refresh"
+                            groups="l10n_fr_chorus_account.group_chorus_api"
+                            attrs="{'invisible': [('fr_chorus_required', '=', False)]}"
+                            help="Update Info Required for Chorus and Chorus Services"
+                        />
+                    </div>
                     <field
                         name="fr_chorus_identifier"
-                        groups="l10n_fr_chorus_account.group_chorus_api"
+                        groups="l10n_fr_chorus_account.group_chorus_api_debug"
                     />
                     <button
                         type="action"
                         class="btn-link"
                         name="%(chorus_partner_service_action)d"
                         context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}"
+                        colspan="2"
                     >
                         <field
                             name="fr_chorus_service_count"