From 98383dd65a684799648e17400146dd86dc8dcb09 Mon Sep 17 00:00:00 2001
From: Andhitia Rama <andhitia.r@gmail.com>
Date: Sat, 20 Jul 2024 23:36:47 +0700
Subject: [PATCH] [UPD] ssi_general_audit

---
 ssi_general_audit/models/client_account.py    |  9 ++--
 .../models/client_trial_balance.py            |  4 +-
 .../client_trial_balance_standard_detail.py   |  2 +-
 .../views/client_account_mapping_views.xml    | 24 +++++++---
 .../views/client_account_type_views.xml       | 33 ++++++++++++-
 .../views/client_account_views.xml            | 48 ++++++++++++++++++-
 .../views/client_trial_balance_views.xml      | 24 +++++++---
 .../views/general_audit_views.xml             | 28 +++++++----
 .../wizards/import_client_account.xml         |  2 +-
 9 files changed, 145 insertions(+), 29 deletions(-)

diff --git a/ssi_general_audit/models/client_account.py b/ssi_general_audit/models/client_account.py
index 536e4f3..15b28c8 100644
--- a/ssi_general_audit/models/client_account.py
+++ b/ssi_general_audit/models/client_account.py
@@ -35,11 +35,14 @@ class ClientAccount(models.Model):
         required=False,
         ondelete="restrict",
     )
+    group_id = fields.Many2one(
+        string="Account Group",
+        related="type_id.group_id",
+        store=True,
+    )
     normal_balance = fields.Selection(
-        string="Normal Balance",
         related="type_id.normal_balance",
-        stored=True,
-        required=False,
+        store=True,
     )
 
     @api.onchange(
diff --git a/ssi_general_audit/models/client_trial_balance.py b/ssi_general_audit/models/client_trial_balance.py
index a8bbb4c..2d21b83 100644
--- a/ssi_general_audit/models/client_trial_balance.py
+++ b/ssi_general_audit/models/client_trial_balance.py
@@ -439,7 +439,7 @@ def _check_debit_credit(self):
     def _reload_account(self):
         self.ensure_one()
         ClientAccount = self.env["client_account"]
-        Detail = self.env["client_trial_balance_detail"]
+        Detail = self.env["client_trial_balance.detail"]
         criteria = [
             ("partner_id", "=", self.partner_id.id),
         ]
@@ -469,7 +469,7 @@ def _get_account_type_dict(self):
             "account_type": {},
             "account_group": {},
         }
-        StandardDetail = self.env["client_trial_balance_standard_detail"]
+        StandardDetail = self.env["client_trial_balance.standard_detail"]
         criteria = [
             ("trial_balance_id", "=", self.id),
         ]
diff --git a/ssi_general_audit/models/client_trial_balance_standard_detail.py b/ssi_general_audit/models/client_trial_balance_standard_detail.py
index dd5e991..255a3b0 100644
--- a/ssi_general_audit/models/client_trial_balance_standard_detail.py
+++ b/ssi_general_audit/models/client_trial_balance_standard_detail.py
@@ -28,7 +28,7 @@ class ClientTrialBalanceStandardDetail(models.Model):
         "trial_balance_id.detail_ids.credit",
     )
     def _compute_balance(self):
-        obj_detail = self.env["client_trial_balance_detail"]
+        obj_detail = self.env["client_trial_balance.detail"]
         for document in self:
             balance = opening_balance = debit = credit = 0.0
             criteria = [
diff --git a/ssi_general_audit/views/client_account_mapping_views.xml b/ssi_general_audit/views/client_account_mapping_views.xml
index 18d8250..98645be 100644
--- a/ssi_general_audit/views/client_account_mapping_views.xml
+++ b/ssi_general_audit/views/client_account_mapping_views.xml
@@ -49,12 +49,24 @@
 
             </xpath>
             <xpath expr="//group[@name='header_right']" position="inside">
-                <field name="date_start" />
-                <field name="date_end" />
-                <field name="previous_date_start" />
-                <field name="previous_date_end" />
-                <field name="interim_date_start" />
-                <field name="interim_date_end" />
+                <label for="date_start" string="Audit Period" />
+                <div class="o_row">
+                    <field name="date_start" class="oe_inline" />
+                    <span class="oe_inline">To</span>
+                    <field name="date_end" class="oe_inline" />
+                </div>
+                <label for="previous_date_start" string="Previous Audit Period" />
+                <div class="o_row">
+                    <field name="previous_date_start" class="oe_inline" />
+                    <span class="oe_inline">To</span>
+                    <field name="previous_date_end" class="oe_inline" />
+                </div>
+                <label for="interim_date_start" string="Interim Audit Period" />
+                <div class="o_row">
+                    <field name="interim_date_start" class="oe_inline" />
+                    <span class="oe_inline">To</span>
+                    <field name="interim_date_end" class="oe_inline" />
+                </div>
             </xpath>
             <xpath expr="//page[@name='note']" position="before">
                 <page name="mapping" string="Account Mappings">
diff --git a/ssi_general_audit/views/client_account_type_views.xml b/ssi_general_audit/views/client_account_type_views.xml
index 92026d0..1620299 100644
--- a/ssi_general_audit/views/client_account_type_views.xml
+++ b/ssi_general_audit/views/client_account_type_views.xml
@@ -13,7 +13,34 @@
         />
         <field name="mode">primary</field>
         <field name="arch" type="xml">
-            <data />
+            <data>
+                <xpath expr="//field[@name='code']" position="after">
+                    <field name="group_id" />
+                    <field name="normal_balance" />
+                    <filter
+                        name="dom_debit"
+                        string="Debit"
+                        domain="[('normal_balance','=','dr')]"
+                    />
+                    <filter
+                        name="dom_credit"
+                        string="Credit"
+                        domain="[('normal_balance','=','cr')]"
+                    />
+                    <group name="group_main">
+                        <filter
+                            name="grp_group_id"
+                            string="Account Group"
+                            context="{'group_by':'group_id'}"
+                        />
+                        <filter
+                            name="grp_normal_balance"
+                            string="Normal Balance"
+                            context="{'group_by':'normal_balance'}"
+                        />
+                    </group>
+                </xpath>
+            </data>
         </field>
     </record>
 
@@ -30,6 +57,10 @@
                 <xpath expr="//field[@name='code']" position="before">
                     <field name="sequence" widget="handle" />
                 </xpath>
+                <xpath expr="//field[@name='name']" position="after">
+                    <field name="group_id" />
+                    <field name="normal_balance" />
+                </xpath>
             </data>
         </field>
     </record>
diff --git a/ssi_general_audit/views/client_account_views.xml b/ssi_general_audit/views/client_account_views.xml
index 5123699..1d75bc2 100644
--- a/ssi_general_audit/views/client_account_views.xml
+++ b/ssi_general_audit/views/client_account_views.xml
@@ -13,7 +13,46 @@
         />
         <field name="mode">primary</field>
         <field name="arch" type="xml">
-            <data />
+            <data>
+                <xpath expr="//field[@name='code']" position="after">
+                    <field name="type_id" />
+                    <field name="group_id" />
+                    <field name="normal_balance" />
+                    <field name="partner_id" />
+                    <filter
+                        name="dom_debit"
+                        string="Debit"
+                        domain="[('normal_balance','=','dr')]"
+                    />
+                    <filter
+                        name="dom_credit"
+                        string="Credit"
+                        domain="[('normal_balance','=','cr')]"
+                    />
+                    <group name="group_main">
+                        <filter
+                            name="grp_partner_id"
+                            string="Partner"
+                            context="{'group_by':'partner_id'}"
+                        />
+                        <filter
+                            name="grp_group_id"
+                            string="Account Group"
+                            context="{'group_by':'group_id'}"
+                        />
+                        <filter
+                            name="grp_type_id"
+                            string="Account Type"
+                            context="{'group_by':'type_id'}"
+                        />
+                        <filter
+                            name="grp_normal_balance"
+                            string="Normal Balance"
+                            context="{'group_by':'normal_balance'}"
+                        />
+                    </group>
+                </xpath>
+            </data>
         </field>
     </record>
 
@@ -30,6 +69,12 @@
                 <xpath expr="//field[@name='code']" position="before">
                     <field name="sequence" widget="handle" />
                 </xpath>
+                <xpath expr="//field[@name='code']" position="after">
+                    <field name="type_id" />
+                    <field name="group_id" />
+                    <field name="normal_balance" />
+                    <field name="partner_id" />
+                </xpath>
             </data>
         </field>
     </record>
@@ -48,6 +93,7 @@
                     <field name="sequence" />
                     <field name="partner_id" />
                     <field name="type_id" />
+                    <field name="group_id" />
                     <field name="normal_balance" />
                 </xpath>
             </data>
diff --git a/ssi_general_audit/views/client_trial_balance_views.xml b/ssi_general_audit/views/client_trial_balance_views.xml
index 04ebb78..3d7af93 100644
--- a/ssi_general_audit/views/client_trial_balance_views.xml
+++ b/ssi_general_audit/views/client_trial_balance_views.xml
@@ -52,12 +52,24 @@
 
             </xpath>
             <xpath expr="//group[@name='header_right']" position="inside">
-                <field name="date_start" />
-                <field name="date_end" />
-                <field name="previous_date_start" />
-                <field name="previous_date_end" />
-                <field name="interim_date_start" />
-                <field name="interim_date_end" />
+                <label for="date_start" string="Audit Period" />
+                <div class="o_row">
+                    <field name="date_start" class="oe_inline" />
+                    <span class="oe_inline">To</span>
+                    <field name="date_end" class="oe_inline" />
+                </div>
+                <label for="previous_date_start" string="Previous Audit Period" />
+                <div class="o_row">
+                    <field name="previous_date_start" class="oe_inline" />
+                    <span class="oe_inline">To</span>
+                    <field name="previous_date_end" class="oe_inline" />
+                </div>
+                <label for="interim_date_start" string="Interim Audit Period" />
+                <div class="o_row">
+                    <field name="interim_date_start" class="oe_inline" />
+                    <span class="oe_inline">To</span>
+                    <field name="interim_date_end" class="oe_inline" />
+                </div>
             </xpath>
             <xpath expr="//page[@name='note']" position="before">
                     <page
diff --git a/ssi_general_audit/views/general_audit_views.xml b/ssi_general_audit/views/general_audit_views.xml
index c7e5e4c..416ed62 100644
--- a/ssi_general_audit/views/general_audit_views.xml
+++ b/ssi_general_audit/views/general_audit_views.xml
@@ -64,18 +64,30 @@
                         domain="[('parent_id','=',False),('is_company','=',True)]"
                         widget="many2one_avatar"
                     />
-                <field name="accountant_id" />
-                <field name="account_type_set_id" />
                 <field name="financial_accounting_standard_id" />
                 <field name="currency_id" />
+                <field name="account_type_set_id" />
+                <field name="accountant_id" />
             </xpath>
             <xpath expr="//group[@name='header_right']" position="inside">
-                <field name="date_start" />
-                <field name="date_end" />
-                <field name="previous_date_start" />
-                <field name="previous_date_end" />
-                <field name="interim_date_start" />
-                <field name="interim_date_end" />
+                <label for="date_start" string="Audit Period" />
+                <div class="o_row">
+                    <field name="date_start" class="oe_inline" />
+                    <span class="oe_inline">To</span>
+                    <field name="date_end" class="oe_inline" />
+                </div>
+                <label for="previous_date_start" string="Previous Audit Period" />
+                <div class="o_row">
+                    <field name="previous_date_start" class="oe_inline" />
+                    <span class="oe_inline">To</span>
+                    <field name="previous_date_end" class="oe_inline" />
+                </div>
+                <label for="interim_date_start" string="Interim Audit Period" />
+                <div class="o_row">
+                    <field name="interim_date_start" class="oe_inline" />
+                    <span class="oe_inline">To</span>
+                    <field name="interim_date_end" class="oe_inline" />
+                </div>
             </xpath>
             <xpath expr="//group[@name='header_center']" position="inside">
                 <field name="title" />
diff --git a/ssi_general_audit/wizards/import_client_account.xml b/ssi_general_audit/wizards/import_client_account.xml
index 292e436..c1c74ef 100644
--- a/ssi_general_audit/wizards/import_client_account.xml
+++ b/ssi_general_audit/wizards/import_client_account.xml
@@ -10,7 +10,7 @@
     <field name="arch" type="xml">
         <form>
             <group name="main" colspan="2" col="2">
-                <field name="mapping_id" invisible="0" />
+                <field name="mapping_id" invisible="1" />
                 <field name="data" />
             </group>
             <footer>