From 38e6f5f864e3f1307e7db864a96b1ae19ce0414e Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis.delattre@akretion.com>
Date: Wed, 5 Sep 2018 10:24:42 +0200
Subject: [PATCH] report_qweb: Fix layout issue introduced by PR
 https://github.com/OCA/account-financial-reporting/pull/445

---
 .../wizard/general_ledger_wizard_view.xml      | 18 +++++++++---------
 .../wizard/trial_balance_wizard.py             |  1 +
 .../wizard/trial_balance_wizard_view.xml       | 10 +++++-----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/account_financial_report_qweb/wizard/general_ledger_wizard_view.xml b/account_financial_report_qweb/wizard/general_ledger_wizard_view.xml
index 73cc7569..da6823a2 100644
--- a/account_financial_report_qweb/wizard/general_ledger_wizard_view.xml
+++ b/account_financial_report_qweb/wizard/general_ledger_wizard_view.xml
@@ -17,6 +17,7 @@
                             <field name="date_from"/>
                             <field name="date_to"/>
                             <field name="fy_start_date" invisible="1"/>
+                            <field name="journal_ids" widget="many2many_tags" options="{'no_create': True}"/>
                         </group>
                         <group name="other_filters">
                             <field name="target_move" widget="radio"/>
@@ -25,15 +26,14 @@
                             <field name="foreign_currency"/>
                         </group>
                     </group>
-                    <label for="cost_center_ids" groups="analytic.group_analytic_accounting"/>
-                    <field name="cost_center_ids" nolabel="1" options="{'no_create': True}" groups="analytic.group_analytic_accounting"/>
-                    <group/>
-                    <label for="partner_ids"/>
-                    <field name="partner_ids" nolabel="1" options="{'no_create': True}"/>
-                    <group/>
-                    <label for="journal_ids"/>
-                    <field name="journal_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
-                    <group/>
+                    <group groups="analytic.group_analytic_accounting" name="cost_center_filter" col="1">
+                        <label for="cost_center_ids"/>
+                        <field name="cost_center_ids" nolabel="1" options="{'no_create': True}" groups="analytic.group_analytic_accounting"/>
+                    </group>
+                    <group name="partner_filter" col="1">
+                        <label for="partner_ids"/>
+                        <field name="partner_ids" nolabel="1" options="{'no_create': True}"/>
+                    </group>
                     <label for="account_ids"/>
                     <group col="4">
                         <field name="receivable_accounts_only"/>
diff --git a/account_financial_report_qweb/wizard/trial_balance_wizard.py b/account_financial_report_qweb/wizard/trial_balance_wizard.py
index d58b7031..0025cb6e 100644
--- a/account_financial_report_qweb/wizard/trial_balance_wizard.py
+++ b/account_financial_report_qweb/wizard/trial_balance_wizard.py
@@ -51,6 +51,7 @@ class TrialBalanceReportWizard(models.TransientModel):
     )
     journal_ids = fields.Many2many(
         comodel_name="account.journal",
+        string="Filter journals",
     )
 
     not_only_one_unaffected_earnings_account = fields.Boolean(
diff --git a/account_financial_report_qweb/wizard/trial_balance_wizard_view.xml b/account_financial_report_qweb/wizard/trial_balance_wizard_view.xml
index c609e214..3486cfe3 100644
--- a/account_financial_report_qweb/wizard/trial_balance_wizard_view.xml
+++ b/account_financial_report_qweb/wizard/trial_balance_wizard_view.xml
@@ -17,6 +17,7 @@
                             <field name="date_from"/>
                             <field name="date_to"/>
                             <field name="fy_start_date" invisible="1"/>
+                            <field name="journal_ids" widget="many2many_tags" options="{'no_create': True}"/>
                         </group>
                         <group name="other_filters">
                             <field name="target_move" widget="radio"/>
@@ -25,11 +26,10 @@
                             <field name="foreign_currency"/>
                         </group>
                     </group>
-                    <label for="partner_ids" attrs="{'invisible':[('show_partner_details','!=',True)]}"/>
-                    <field name="partner_ids" nolabel="1" options="{'no_create': True}" attrs="{'invisible':[('show_partner_details','!=',True)]}"/>
-                    <label for="journal_ids"/>
-                    <field name="journal_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
-                    <group attrs="{'invisible':[('show_partner_details','!=',True)]}"/>
+                    <group name="partner_filter" attrs="{'invisible':[('show_partner_details','!=',True)]}" col="1">
+                        <label for="partner_ids"/>
+                        <field name="partner_ids" nolabel="1" options="{'no_create': True}"/>
+                    </group>
                     <label for="account_ids"/>
                     <group col="4">
                         <field name="receivable_accounts_only"/>