From b46bb5fb4b9d30a7e883177e952868e89111e998 Mon Sep 17 00:00:00 2001
From: Joan Sisquella <joan.sisquella@forgeflow.com>
Date: Thu, 30 Apr 2020 11:48:23 +0200
Subject: [PATCH 01/10] [IMP] account_financial_report: open_items &
 aged_partner_balance * Now account_ids is empty by default and required *
 Domain is applied in the selection of the accounts

---
 .../wizard/aged_partner_balance_wizard.py     | 19 +++++++++++------
 .../wizard/open_items_wizard.py               | 21 ++++++++++++-------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/account_financial_report/wizard/aged_partner_balance_wizard.py b/account_financial_report/wizard/aged_partner_balance_wizard.py
index e1eb65c7..a3a48b87 100644
--- a/account_financial_report/wizard/aged_partner_balance_wizard.py
+++ b/account_financial_report/wizard/aged_partner_balance_wizard.py
@@ -27,7 +27,10 @@ class AgedPartnerBalanceWizard(models.TransientModel):
         default="posted",
     )
     account_ids = fields.Many2many(
-        comodel_name="account.account", string="Filter accounts"
+        comodel_name='account.account',
+        string='Filter accounts',
+        domain=[('reconcile', '=', True)],
+        required=True,
     )
     receivable_accounts_only = fields.Boolean()
     payable_accounts_only = fields.Boolean()
@@ -56,7 +59,11 @@ class AgedPartnerBalanceWizard(models.TransientModel):
             res["domain"]["partner_ids"] += self._get_partner_ids_domain()
         return res
 
-    @api.onchange("receivable_accounts_only", "payable_accounts_only")
+    @api.onchange('account_ids')
+    def onchange_account_ids(self):
+        return {'domain': {'account_ids': [('reconcile', '=', True)]}}
+
+    @api.onchange('receivable_accounts_only', 'payable_accounts_only')
     def onchange_type_accounts_only(self):
         """Handle receivable/payable accounts only change."""
         domain = [("company_id", "=", self.company_id.id)]
@@ -66,10 +73,10 @@ class AgedPartnerBalanceWizard(models.TransientModel):
             elif self.receivable_accounts_only:
                 domain += [("internal_type", "=", "receivable")]
             elif self.payable_accounts_only:
-                domain += [("internal_type", "=", "payable")]
-        elif not self.receivable_accounts_only and not self.payable_accounts_only:
-            domain += [("reconcile", "=", True)]
-        self.account_ids = self.env["account.account"].search(domain)
+                domain += [('internal_type', '=', 'payable')]
+            self.account_ids = self.env['account.account'].search(domain)
+        else:
+            self.account_ids = None
 
     def _print_report(self, report_type):
         self.ensure_one()
diff --git a/account_financial_report/wizard/open_items_wizard.py b/account_financial_report/wizard/open_items_wizard.py
index 1a5446be..7377dc33 100644
--- a/account_financial_report/wizard/open_items_wizard.py
+++ b/account_financial_report/wizard/open_items_wizard.py
@@ -28,9 +28,10 @@ class OpenItemsReportWizard(models.TransientModel):
         default="posted",
     )
     account_ids = fields.Many2many(
-        comodel_name="account.account",
-        string="Filter accounts",
-        domain=[("reconcile", "=", True)],
+        comodel_name='account.account',
+        string='Filter accounts',
+        domain=[('reconcile', '=', True)],
+        required=True,
     )
     hide_account_at_0 = fields.Boolean(
         string="Hide account ending balance at 0",
@@ -80,7 +81,11 @@ class OpenItemsReportWizard(models.TransientModel):
             res["domain"]["partner_ids"] += self._get_partner_ids_domain()
         return res
 
-    @api.onchange("receivable_accounts_only", "payable_accounts_only")
+    @api.onchange('account_ids')
+    def onchange_account_ids(self):
+        return {'domain': {'account_ids': [('reconcile', '=', True)]}}
+
+    @api.onchange('receivable_accounts_only', 'payable_accounts_only')
     def onchange_type_accounts_only(self):
         """Handle receivable/payable accounts only change."""
         domain = [("company_id", "=", self.company_id.id)]
@@ -90,10 +95,10 @@ class OpenItemsReportWizard(models.TransientModel):
             elif self.receivable_accounts_only:
                 domain += [("internal_type", "=", "receivable")]
             elif self.payable_accounts_only:
-                domain += [("internal_type", "=", "payable")]
-        elif not self.receivable_accounts_only and not self.payable_accounts_only:
-            domain += [("reconcile", "=", True)]
-        self.account_ids = self.env["account.account"].search(domain)
+                domain += [('internal_type', '=', 'payable')]
+            self.account_ids = self.env['account.account'].search(domain)
+        else:
+            self.account_ids = None
 
     def _print_report(self, report_type):
         self.ensure_one()

From 5f93bdcfdbc9b0337da92a5dedd11992c4952bcf Mon Sep 17 00:00:00 2001
From: Joan Sisquella <joan.sisquella@forgeflow.com>
Date: Thu, 30 Apr 2020 15:35:09 +0200
Subject: [PATCH 02/10] [IMP] account_financial_report: select accounts between
 two codes

---
 .../tests/test_vat_report.py                  |  4 +-
 .../wizard/aged_partner_balance_wizard.py     | 54 ++++++++++++++++---
 .../aged_partner_balance_wizard_view.xml      | 18 +++++++
 .../wizard/general_ledger_wizard.py           | 28 ++++++++++
 .../wizard/general_ledger_wizard_view.xml     | 34 +++++++++---
 .../wizard/open_items_wizard.py               | 54 ++++++++++++++++---
 .../wizard/open_items_wizard_view.xml         | 18 +++++++
 .../wizard/trial_balance_wizard.py            | 28 ++++++++++
 .../wizard/trial_balance_wizard_view.xml      | 16 ++++++
 9 files changed, 229 insertions(+), 25 deletions(-)

diff --git a/account_financial_report/tests/test_vat_report.py b/account_financial_report/tests/test_vat_report.py
index e5671835..7ee15f9c 100644
--- a/account_financial_report/tests/test_vat_report.py
+++ b/account_financial_report/tests/test_vat_report.py
@@ -173,8 +173,8 @@ class TestVATReport(common.TransactionCase):
             line_form.price_unit = 250.0
             line_form.account_id = self.income_account
             line_form.tax_ids.add(self.tax_20)
-        self.cbinvoice = move_form.save()
-        self.cbinvoice.post()
+        invoice = move_form.save()
+        invoice.post()
 
     def _get_report_lines(self, taxgroups=False):
         based_on = "taxtags"
diff --git a/account_financial_report/wizard/aged_partner_balance_wizard.py b/account_financial_report/wizard/aged_partner_balance_wizard.py
index a3a48b87..b1d67361 100644
--- a/account_financial_report/wizard/aged_partner_balance_wizard.py
+++ b/account_financial_report/wizard/aged_partner_balance_wizard.py
@@ -27,9 +27,9 @@ class AgedPartnerBalanceWizard(models.TransientModel):
         default="posted",
     )
     account_ids = fields.Many2many(
-        comodel_name='account.account',
-        string='Filter accounts',
-        domain=[('reconcile', '=', True)],
+        comodel_name="account.account",
+        string="Filter accounts",
+        domain=[("reconcile", "=", True)],
         required=True,
     )
     receivable_accounts_only = fields.Boolean()
@@ -37,6 +37,44 @@ class AgedPartnerBalanceWizard(models.TransientModel):
     partner_ids = fields.Many2many(comodel_name="res.partner", string="Filter partners")
     show_move_line_details = fields.Boolean()
 
+    account_code_from = fields.Many2one(
+        comodel_name="account.account",
+        string="Account Code From",
+        help="Starting account in a range",
+    )
+    account_code_to = fields.Many2one(
+        comodel_name="account.account",
+        string="Account Code To",
+        help="Ending account in a range",
+    )
+
+    @api.onchange("account_code_from", "account_code_to")
+    def on_change_account_range(self):
+        if (
+            self.account_code_from
+            and self.account_code_from.code.isdigit()
+            and self.account_code_to
+            and self.account_code_to.code.isdigit()
+        ):
+            start_range = int(self.account_code_from.code)
+            end_range = int(self.account_code_to.code)
+            self.account_ids = self.env["account.account"].search(
+                [
+                    ("code", "in", [x for x in range(start_range, end_range + 1)]),
+                    ("reconcile", "=", True),
+                ]
+            )
+            if self.company_id:
+                self.account_ids = self.account_ids.filtered(
+                    lambda a: a.company_id == self.company_id
+                )
+        return {
+            "domain": {
+                "account_code_from": [("reconcile", "=", True)],
+                "account_code_to": [("reconcile", "=", True)],
+            }
+        }
+
     @api.onchange("company_id")
     def onchange_company_id(self):
         """Handle company change."""
@@ -59,11 +97,11 @@ class AgedPartnerBalanceWizard(models.TransientModel):
             res["domain"]["partner_ids"] += self._get_partner_ids_domain()
         return res
 
-    @api.onchange('account_ids')
+    @api.onchange("account_ids")
     def onchange_account_ids(self):
-        return {'domain': {'account_ids': [('reconcile', '=', True)]}}
+        return {"domain": {"account_ids": [("reconcile", "=", True)]}}
 
-    @api.onchange('receivable_accounts_only', 'payable_accounts_only')
+    @api.onchange("receivable_accounts_only", "payable_accounts_only")
     def onchange_type_accounts_only(self):
         """Handle receivable/payable accounts only change."""
         domain = [("company_id", "=", self.company_id.id)]
@@ -73,8 +111,8 @@ class AgedPartnerBalanceWizard(models.TransientModel):
             elif self.receivable_accounts_only:
                 domain += [("internal_type", "=", "receivable")]
             elif self.payable_accounts_only:
-                domain += [('internal_type', '=', 'payable')]
-            self.account_ids = self.env['account.account'].search(domain)
+                domain += [("internal_type", "=", "payable")]
+            self.account_ids = self.env["account.account"].search(domain)
         else:
             self.account_ids = None
 
diff --git a/account_financial_report/wizard/aged_partner_balance_wizard_view.xml b/account_financial_report/wizard/aged_partner_balance_wizard_view.xml
index bcebe58a..337b2114 100644
--- a/account_financial_report/wizard/aged_partner_balance_wizard_view.xml
+++ b/account_financial_report/wizard/aged_partner_balance_wizard_view.xml
@@ -35,6 +35,24 @@
                     <label for="account_ids" colspan="4" />
                     <field name="receivable_accounts_only" />
                     <field name="payable_accounts_only" />
+                    <label for="account_code_from" string="From Code" />
+                    <div>
+                        <div class="o_row">
+                            <field
+                                name="account_code_from"
+                                class="oe_inline"
+                                options="{'no_create': True}"
+                            />
+                            <span class="oe_inline">
+                                To
+                            </span>
+                            <field
+                                name="account_code_to"
+                                class="oe_inline"
+                                options="{'no_create': True}"
+                            />
+                        </div>
+                    </div>
                     <field
                         name="account_ids"
                         nolabel="1"
diff --git a/account_financial_report/wizard/general_ledger_wizard.py b/account_financial_report/wizard/general_ledger_wizard.py
index d7ab2d40..20efdbeb 100644
--- a/account_financial_report/wizard/general_ledger_wizard.py
+++ b/account_financial_report/wizard/general_ledger_wizard.py
@@ -75,6 +75,34 @@ class GeneralLedgerReportWizard(models.TransientModel):
         "will display initial and final balance in that currency.",
         default=lambda self: self._default_foreign_currency(),
     )
+    account_code_from = fields.Many2one(
+        comodel_name="account.account",
+        string="Account Code From",
+        help="Starting account in a range",
+    )
+    account_code_to = fields.Many2one(
+        comodel_name="account.account",
+        string="Account Code To",
+        help="Ending account in a range",
+    )
+
+    @api.onchange("account_code_from", "account_code_to")
+    def on_change_account_range(self):
+        if (
+            self.account_code_from
+            and self.account_code_from.code.isdigit()
+            and self.account_code_to
+            and self.account_code_to.code.isdigit()
+        ):
+            start_range = int(self.account_code_from.code)
+            end_range = int(self.account_code_to.code)
+            self.account_ids = self.env["account.account"].search(
+                [("code", "in", [x for x in range(start_range, end_range + 1)])]
+            )
+            if self.company_id:
+                self.account_ids = self.account_ids.filtered(
+                    lambda a: a.company_id == self.company_id
+                )
 
     def _init_date_from(self):
         """set start date to begin of current year if fiscal year running"""
diff --git a/account_financial_report/wizard/general_ledger_wizard_view.xml b/account_financial_report/wizard/general_ledger_wizard_view.xml
index 2831f748..d1b0b49d 100644
--- a/account_financial_report/wizard/general_ledger_wizard_view.xml
+++ b/account_financial_report/wizard/general_ledger_wizard_view.xml
@@ -33,16 +33,36 @@
                     </group>
                     <notebook>
                         <page string="Filter accounts">
-                            <group col="4">
+                            <group name="account_filter" col="4">
+                                <label for="account_ids" colspan="4" />
                                 <field name="receivable_accounts_only" />
                                 <field name="payable_accounts_only" />
+                                <label for="account_code_from" string="From Code" />
+                                <div>
+                                    <div class="o_row">
+                                        <field
+                                            name="account_code_from"
+                                            class="oe_inline"
+                                            options="{'no_create': True}"
+                                        />
+                                        <span class="oe_inline">
+                                            To
+                                        </span>
+                                        <field
+                                            name="account_code_to"
+                                            class="oe_inline"
+                                            options="{'no_create': True}"
+                                        />
+                                    </div>
+                                </div>
+                                <field
+                                    name="account_ids"
+                                    nolabel="1"
+                                    widget="many2many_tags"
+                                    options="{'no_create': True}"
+                                    colspan="4"
+                                />
                             </group>
-                            <field
-                                name="account_ids"
-                                nolabel="1"
-                                widget="many2many_tags"
-                                options="{'no_create': True}"
-                            />
                         </page>
                         <page string="Filter partners">
                             <field
diff --git a/account_financial_report/wizard/open_items_wizard.py b/account_financial_report/wizard/open_items_wizard.py
index 7377dc33..ec45e127 100644
--- a/account_financial_report/wizard/open_items_wizard.py
+++ b/account_financial_report/wizard/open_items_wizard.py
@@ -28,9 +28,9 @@ class OpenItemsReportWizard(models.TransientModel):
         default="posted",
     )
     account_ids = fields.Many2many(
-        comodel_name='account.account',
-        string='Filter accounts',
-        domain=[('reconcile', '=', True)],
+        comodel_name="account.account",
+        string="Filter accounts",
+        domain=[("reconcile", "=", True)],
         required=True,
     )
     hide_account_at_0 = fields.Boolean(
@@ -55,6 +55,44 @@ class OpenItemsReportWizard(models.TransientModel):
         "will display initial and final balance in that currency.",
         default=lambda self: self._default_foreign_currency(),
     )
+    show_partner_details = fields.Boolean(string="Show Partner Details", default=True,)
+    account_code_from = fields.Many2one(
+        comodel_name="account.account",
+        string="Account Code From",
+        help="Starting account in a range",
+    )
+    account_code_to = fields.Many2one(
+        comodel_name="account.account",
+        string="Account Code To",
+        help="Ending account in a range",
+    )
+
+    @api.onchange("account_code_from", "account_code_to")
+    def on_change_account_range(self):
+        if (
+            self.account_code_from
+            and self.account_code_from.code.isdigit()
+            and self.account_code_to
+            and self.account_code_to.code.isdigit()
+        ):
+            start_range = int(self.account_code_from.code)
+            end_range = int(self.account_code_to.code)
+            self.account_ids = self.env["account.account"].search(
+                [
+                    ("code", "in", [x for x in range(start_range, end_range + 1)]),
+                    ("reconcile", "=", True),
+                ]
+            )
+            if self.company_id:
+                self.account_ids = self.account_ids.filtered(
+                    lambda a: a.company_id == self.company_id
+                )
+        return {
+            "domain": {
+                "account_code_from": [("reconcile", "=", True)],
+                "account_code_to": [("reconcile", "=", True)],
+            }
+        }
 
     def _default_foreign_currency(self):
         return self.env.user.has_group("base.group_multi_currency")
@@ -81,11 +119,11 @@ class OpenItemsReportWizard(models.TransientModel):
             res["domain"]["partner_ids"] += self._get_partner_ids_domain()
         return res
 
-    @api.onchange('account_ids')
+    @api.onchange("account_ids")
     def onchange_account_ids(self):
-        return {'domain': {'account_ids': [('reconcile', '=', True)]}}
+        return {"domain": {"account_ids": [("reconcile", "=", True)]}}
 
-    @api.onchange('receivable_accounts_only', 'payable_accounts_only')
+    @api.onchange("receivable_accounts_only", "payable_accounts_only")
     def onchange_type_accounts_only(self):
         """Handle receivable/payable accounts only change."""
         domain = [("company_id", "=", self.company_id.id)]
@@ -95,8 +133,8 @@ class OpenItemsReportWizard(models.TransientModel):
             elif self.receivable_accounts_only:
                 domain += [("internal_type", "=", "receivable")]
             elif self.payable_accounts_only:
-                domain += [('internal_type', '=', 'payable')]
-            self.account_ids = self.env['account.account'].search(domain)
+                domain += [("internal_type", "=", "payable")]
+            self.account_ids = self.env["account.account"].search(domain)
         else:
             self.account_ids = None
 
diff --git a/account_financial_report/wizard/open_items_wizard_view.xml b/account_financial_report/wizard/open_items_wizard_view.xml
index e1b73174..f71ee582 100644
--- a/account_financial_report/wizard/open_items_wizard_view.xml
+++ b/account_financial_report/wizard/open_items_wizard_view.xml
@@ -36,6 +36,24 @@
                 <group name="account_filter" col="4">
                     <field name="receivable_accounts_only" />
                     <field name="payable_accounts_only" />
+                    <label for="account_code_from" string="From Code" />
+                    <div>
+                        <div class="o_row">
+                            <field
+                                name="account_code_from"
+                                class="oe_inline"
+                                options="{'no_create': True}"
+                            />
+                            <span class="oe_inline">
+                                To
+                            </span>
+                            <field
+                                name="account_code_to"
+                                class="oe_inline"
+                                options="{'no_create': True}"
+                            />
+                        </div>
+                    </div>
                     <field
                         name="account_ids"
                         nolabel="1"
diff --git a/account_financial_report/wizard/trial_balance_wizard.py b/account_financial_report/wizard/trial_balance_wizard.py
index c8f533b7..8061fa4a 100644
--- a/account_financial_report/wizard/trial_balance_wizard.py
+++ b/account_financial_report/wizard/trial_balance_wizard.py
@@ -77,6 +77,34 @@ class TrialBalanceReportWizard(models.TransientModel):
         "account currency is not setup through chart of accounts "
         "will display initial and final balance in that currency.",
     )
+    account_code_from = fields.Many2one(
+        comodel_name="account.account",
+        string="Account Code From",
+        help="Starting account in a range",
+    )
+    account_code_to = fields.Many2one(
+        comodel_name="account.account",
+        string="Account Code To",
+        help="Ending account in a range",
+    )
+
+    @api.onchange("account_code_from", "account_code_to")
+    def on_change_account_range(self):
+        if (
+            self.account_code_from
+            and self.account_code_from.code.isdigit()
+            and self.account_code_to
+            and self.account_code_to.code.isdigit()
+        ):
+            start_range = int(self.account_code_from.code)
+            end_range = int(self.account_code_to.code)
+            self.account_ids = self.env["account.account"].search(
+                [("code", "in", [x for x in range(start_range, end_range + 1)])]
+            )
+            if self.company_id:
+                self.account_ids = self.account_ids.filtered(
+                    lambda a: a.company_id == self.company_id
+                )
 
     @api.constrains("hierarchy_on", "show_hierarchy_level")
     def _check_show_hierarchy_level(self):
diff --git a/account_financial_report/wizard/trial_balance_wizard_view.xml b/account_financial_report/wizard/trial_balance_wizard_view.xml
index 22221f8c..28916459 100644
--- a/account_financial_report/wizard/trial_balance_wizard_view.xml
+++ b/account_financial_report/wizard/trial_balance_wizard_view.xml
@@ -73,6 +73,22 @@
                         <label for="account_ids" colspan="4" />
                         <field name="receivable_accounts_only" />
                         <field name="payable_accounts_only" />
+                        <label for="account_code_from" string="From Code" />
+                        <div>
+                            <div class="o_row">
+                                <field
+                                    name="account_code_from"
+                                    class="oe_inline"
+                                    options="{'no_create': True}"
+                                />
+                                <span class="oe_inline">To</span>
+                                <field
+                                    name="account_code_to"
+                                    class="oe_inline"
+                                    options="{'no_create': True}"
+                                />
+                            </div>
+                        </div>
                         <field
                             name="account_ids"
                             nolabel="1"

From 12d367de49befd46da6e5f17360fe246603ba188 Mon Sep 17 00:00:00 2001
From: Joan Sisquella <joan.sisquella@forgeflow.com>
Date: Wed, 29 Apr 2020 17:11:32 +0200
Subject: [PATCH 03/10] [IMP] account_financial_report: open_items * added
 option "show_partner_details"

---
 account_financial_report/report/open_items.py |  20 ++
 .../report/open_items_xlsx.py                 |  45 ++-
 .../report/templates/general_ledger.xml       |  24 +-
 .../report/templates/open_items.xml           | 315 ++++++++++--------
 .../wizard/open_items_wizard.py               |   1 +
 .../wizard/open_items_wizard_view.xml         |   1 +
 6 files changed, 228 insertions(+), 178 deletions(-)

diff --git a/account_financial_report/report/open_items.py b/account_financial_report/report/open_items.py
index be0c21f9..544cc3e1 100644
--- a/account_financial_report/report/open_items.py
+++ b/account_financial_report/report/open_items.py
@@ -324,6 +324,20 @@ class OpenItemsReport(models.AbstractModel):
                     total_amount[account_id]["residual"] += move_line["amount_residual"]
         return total_amount
 
+    @api.model
+    def _get_open_items_no_partners(self, open_items_move_lines_data):
+        new_open_items = {}
+        for acc_id in open_items_move_lines_data.keys():
+            new_open_items[acc_id] = {}
+            move_lines = []
+            for prt_id in open_items_move_lines_data[acc_id]:
+                for move_line in open_items_move_lines_data[acc_id][prt_id]:
+                    move_lines += [move_line]
+            move_lines = sorted(move_lines, key=lambda k: (k["date"]))
+            new_open_items[acc_id] = move_lines
+        return new_open_items
+
+    @api.multi
     def _get_report_values(self, docids, data):
         wizard_id = data["wizard_id"]
         company = self.env["res.company"].browse(data["company_id"])
@@ -334,6 +348,7 @@ class OpenItemsReport(models.AbstractModel):
         date_at_object = datetime.strptime(date_at, "%Y-%m-%d").date()
         date_from = data["date_from"]
         target_move = data["target_move"]
+        show_partner_details = data["show_partner_details"]
 
         (
             move_lines_data,
@@ -346,11 +361,16 @@ class OpenItemsReport(models.AbstractModel):
         )
 
         total_amount = self._calculate_amounts(open_items_move_lines_data)
+        if not show_partner_details:
+            open_items_move_lines_data = self._get_open_items_no_partners(
+                open_items_move_lines_data
+            )
         return {
             "doc_ids": [wizard_id],
             "doc_model": "open.items.report.wizard",
             "docs": self.env["open.items.report.wizard"].browse(wizard_id),
             "foreign_currency": data["foreign_currency"],
+            "show_partner_details": data["show_partner_details"],
             "company_name": company.display_name,
             "currency_name": company.currency_id.name,
             "date_at": date_at_object.strftime("%d/%m/%Y"),
diff --git a/account_financial_report/report/open_items_xlsx.py b/account_financial_report/report/open_items_xlsx.py
index 36f8677a..5fc0841d 100644
--- a/account_financial_report/report/open_items_xlsx.py
+++ b/account_financial_report/report/open_items_xlsx.py
@@ -109,6 +109,7 @@ class OpenItemsXslx(models.AbstractModel):
         accounts_data = res_data["accounts_data"]
         partners_data = res_data["partners_data"]
         total_amount = res_data["total_amount"]
+        show_partner_details = res_data["show_partner_details"]
         for account_id in Open_items.keys():
             # Write account title
             self.write_array_title(
@@ -119,30 +120,38 @@ class OpenItemsXslx(models.AbstractModel):
 
             # For each partner
             if Open_items[account_id]:
-                for partner_id in Open_items[account_id]:
-                    type_object = "partner"
-                    # Write partner title
-                    self.write_array_title(partners_data[partner_id]["name"])
-
+                if show_partner_details:
+                    for partner_id in Open_items[account_id]:
+                        type_object = "partner"
+                        # Write partner title
+                        self.write_array_title(partners_data[partner_id]["name"])
+
+                        # Display array header for move lines
+                        self.write_array_header()
+
+                        # Display account move lines
+                        for line in Open_items[account_id][partner_id]:
+                            self.write_line_from_dict(line)
+
+                        # Display ending balance line for partner
+                        self.write_ending_balance_from_dict(
+                            partners_data[partner_id],
+                            type_object,
+                            total_amount,
+                            account_id,
+                            partner_id,
+                        )
+
+                        # Line break
+                        self.row_pos += 1
+                else:
                     # Display array header for move lines
                     self.write_array_header()
 
                     # Display account move lines
-                    for line in Open_items[account_id][partner_id]:
+                    for line in Open_items[account_id]:
                         self.write_line_from_dict(line)
 
-                    # Display ending balance line for partner
-                    self.write_ending_balance_from_dict(
-                        partners_data[partner_id],
-                        type_object,
-                        total_amount,
-                        account_id,
-                        partner_id,
-                    )
-
-                    # Line break
-                    self.row_pos += 1
-
                 # Display ending balance line for account
                 type_object = "account"
                 self.write_ending_balance_from_dict(
diff --git a/account_financial_report/report/templates/general_ledger.xml b/account_financial_report/report/templates/general_ledger.xml
index 06444e7d..42610b54 100644
--- a/account_financial_report/report/templates/general_ledger.xml
+++ b/account_financial_report/report/templates/general_ledger.xml
@@ -85,20 +85,20 @@
                                     />
                                     <t t-set="type" t-value='"partner_type"' />
                                 </t>
-                                <!-- Display account footer -->
-                                <t t-if="not filter_partner_ids">
-                                    <t
-                                        t-call="account_financial_report.report_general_ledger_ending_cumul"
-                                    >
-                                        <t
-                                            t-set="account_or_partner_object"
-                                            t-value="account"
-                                        />
-                                        <t t-set="type" t-value='"account_type"' />
-                                    </t>
-                                </t>
                             </div>
                         </t>
+                        <!-- Display account footer -->
+                        <t t-if="not filter_partner_ids">
+                            <t
+                                t-call="account_financial_report.report_general_ledger_ending_cumul"
+                            >
+                                <t
+                                    t-set="account_or_partner_object"
+                                    t-value="account"
+                                />
+                                <t t-set="type" t-value='"account_type"' />
+                            </t>
+                        </t>
                     </t>
                 </div>
             </t>
diff --git a/account_financial_report/report/templates/open_items.xml b/account_financial_report/report/templates/open_items.xml
index 4f1c333a..56a59539 100644
--- a/account_financial_report/report/templates/open_items.xml
+++ b/account_financial_report/report/templates/open_items.xml
@@ -28,26 +28,48 @@
             <!-- Display filters -->
             <t t-call="account_financial_report.report_open_items_filters" />
             <t t-foreach="Open_Items.keys()" t-as="account_id">
-                <div class="page_break">
-                    <!-- Display account header -->
-                    <div class="act_as_table list_table" style="margin-top: 10px;" />
-                    <div class="account_title" style="width: 100%;">
+                <!-- Display account header -->
+                <div class="act_as_table list_table" style="margin-top: 10px;" />
+                <div class="account_title" style="width: 100%;">
                         <span t-esc="accounts_data[account_id]['code']" />
                         -
                         <span t-esc="accounts_data[account_id]['name']" />
                     </div>
-                    <!-- Display account partners -->
-                    <t t-foreach="Open_Items[account_id]" t-as="partner_id">
-                        <div class="page_break">
-                            <!-- Display partner header -->
-                            <div class="act_as_caption account_title">
-                                <span t-esc="partners_data[partner_id]['name']" />
-                            </div>
-                            <!-- Display partner move lines -->
+                <t t-if="not show_partner_details">
+                    <div class="act_as_table data_table" style="width: 100%;">
+                        <t
+                            t-call="account_financial_report.report_open_items_lines_header"
+                        />
+                        <!-- Display account move lines -->
+                        <t t-foreach="Open_Items[account_id]" t-as="line">
                             <t
                                 t-call="account_financial_report.report_open_items_lines"
                             />
-                            <!-- Display partner footer -->
+                        </t>
+                    </div>
+                </t>
+                <t t-if="show_partner_details">
+                    <div class="page_break">
+                        <!-- Display account partners -->
+                        <t t-foreach="Open_Items[account_id]" t-as="partner_id">
+                            <div class="act_as_caption account_title">
+                                <span t-esc="partners_data[partner_id]['name']" />
+                            </div>
+                            <div class="act_as_table data_table" style="width: 100%;">
+                                <!-- Display partner header -->
+                                <t
+                                    t-call="account_financial_report.report_open_items_lines_header"
+                                />
+                                <!-- Display partner move lines -->
+                                <t
+                                    t-foreach="Open_Items[account_id][partner_id]"
+                                    t-as="line"
+                                >
+                                    <t
+                                        t-call="account_financial_report.report_open_items_lines"
+                                    />
+                                </t>
+                            </div>
                             <t
                                 t-call="account_financial_report.report_open_items_ending_cumul"
                             >
@@ -61,21 +83,21 @@
                                 />
                                 <t t-set="type" t-value='"partner_type"' />
                             </t>
-                        </div>
-                    </t>
-                    <!-- Display account footer -->
-                    <t t-call="account_financial_report.report_open_items_ending_cumul">
-                        <t
-                            t-set="account_or_partner_id"
-                            t-value="accounts_data[account_id]"
-                        />
-                        <t
-                            t-set="currency_id"
-                            t-value="accounts_data[account_id]['currency_name']"
-                        />
-                        <t t-set="type" t-value='"account_type"' />
-                    </t>
-                </div>
+                        </t>
+                    </div>
+                </t>
+                <!-- Display account footer -->
+                <t t-call="account_financial_report.report_open_items_ending_cumul">
+                    <t
+                        t-set="account_or_partner_id"
+                        t-value="accounts_data[account_id]"
+                    />
+                    <t
+                        t-set="currency_id"
+                        t-value="accounts_data[account_id]['currency_name']"
+                    />
+                    <t t-set="type" t-value='"account_type"' />
+                </t>
             </t>
         </div>
     </template>
@@ -101,133 +123,130 @@
             </div>
         </div>
     </template>
-    <template id="account_financial_report.report_open_items_lines">
-        <div class="act_as_table data_table" style="width: 100%;">
-            <!-- Display table headers for lines -->
-            <div class="act_as_thead">
-                <div class="act_as_row labels">
-                    <!--## date-->
-                    <div class="act_as_cell first_column" style="width: 5.51%;">
-                        Date</div>
-                    <!--## move-->
-                    <div class="act_as_cell" style="width: 9.76%;">Entry</div>
-                    <!--## journal-->
-                    <div class="act_as_cell" style="width: 4.78%;">Journal</div>
-                    <!--## account code-->
-                    <div class="act_as_cell" style="width: 5.38%;">Account</div>
-                    <!--## partner-->
-                    <div class="act_as_cell" style="width: 15.07%;">Partner
-                    </div>
-                    <!--## ref - label-->
-                    <div class="act_as_cell" style="width: 24.5%;">Ref -
-                        Label</div>
-                    <!--## date_due-->
-                    <div class="act_as_cell" style="width: 6.47%;">Due
-                        date</div>
-                    <!--## amount_total_due-->
-                    <div class="act_as_cell" style="width: 6.57%;">Original
-                    </div>
-                    <!--## amount_residual-->
-                    <div class="act_as_cell" style="width: 6.57%;">Residual</div>
-                    <t t-if="foreign_currency">
-                        <!--## currency_name-->
-                        <div class="act_as_cell" style="width: 2.25%;">Cur.</div>
-                        <!--## amount_total_due_currency-->
-                        <div
-                            class="act_as_cell amount"
-                            style="width: 6.57%;"
-                        >Cur. Original</div>
-                        <!--## amount_residual_currency-->
-                        <div
-                            class="act_as_cell amount"
-                            style="width: 6.57%;"
-                        >Cur. Residual</div>
-                    </t>
+    <template id="account_financial_report.report_open_items_lines_header">
+        <!-- Display table headers for lines -->
+        <div class="act_as_thead">
+            <div class="act_as_row labels">
+                <!--## date-->
+                <div class="act_as_cell first_column" style="width: 5.51%;">
+                    Date</div>
+                <!--## move-->
+                <div class="act_as_cell" style="width: 9.76%;">Entry</div>
+                <!--## journal-->
+                <div class="act_as_cell" style="width: 4.78%;">Journal</div>
+                <!--## account code-->
+                <div class="act_as_cell" style="width: 5.38%;">Account</div>
+                <!--## partner-->
+                <div class="act_as_cell" style="width: 15.07%;">Partner
+                </div>
+                <!--## ref - label-->
+                <div class="act_as_cell" style="width: 24.5%;">Ref -
+                    Label</div>
+                <!--## date_due-->
+                <div class="act_as_cell" style="width: 6.47%;">Due
+                    date</div>
+                <!--## amount_total_due-->
+                <div class="act_as_cell" style="width: 6.57%;">Original
                 </div>
+                <!--## amount_residual-->
+                <div class="act_as_cell" style="width: 6.57%;">Residual</div>
+                <t t-if="foreign_currency">
+                    <!--## currency_name-->
+                    <div class="act_as_cell" style="width: 2.25%;">Cur.</div>
+                    <!--## amount_total_due_currency-->
+                    <div
+                        class="act_as_cell amount"
+                        style="width: 6.57%;"
+                    >Cur. Original</div>
+                    <!--## amount_residual_currency-->
+                    <div
+                        class="act_as_cell amount"
+                        style="width: 6.57%;"
+                    >Cur. Residual</div>
+                </t>
             </div>
-            <!-- Display each lines -->
-            <t t-foreach="Open_Items[account_id][partner_id]" t-as="line">
-                <!-- # lines or centralized lines -->
-                <div class="act_as_row lines">
-                    <!--## date-->
-                    <div class="act_as_cell left">
-                        <span t-raw="line['date']" />
-                    </div>
-                    <!--## move-->
-                    <div class="act_as_cell left">
-                        <t t-set="res_model" t-value="'account.move'" />
-                        <span>
-                            <a
-                                t-att-data-active-id="line['move_id']"
-                                t-att-data-res-model="res_model"
-                                class="o_account_financial_reports_web_action"
-                                style="color: black;"
-                            >
-                                <t t-esc="line['move_name']" />
-                            </a>
-                        </span>
-                    </div>
-                    <!--## journal-->
-                    <div class="act_as_cell left">
-                        <span t-esc="line['journal']" />
-                    </div>
-                    <!--## account code-->
-                    <div class="act_as_cell left">
-                        <span t-esc="line['account']" />
-                    </div>
-                    <!--## partner-->
-                    <div class="act_as_cell left">
-                        <!--                        <span t-if="line.get('partner_id', False)" t-esc="line['partner_id']"/>-->
-                        <span t-esc="line['partner_name']" />
-                    </div>
-                    <!--## ref - label-->
-                    <div class="act_as_cell left">
-                        <span t-esc="line['ref']" />
-                    </div>
-                    <!--## date_due-->
-                    <div class="act_as_cell left">
-                        <span t-esc="line['date_maturity']" />
+        </div>
+    </template>
+    <template id="account_financial_report.report_open_items_lines">
+        <!-- # lines or centralized lines -->
+        <div class="act_as_row lines">
+            <!--## date-->
+            <div class="act_as_cell left">
+                <span t-raw="line['date']" />
+            </div>
+            <!--## move-->
+            <div class="act_as_cell left">
+                <t t-set="res_model" t-value="'account.move'" />
+                <span>
+                    <a
+                        t-att-data-active-id="line['move_id']"
+                        t-att-data-res-model="res_model"
+                        class="o_account_financial_reports_web_action"
+                        style="color: black;"
+                    >
+                        <t t-esc="line['move_name']" />
+                    </a>
+                </span>
+            </div>
+            <!--## journal-->
+            <div class="act_as_cell left">
+                <span t-esc="line['journal']" />
+            </div>
+            <!--## account code-->
+            <div class="act_as_cell left">
+                <span t-esc="line['account']" />
+            </div>
+            <!--## partner-->
+            <div class="act_as_cell left">
+                <!--                        <span t-if="line.get('partner_id', False)" t-esc="line['partner_id']"/>-->
+                <span t-esc="line['partner_name']" />
+            </div>
+            <!--## ref - label-->
+            <div class="act_as_cell left">
+                <span t-esc="line['ref']" />
+            </div>
+            <!--## date_due-->
+            <div class="act_as_cell left">
+                <span t-esc="line['date_maturity']" />
+            </div>
+            <!--## amount_total_due-->
+            <div class="act_as_cell amount">
+                <span
+                    t-if="line.get('original', False)"
+                    t-esc="line['original']"
+                    t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                />
+            </div>
+            <!--## amount_residual-->
+            <div class="act_as_cell amount">
+                <span
+                    t-esc="line['amount_residual']"
+                    t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
+                />
+            </div>
+            <t t-if="foreign_currency">
+                <t t-if="line['currency_id']">
+                    <!--## currency_name-->
+                    <div class="act_as_cell amount">
+                        <span t-esc="line['currency_name']" />
                     </div>
-                    <!--## amount_total_due-->
+                    <!--## amount_total_due_currency-->
                     <div class="act_as_cell amount">
-                        <span
-                            t-if="line.get('original', False)"
-                            t-esc="line['original']"
-                            t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
-                        />
+                        <span t-esc="line['amount_currency']" />
                     </div>
-                    <!--## amount_residual-->
+                    <!--## amount_residual_currency-->
                     <div class="act_as_cell amount">
-                        <span
-                            t-esc="line['amount_residual']"
-                            t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
-                        />
+                        <span t-esc="line['amount_residual_currency']" />
                     </div>
-                    <t t-if="foreign_currency">
-                        <t t-if="line['currency_id']">
-                            <!--## currency_name-->
-                            <div class="act_as_cell amount">
-                                <span t-esc="line['currency_name']" />
-                            </div>
-                            <!--## amount_total_due_currency-->
-                            <div class="act_as_cell amount">
-                                <span t-esc="line['amount_currency']" />
-                            </div>
-                            <!--## amount_residual_currency-->
-                            <div class="act_as_cell amount">
-                                <span t-esc="line['amount_residual_currency']" />
-                            </div>
-                        </t>
-                        <t t-if="not line['currency_id']">
-                            <!--## currency_name-->
-                            <div class="act_as_cell" />
-                            <!--## amount_total_due_currency-->
-                            <div class="act_as_cell" />
-                            <!--## amount_residual_currency-->
-                            <div class="act_as_cell" />
-                        </t>
-                    </t>
-                </div>
+                </t>
+                <t t-if="not line['currency_id']">
+                    <!--## currency_name-->
+                    <div class="act_as_cell" />
+                    <!--## amount_total_due_currency-->
+                    <div class="act_as_cell" />
+                    <!--## amount_residual_currency-->
+                    <div class="act_as_cell" />
+                </t>
             </t>
         </div>
     </template>
diff --git a/account_financial_report/wizard/open_items_wizard.py b/account_financial_report/wizard/open_items_wizard.py
index ec45e127..601da455 100644
--- a/account_financial_report/wizard/open_items_wizard.py
+++ b/account_financial_report/wizard/open_items_wizard.py
@@ -178,6 +178,7 @@ class OpenItemsReportWizard(models.TransientModel):
             "only_posted_moves": self.target_move == "posted",
             "hide_account_at_0": self.hide_account_at_0,
             "foreign_currency": self.foreign_currency,
+            "show_partner_details": self.show_partner_details,
             "company_id": self.company_id.id,
             "target_move": self.target_move,
             "account_ids": self.account_ids.ids,
diff --git a/account_financial_report/wizard/open_items_wizard_view.xml b/account_financial_report/wizard/open_items_wizard_view.xml
index f71ee582..9a95570c 100644
--- a/account_financial_report/wizard/open_items_wizard_view.xml
+++ b/account_financial_report/wizard/open_items_wizard_view.xml
@@ -20,6 +20,7 @@
                     </group>
                     <group name="other_filters">
                         <field name="target_move" widget="radio" />
+                        <field name="show_partner_details" />
                         <field name="hide_account_at_0" />
                         <field name="foreign_currency" />
                     </group>

From d829dfc31a6b0fea49a2dc4bfef2cb01a763a5dd Mon Sep 17 00:00:00 2001
From: Jordi Ballester Alomar <jordi.ballester@eficent.com>
Date: Fri, 1 May 2020 08:14:01 +0200
Subject: [PATCH 04/10] [IMP] account_financial_report: multiple fixes and
 improvements

---
 account_financial_report/i18n/es.po           | 958 +++++++-----------
 .../report/abstract_report_xlsx.py            |  25 +-
 .../report/aged_partner_balance.py            |  64 +-
 .../report/aged_partner_balance_xlsx.py       |   2 +-
 .../report/general_ledger.py                  | 123 ++-
 .../report/general_ledger_xlsx.py             |  47 +-
 account_financial_report/report/open_items.py | 391 +++----
 .../report/open_items_xlsx.py                 |  29 +-
 .../report/templates/aged_partner_balance.xml |   2 +-
 .../report/templates/general_ledger.xml       |  21 +-
 .../report/templates/open_items.xml           |   8 +-
 .../report/trial_balance.py                   |  76 +-
 account_financial_report/report/vat_report.py |  16 +-
 .../wizard/aged_partner_balance_wizard.py     |   2 +
 .../aged_partner_balance_wizard_view.xml      |   1 +
 .../wizard/general_ledger_wizard.py           |   2 +
 .../wizard/general_ledger_wizard_view.xml     |   1 +
 17 files changed, 828 insertions(+), 940 deletions(-)

diff --git a/account_financial_report/i18n/es.po b/account_financial_report/i18n/es.po
index 8ebb34f5..5e5750f0 100644
--- a/account_financial_report/i18n/es.po
+++ b/account_financial_report/i18n/es.po
@@ -1,25 +1,21 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# * account_financial_report
+# 	* account_financial_report
 #
-# Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2017
-# Pedro M. Baeza <pedro.baeza@gmail.com>, 2018
-# ALEJANDRO FEBLES <consultores@aresoltec.com>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 11.0\n"
+"Project-Id-Version: Odoo Server 12.0+e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-18 22:19+0000\n"
-"PO-Revision-Date: 2019-07-23 01:43+0000\n"
-"Last-Translator: Josep M <jmyepes@mac.com>\n"
-"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
-"Language: es\n"
+"POT-Creation-Date: 2020-05-21 13:00+0000\n"
+"PO-Revision-Date: 2020-05-21 15:06+0200\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.7.1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"Language: es\n"
+"X-Generator: Poedit 2.3.1\n"
 
 #. module: account_financial_report
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_lines_header
@@ -68,52 +64,85 @@ msgid "<span class=\"fa fa-print\"/> Print"
 msgstr "<span class=\"fa fa-print\"/>Imprimir"
 
 #. module: account_financial_report
-#: model:ir.model,name:account_financial_report.model_account_financial_report_abstract_wizard
-msgid "Abstract Wizard"
-msgstr "Asistente de Extracto"
+#: model_terms:ir.ui.view,arch_db:account_financial_report.general_ledger_wizard
+msgid ""
+"<span class=\"oe_inline\">\n"
+"                                            To\n"
+"                                        </span>"
+msgstr ""
 
 #. module: account_financial_report
-#: model:ir.model,name:account_financial_report.model_report_account_financial_report_abstract_report_xlsx
-msgid "Abstract XLSX Account Financial Report"
+#: model_terms:ir.ui.view,arch_db:account_financial_report.aged_partner_balance_wizard
+#: model_terms:ir.ui.view,arch_db:account_financial_report.open_items_wizard
+msgid ""
+"<span class=\"oe_inline\">\n"
+"                                To\n"
+"                            </span>"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: model_terms:ir.ui.view,arch_db:account_financial_report.trial_balance_wizard
+msgid "<span class=\"oe_inline\">To</span>"
+msgstr ""
+
+#. module: account_financial_report
+#: model:ir.model,name:account_financial_report.model_account_financial_report_abstract_wizard
+msgid "Abstract Wizard"
+msgstr "Asistente de Extracto"
+
+#. module: account_financial_report
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:73
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:29
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:36
+#: code:addons/account_financial_report/report/open_items_xlsx.py:27
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:27
 #: model:ir.model,name:account_financial_report.model_account_account
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header
-#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines
+#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines_header
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_lines_header
 #, python-format
 msgid "Account"
 msgstr "Cuenta"
 
+#. module: account_financial_report
+#: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__account_code_from
+#: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__account_code_from
+#: model:ir.model.fields,field_description:account_financial_report.field_open_items_report_wizard__account_code_from
+#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__account_code_from
+msgid "Account Code From"
+msgstr "Código Cuenta Desde"
+
+#. module: account_financial_report
+#: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__account_code_to
+#: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__account_code_to
+#: model:ir.model.fields,field_description:account_financial_report.field_open_items_report_wizard__account_code_to
+#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__account_code_to
+msgid "Account Code To"
+msgstr "Código Cuenta Hasta"
+
 #. module: account_financial_report
 #: model:ir.model,name:account_financial_report.model_account_group
 msgid "Account Group"
-msgstr "Grupo de cuentas"
+msgstr "Grupo de cuenta"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:44
 #, python-format
 msgid "Account Name"
 msgstr "Cuenta"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:115
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters
 #, python-format
 msgid "Account at 0 filter"
 msgstr "Filtrar por Cuenta a 0"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:91
+#: code:addons/account_financial_report/report/open_items_xlsx.py:69
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_filters
 #, python-format
@@ -138,7 +167,8 @@ msgid ""
 msgstr "≤ 120 d."
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:56
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:111
 #, python-format
 msgid "Age ≤ 120 d."
 msgstr "Tiempo ≤ 120 d."
@@ -151,7 +181,8 @@ msgid ""
 msgstr "≤ 30 d."
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:38
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:90
 #, python-format
 msgid "Age ≤ 30 d."
 msgstr "Tiempo ≤ 30 d."
@@ -164,7 +195,8 @@ msgid ""
 msgstr "≤ 60 d."
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:44
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:97
 #, python-format
 msgid "Age ≤ 60 d."
 msgstr "Tiempo ≤ 60 d."
@@ -177,13 +209,14 @@ msgid ""
 msgstr "≤ 90 d."
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:50
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:104
 #, python-format
 msgid "Age ≤ 90 d."
 msgstr "Tiempo ≤ 90 d."
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:15
 #: model:ir.actions.act_window,name:account_financial_report.action_aged_partner_balance_wizard
 #: model:ir.actions.client,name:account_financial_report.action_report_aged_partner_balance
 #: model:ir.actions.report,name:account_financial_report.action_print_report_aged_partner_balance_html
@@ -200,15 +233,13 @@ msgstr "Balance Empresa Vencido"
 
 #. module: account_financial_report
 #: model:ir.model,name:account_financial_report.model_report_account_financial_report_aged_partner_balance
-#, fuzzy
-#| msgid "Aged Partner Balance -"
 msgid "Aged Partner Balance Report"
-msgstr "Balance Empresa Vencido"
+msgstr "Estado de antigüedad de saldos"
 
 #. module: account_financial_report
 #: model:ir.model,name:account_financial_report.model_aged_partner_balance_report_wizard
 msgid "Aged Partner Balance Wizard"
-msgstr "Asistente Calidad de la deuda de las empresas"
+msgstr "Asistente de Estado de Antigüedad de Saldos"
 
 #. module: account_financial_report
 #: model:ir.model,name:account_financial_report.model_report_a_f_r_report_aged_partner_balance_xlsx
@@ -223,32 +254,32 @@ msgid "Aged Partner Balance XLSX"
 msgstr "Saldo vencidos de empresa XLSX"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:0
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:62
 #, python-format
 msgid "All"
 msgstr "Todos"
 
 #. module: account_financial_report
-#: model:ir.model.fields.selection,name:account_financial_report.selection__aged_partner_balance_report_wizard__target_move__all
-#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__target_move__all
-#: model:ir.model.fields.selection,name:account_financial_report.selection__open_items_report_wizard__target_move__all
-#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__target_move__all
+#: selection:aged.partner.balance.report.wizard,target_move:0
+#: selection:general.ledger.report.wizard,target_move:0
+#: selection:open.items.report.wizard,target_move:0
+#: selection:trial.balance.report.wizard,target_move:0
 msgid "All Entries"
 msgstr "Todos los asientos"
 
 #. module: account_financial_report
-#: model:ir.model.fields.selection,name:account_financial_report.selection__aged_partner_balance_report_wizard__target_move__posted
-#: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__target_move__posted
-#: model:ir.model.fields.selection,name:account_financial_report.selection__open_items_report_wizard__target_move__posted
-#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__target_move__posted
+#: selection:aged.partner.balance.report.wizard,target_move:0
+#: selection:general.ledger.report.wizard,target_move:0
+#: selection:open.items.report.wizard,target_move:0
+#: selection:trial.balance.report.wizard,target_move:0
 msgid "All Posted Entries"
 msgstr "Todos los asientos asentados"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:131
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:87
+#: code:addons/account_financial_report/report/open_items_xlsx.py:67
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:113
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_filters
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_filters
@@ -258,10 +289,10 @@ msgid "All entries"
 msgstr "Todos los asientos"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:131
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:87
+#: code:addons/account_financial_report/report/open_items_xlsx.py:67
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:113
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_filters
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_filters
@@ -276,13 +307,13 @@ msgid "Amount Cur."
 msgstr "Importe Inicial."
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:88
 #, python-format
 msgid "Amount Currency"
 msgstr "Moneda de Total"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:67
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
 #, python-format
 msgid "Amount cur."
@@ -301,19 +332,19 @@ msgid "Base Amount"
 msgstr "Basados en"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:125
 #, python-format
 msgid "Base Balance"
 msgstr "Total Saldo"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:119
 #, python-format
 msgid "Base Credit"
 msgstr "Haber"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:113
 #, python-format
 msgid "Base Debit"
 msgstr "Total Debe"
@@ -325,7 +356,7 @@ msgid "Based On"
 msgstr "Basados en"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/vat_report_xlsx.py:0
+#: code:addons/account_financial_report/report/vat_report_xlsx.py:39
 #, python-format
 msgid "Based on"
 msgstr "Basados en"
@@ -341,7 +372,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:95
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
 #, python-format
 msgid "Centralize filter"
@@ -353,7 +384,7 @@ msgid "Centralized"
 msgstr "Centralizado"
 
 #. module: account_financial_report
-#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__relation
+#: selection:trial.balance.report.wizard,hierarchy_on:0
 msgid "Child Accounts"
 msgstr "Cuentas Hijas"
 
@@ -363,8 +394,8 @@ msgid "Child Groups"
 msgstr "Grupos Hijos"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
-#: code:addons/account_financial_report/report/vat_report_xlsx.py:0
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:26
+#: code:addons/account_financial_report/report/vat_report_xlsx.py:23
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_lines_header
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_vat_report_base
 #, python-format
@@ -372,7 +403,7 @@ msgid "Code"
 msgstr "Código"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:171
 #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__company_id
 #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__company_id
 #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__company_id
@@ -389,7 +420,7 @@ msgid "Compute accounts"
 msgstr "Cuentas calculadas"
 
 #. module: account_financial_report
-#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__computed
+#: selection:trial.balance.report.wizard,hierarchy_on:0
 msgid "Computed Accounts"
 msgstr "Cuentas Calculadas"
 
@@ -401,8 +432,7 @@ msgid ""
 "\n"
 "        Child Accounts: Use when your account groups are hierarchical.\n"
 "\n"
-"        No hierarchy: Use to display just the accounts, without any "
-"grouping.\n"
+"        No hierarchy: Use to display just the accounts, without any grouping.\n"
 "        "
 msgstr ""
 "Cuentas Calculadas:  Usar cuando el grupo de cuentas tiene códigos \n"
@@ -410,8 +440,7 @@ msgstr ""
 "\n"
 "        Cuentas Hijas: Usar cuando los grupos de cuentas son jerárquicos.\n"
 "\n"
-"        Sin jerarquía: Usar para mostrar sólo las cuentas, sin ninguna "
-"agrupación.\n"
+"        Sin jerarquía: Usar para mostrar sólo las cuentas, sin ninguna agrupación.\n"
 "        "
 
 #. module: account_financial_report
@@ -422,7 +451,7 @@ msgid ""
 msgstr "Centro de Costos"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:35
 #, python-format
 msgid "Cost center"
 msgstr "Centro de Costos"
@@ -445,12 +474,13 @@ msgstr "Creado por"
 #: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__create_date
 #: model:ir.model.fields,field_description:account_financial_report.field_vat_report_wizard__create_date
 msgid "Created on"
-msgstr "Creado en"
+msgstr "Creado el"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:48
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:72
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:36
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:77
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_all_taxes
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header
@@ -461,61 +491,63 @@ msgid "Credit"
 msgstr "Haber"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:54
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
 #, python-format
 msgid "Cumul. Bal."
 msgstr "Saldo Acumu."
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:63
+#: code:addons/account_financial_report/report/open_items_xlsx.py:43
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:51
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:92
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header
-#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines
+#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines_header
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_lines_header
 #, python-format
 msgid "Cur."
 msgstr "Actual."
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
-#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines
+#: code:addons/account_financial_report/report/open_items_xlsx.py:47
+#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines_header
 #, python-format
 msgid "Cur. Original"
 msgstr "Acum. Inicial"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
-#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines
+#: code:addons/account_financial_report/report/open_items_xlsx.py:53
+#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines_header
 #, python-format
 msgid "Cur. Residual"
 msgstr "Acum. Residual"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:82
 #, python-format
 msgid "Currency"
 msgstr "Moneda"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:32
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:83
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines
 #, python-format
 msgid "Current"
 msgstr "Actual"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:0
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:70
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:26
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:31
+#: code:addons/account_financial_report/report/open_items_xlsx.py:24
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:71
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header
-#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines
+#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines_header
 #, python-format
 msgid "Date"
 msgstr "Fecha"
@@ -542,8 +574,8 @@ msgid "Date To"
 msgstr "Fecha final"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:129
+#: code:addons/account_financial_report/report/open_items_xlsx.py:65
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_filters
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_filters
 #, python-format
@@ -551,7 +583,7 @@ msgid "Date at filter"
 msgstr "Filtro Fecha"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/vat_report_xlsx.py:0
+#: code:addons/account_financial_report/report/vat_report_xlsx.py:37
 #, python-format
 msgid "Date from"
 msgstr "Desde"
@@ -565,9 +597,9 @@ msgid "Date range"
 msgstr "Periodo"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:82
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:175
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:110
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters
 #, python-format
@@ -575,15 +607,16 @@ msgid "Date range filter"
 msgstr "Filtro periodo"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/vat_report_xlsx.py:0
+#: code:addons/account_financial_report/report/vat_report_xlsx.py:38
 #, python-format
 msgid "Date to"
 msgstr "Hasta"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:42
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:66
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:32
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:73
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_all_taxes
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header
@@ -594,7 +627,7 @@ msgid "Debit"
 msgstr "Debe"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:108
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_all_taxes
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_taxes
 #, python-format
@@ -628,20 +661,14 @@ msgstr "Detalle de impuestos"
 #: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__display_name
 #: model:ir.model.fields,field_description:account_financial_report.field_vat_report_wizard__display_name
 msgid "Display Name"
-msgstr "Nombre a mostrar"
+msgstr "Nombre mostrado"
 
 #. module: account_financial_report
 #: model:ir.model.fields,help:account_financial_report.field_general_ledger_report_wizard__foreign_currency
 #: model:ir.model.fields,help:account_financial_report.field_open_items_report_wizard__foreign_currency
 #: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__foreign_currency
-msgid ""
-"Display foreign currency for move lines, unless account currency is not "
-"setup through chart of accounts will display initial and final balance in "
-"that currency."
-msgstr ""
-"Mostrar moneda extranjera para líneas de movimiento contable, a menos que la "
-"moneda de la cuenta no esté configurada a través del plan de cuentas "
-"mostrará el saldo inicial y final en esa moneda."
+msgid "Display foreign currency for move lines, unless account currency is not setup through chart of accounts will display initial and final balance in that currency."
+msgstr "Mostrar moneda extranjera para líneas de movimiento contable, a menos que la moneda de la cuenta no esté configurada a través del plan de cuentas mostrará el saldo inicial y final en esa moneda."
 
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__hide_parent_hierarchy_level
@@ -650,7 +677,6 @@ msgstr "No mostrar niveles padre"
 
 #. module: account_financial_report
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines
-#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines
 msgid ""
 "Due\n"
 "                        date"
@@ -659,8 +685,17 @@ msgstr ""
 "                        vencimiento"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
+#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines_header
+msgid ""
+"Due\n"
+"                    date"
+msgstr ""
+"Fecha\n"
+"                    vencimiento"
+
+#. module: account_financial_report
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:76
+#: code:addons/account_financial_report/report/open_items_xlsx.py:30
 #, python-format
 msgid "Due date"
 msgstr "Fecha vencimiento"
@@ -685,9 +720,20 @@ msgstr ""
 "                        final"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: model:ir.model.fields,help:account_financial_report.field_aged_partner_balance_report_wizard__account_code_to
+#: model:ir.model.fields,help:account_financial_report.field_general_ledger_report_wizard__account_code_to
+#: model:ir.model.fields,help:account_financial_report.field_open_items_report_wizard__account_code_to
+#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__account_code_to
+msgid "Ending account in a range"
+msgstr "Cuenta final en un rango"
+
+#. module: account_financial_report
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:295
+#: code:addons/account_financial_report/report/open_items_xlsx.py:171
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:44
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:59
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:85
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:100
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_ending_cumul
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_lines_header
 #, python-format
@@ -696,38 +742,34 @@ msgstr "Saldo final"
 
 #. module: account_financial_report
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_lines_header
-#, fuzzy
-#| msgid ""
-#| "Ending\n"
-#| "                        balance"
 msgid ""
 "Ending balance\n"
 "                        cur."
 msgstr ""
-"Saldo\n"
-"                        final"
+"Balance Final\n"
+"                        moneda"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:183
 #, python-format
 msgid "Entries sorted by"
 msgstr "Asientos ordenados por"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:71
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:27
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:26
+#: code:addons/account_financial_report/report/open_items_xlsx.py:25
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header
-#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines
+#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines_header
 #, python-format
 msgid "Entry"
 msgstr "Asiento"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:0
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:70
 #, python-format
 msgid "Entry number"
 msgstr "Número de asiento"
@@ -792,6 +834,14 @@ msgstr "Filtrar empresa"
 msgid "Foreign Currency"
 msgstr "Moneda Extranjera"
 
+#. module: account_financial_report
+#: model_terms:ir.ui.view,arch_db:account_financial_report.aged_partner_balance_wizard
+#: model_terms:ir.ui.view,arch_db:account_financial_report.general_ledger_wizard
+#: model_terms:ir.ui.view,arch_db:account_financial_report.open_items_wizard
+#: model_terms:ir.ui.view,arch_db:account_financial_report.trial_balance_wizard
+msgid "From Code"
+msgstr "Desde Código"
+
 #. module: account_financial_report
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters
@@ -799,26 +849,22 @@ msgid "From:"
 msgstr "Desde:"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:83
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:176
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:111
 #, python-format
 msgid "From: %s To: %s"
 msgstr "Desde: %s A: %s"
 
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_account_group__complete_code
-#, fuzzy
-#| msgid "Code"
 msgid "Full Code"
-msgstr "Código"
+msgstr "Código Completo"
 
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_account_group__complete_name
-#, fuzzy
-#| msgid "Name"
 msgid "Full Name"
-msgstr "Nombre"
+msgstr "Nombre completo"
 
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__fy_start_date
@@ -827,7 +873,7 @@ msgid "Fy Start Date"
 msgstr "Fecha Inicio"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:16
 #: model:ir.actions.act_window,name:account_financial_report.act_action_general_ledger_wizard_partner_relation
 #: model:ir.actions.act_window,name:account_financial_report.action_general_ledger_wizard
 #: model:ir.actions.client,name:account_financial_report.action_report_general_ledger
@@ -845,10 +891,8 @@ msgstr "Libro mayor"
 
 #. module: account_financial_report
 #: model:ir.model,name:account_financial_report.model_report_account_financial_report_general_ledger
-#, fuzzy
-#| msgid "General Ledger Report Wizard"
 msgid "General Ledger Report"
-msgstr "Asistente de informe de Libro Mayor"
+msgstr "Informe Libro Mayor"
 
 #. module: account_financial_report
 #: model:ir.model,name:account_financial_report.model_general_ledger_report_wizard
@@ -869,12 +913,8 @@ msgstr "Libro mayor XLSX"
 
 #. module: account_financial_report
 #: model_terms:ir.ui.view,arch_db:account_financial_report.general_ledger_wizard
-msgid ""
-"General Ledger can be computed only if selected company have only one "
-"unaffected earnings account."
-msgstr ""
-"El Libro mayor solo se puede calcular si la empresa seleccionada tiene solo "
-"una cuenta de resultados no afectados."
+msgid "General Ledger can be computed only if selected company have only one unaffected earnings account."
+msgstr "El Libro mayor solo se puede calcular si la empresa seleccionada tiene solo una cuenta de resultados no afectados."
 
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__group_option
@@ -882,9 +922,9 @@ msgid "Group entries by"
 msgstr "Agrupar por"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:92
+#: code:addons/account_financial_report/report/open_items_xlsx.py:70
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:116
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_filters
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters
@@ -939,53 +979,52 @@ msgstr "ID"
 
 #. module: account_financial_report
 #: model:ir.model.fields,help:account_financial_report.field_account_account__centralized
-msgid ""
-"If flagged, no details will be displayed in the General Ledger report (the "
-"webkit one only), only centralized amounts per period."
-msgstr ""
-"Si se marca, no se mostrarán detalles en el informe del libro mayor (solo el "
-"webkit), solo importes centralizados por período."
+msgid "If flagged, no details will be displayed in the General Ledger report (the webkit one only), only centralized amounts per period."
+msgstr "Si se marca, no se mostrarán detalles en el informe del libro mayor (solo el webkit), solo importes centralizados por período."
 
 #. module: account_financial_report
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_lines_header
-#, fuzzy
-#| msgid ""
-#| "Initial\n"
-#| "                    balance"
 msgid ""
 "Initial\n"
 "                        balance cur."
 msgstr ""
-"Saldo\n"
-"                    inicial"
+"Balance\n"
+"                        inicial moneda"
 
 #. module: account_financial_report
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_lines_header
+#, fuzzy
+#| msgid ""
+#| "Initial\n"
+#| "                    balance"
 msgid ""
 "Initial\n"
-"                    balance"
+"                        balance cur."
 msgstr ""
 "Saldo\n"
 "                    inicial"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:283
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:28
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:55
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:69
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:96
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
 #, python-format
 msgid "Initial balance"
 msgstr "Saldo inicial"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:0
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:72
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:28
+#: code:addons/account_financial_report/report/open_items_xlsx.py:26
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:77
 #: model:ir.actions.client,name:account_financial_report.action_report_journal_ledger
 #: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__journal_ids
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
-#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines
+#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines_header
 #, python-format
 msgid "Journal"
 msgstr "Diario"
@@ -993,10 +1032,10 @@ msgstr "Diario"
 #. module: account_financial_report
 #: model:ir.model,name:account_financial_report.model_account_move_line
 msgid "Journal Item"
-msgstr "Entrada de Diario"
+msgstr "Apunte contable"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:15
 #: model:ir.actions.act_window,name:account_financial_report.action_journal_ledger_wizard
 #: model:ir.actions.report,name:account_financial_report.action_print_journal_ledger_wizard_html
 #: model:ir.actions.report,name:account_financial_report.action_print_journal_ledger_wizard_qweb
@@ -1012,10 +1051,8 @@ msgstr "Diario de contabilidad -"
 
 #. module: account_financial_report
 #: model:ir.model,name:account_financial_report.model_report_account_financial_report_journal_ledger
-#, fuzzy
-#| msgid "Journal Ledger Report Wizard"
 msgid "Journal Ledger Report"
-msgstr "Asistente de informe de Libro Diario"
+msgstr "Informe Diario de contabilidad"
 
 #. module: account_financial_report
 #: model:ir.model,name:account_financial_report.model_journal_ledger_report_wizard
@@ -1028,14 +1065,7 @@ msgid "Journal Ledger XLSX"
 msgstr "Libro diario XLSX"
 
 #. module: account_financial_report
-#: model:ir.model,name:account_financial_report.model_report_a_f_r_report_journal_ledger_xlsx
-#, fuzzy
-#| msgid "Journal Ledger XLSX"
-msgid "Journal Ledger XLSX Report"
-msgstr "Libro diario XLSX"
-
-#. module: account_financial_report
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:187
 #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__journal_ids
 #: model_terms:ir.ui.view,arch_db:account_financial_report.journal_ledger_wizard
 #, python-format
@@ -1074,7 +1104,7 @@ msgstr "Última modificación en"
 #: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__write_uid
 #: model:ir.model.fields,field_description:account_financial_report.field_vat_report_wizard__write_uid
 msgid "Last Updated by"
-msgstr "Última modificación por"
+msgstr "Última actualización por"
 
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__write_date
@@ -1084,7 +1114,7 @@ msgstr "Última modificación por"
 #: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__write_date
 #: model:ir.model.fields,field_description:account_financial_report.field_vat_report_wizard__write_date
 msgid "Last Updated on"
-msgstr "Última actualización en"
+msgstr "Última actualización el"
 
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_account_group__level
@@ -1093,13 +1123,13 @@ msgid "Level"
 msgstr "Nivel"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:120
 #, python-format
 msgid "Level %s"
 msgstr "Nivel %s"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:119
 #: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__limit_hierarchy_level
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters
 #, python-format
@@ -1117,8 +1147,8 @@ msgid "Moves"
 msgstr "Asientos"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/vat_report_xlsx.py:0
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:103
+#: code:addons/account_financial_report/report/vat_report_xlsx.py:24
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_all_taxes
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_taxes
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_vat_report_base
@@ -1127,41 +1157,43 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/vat_report_xlsx.py:0
+#: code:addons/account_financial_report/report/vat_report_xlsx.py:25
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_vat_report_base
 #, python-format
 msgid "Net"
 msgstr "Neto"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:96
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:100
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:104
+#: code:addons/account_financial_report/report/open_items_xlsx.py:72
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:118
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
 #, python-format
 msgid "No"
 msgstr "No"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:0
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:78
 #, python-format
 msgid "No group"
 msgstr "Sin grupo"
 
 #. module: account_financial_report
-#: model:ir.model.fields.selection,name:account_financial_report.selection__trial_balance_report_wizard__hierarchy_on__none
+#: selection:trial.balance.report.wizard,hierarchy_on:0
 msgid "No hierarchy"
 msgstr "Sin jerarquía"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:121
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters
 #, python-format
 msgid "No limit"
 msgstr "Sin límite"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:0
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:64
 #, python-format
 msgid "Not Posted"
 msgstr "Sin Postear"
@@ -1183,14 +1215,15 @@ msgid "OCA accounting reports"
 msgstr "Informes de contabilidad OCA"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:62
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:118
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines
 #, python-format
 msgid "Older"
 msgstr "Mayor"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
+#: code:addons/account_financial_report/report/open_items_xlsx.py:14
 #: model:ir.actions.act_window,name:account_financial_report.action_open_items_wizard
 #: model:ir.actions.client,name:account_financial_report.action_report_open_items
 #: model:ir.actions.report,name:account_financial_report.action_print_report_open_items_html
@@ -1212,10 +1245,8 @@ msgstr "Extracto - Cliente"
 
 #. module: account_financial_report
 #: model:ir.model,name:account_financial_report.model_report_account_financial_report_open_items
-#, fuzzy
-#| msgid "Open Items Report Wizard"
 msgid "Open Items Report"
-msgstr "Asistente de informe de partidas abiertas"
+msgstr "Informe Partidas Abiertas"
 
 #. module: account_financial_report
 #: model:ir.model,name:account_financial_report.model_open_items_report_wizard
@@ -1240,23 +1271,24 @@ msgid "Options"
 msgstr "Opciones"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
-#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines
+#: code:addons/account_financial_report/report/open_items_xlsx.py:31
+#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines_header
 #, python-format
 msgid "Original"
 msgstr "Inicial"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:26
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:74
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:33
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:51
+#: code:addons/account_financial_report/report/open_items_xlsx.py:28
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:68
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_lines_header
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header
-#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines
+#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines_header
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_lines_header
 #, python-format
 msgid "Partner"
@@ -1270,7 +1302,7 @@ msgid ""
 msgstr "Saldo Acumulado de Empresa"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:281
 #, python-format
 msgid "Partner Initial balance"
 msgstr "Saldo Inicial de empresa"
@@ -1282,8 +1314,8 @@ msgid "Partner cumul aged balance"
 msgstr "Saldo Acumulado de Empresa"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:292
+#: code:addons/account_financial_report/report/open_items_xlsx.py:166
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_ending_cumul
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_ending_cumul
 #, python-format
@@ -1304,7 +1336,8 @@ msgid "Percents"
 msgstr "Porcentajes"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:40
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:81
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_lines_header
 #, python-format
 msgid "Period balance"
@@ -1316,13 +1349,13 @@ msgid "Periods"
 msgstr "Periodos"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:0
+#: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:63
 #, python-format
 msgid "Posted"
 msgstr "Posteado"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:41
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
 #, python-format
 msgid "Rec."
@@ -1339,36 +1372,45 @@ msgstr "Sólo cuentas a cobrar"
 #. module: account_financial_report
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
-#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines
 msgid ""
 "Ref -\n"
 "                        Label"
 msgstr "Referencia"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
+#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines_header
+msgid ""
+"Ref -\n"
+"                    Label"
+msgstr ""
+"Ref -\n"
+"                    Etiqueta"
+
+#. module: account_financial_report
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:75
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:34
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:56
+#: code:addons/account_financial_report/report/open_items_xlsx.py:29
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header
 #, python-format
 msgid "Ref - Label"
-msgstr "Referencia"
+msgstr "Ref - Etiqueta"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:27
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:77
+#: code:addons/account_financial_report/report/open_items_xlsx.py:35
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_lines_header
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_move_lines
-#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines
+#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines_header
 #, python-format
 msgid "Residual"
 msgstr "Remanente"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:92
+#: code:addons/account_financial_report/report/open_items_xlsx.py:70
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:116
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_filters
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters
@@ -1379,15 +1421,17 @@ msgstr "Mostrar"
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__show_move_line_details
 msgid "Show Move Line Details"
-msgstr "Mostrar detalles de asientos"
+msgstr "Mostrar Detalles Apuntes"
 
 #. module: account_financial_report
+#: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__show_partner_details
+#: model:ir.model.fields,field_description:account_financial_report.field_open_items_report_wizard__show_partner_details
 #: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__show_partner_details
 msgid "Show Partner Details"
 msgstr "Mostrar detalles de empresa"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:99
 #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__show_analytic_tags
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
 #, python-format
@@ -1395,9 +1439,9 @@ msgid "Show analytic tags"
 msgstr "Mostrar etiquetas analíticas"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:103
+#: code:addons/account_financial_report/report/open_items_xlsx.py:71
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:117
 #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__foreign_currency
 #: model:ir.model.fields,field_description:account_financial_report.field_open_items_report_wizard__foreign_currency
 #: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__foreign_currency
@@ -1421,7 +1465,15 @@ msgid "Start date"
 msgstr "Fecha de inicio"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
+#: model:ir.model.fields,help:account_financial_report.field_aged_partner_balance_report_wizard__account_code_from
+#: model:ir.model.fields,help:account_financial_report.field_general_ledger_report_wizard__account_code_from
+#: model:ir.model.fields,help:account_financial_report.field_open_items_report_wizard__account_code_from
+#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__account_code_from
+msgid "Starting account in a range"
+msgstr "Cuenta inicial en un rango"
+
+#. module: account_financial_report
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:38
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
 #, python-format
 msgid "Tags"
@@ -1436,11 +1488,11 @@ msgid "Target Moves"
 msgstr "Movimientos destino"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:0
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:130
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:86
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:179
+#: code:addons/account_financial_report/report/open_items_xlsx.py:66
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:112
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_filters
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_filters
@@ -1450,7 +1502,7 @@ msgid "Target moves filter"
 msgstr "Filtro movimientos destino"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/vat_report_xlsx.py:0
+#: code:addons/account_financial_report/report/vat_report_xlsx.py:29
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_vat_report_base
 #, python-format
 msgid "Tax"
@@ -1463,40 +1515,40 @@ msgid "Tax Amount"
 msgstr "Total Impuestos"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:143
 #, python-format
 msgid "Tax Balance"
 msgstr "Saldo de Impuestos"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:137
 #, python-format
 msgid "Tax Credit"
 msgstr "Haber"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:131
 #, python-format
 msgid "Tax Debit"
 msgstr "Debe"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/vat_report_xlsx.py:0
-#: model:ir.model.fields.selection,name:account_financial_report.selection__vat_report_wizard__based_on__taxgroups
+#: code:addons/account_financial_report/report/vat_report_xlsx.py:40
+#: selection:vat.report.wizard,based_on:0
 #, python-format
 msgid "Tax Groups"
 msgstr "Grupo de impuestos"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/vat_report_xlsx.py:0
-#: model:ir.model.fields.selection,name:account_financial_report.selection__vat_report_wizard__based_on__taxtags
+#: code:addons/account_financial_report/report/vat_report_xlsx.py:39
+#: selection:vat.report.wizard,based_on:0
 #, python-format
 msgid "Tax Tags"
 msgstr "Etiquetas de impuestos"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:30
+#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:61
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header
 #, python-format
@@ -1504,46 +1556,33 @@ msgid "Taxes"
 msgstr "Impuestos"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:0
+#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:203
 #, python-format
-msgid ""
-"The Company in the General Ledger Report Wizard and in Date Range must be "
-"the same."
-msgstr ""
-"La empresa en el Asistente de informe de Contabilidad General y de rango de "
-"fechas debe ser la misma."
+msgid "The Company in the General Ledger Report Wizard and in Date Range must be the same."
+msgstr "La empresa en el Asistente de informe de Contabilidad General y de rango de fechas debe ser la misma."
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:0
+#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:181
 #, python-format
-msgid ""
-"The Company in the Trial Balance Report Wizard and in Date Range must be the "
-"same."
-msgstr ""
-"La empresa en el Asistente de informe de Balance de comprobación y en rango "
-"de fechas debe ser la misma."
+msgid "The Company in the Trial Balance Report Wizard and in Date Range must be the same."
+msgstr "La empresa en el Asistente de informe de Balance de comprobación y en rango de fechas debe ser la misma."
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/wizard/vat_report_wizard.py:0
+#: code:addons/account_financial_report/wizard/vat_report_wizard.py:60
 #, python-format
-msgid ""
-"The Company in the Vat Report Wizard and in Date Range must be the same."
-msgstr ""
-"La empresa en el Asistente para informes de IVA y en rango de fechas debe "
-"ser la misma."
+msgid "The Company in the Vat Report Wizard and in Date Range must be the same."
+msgstr "La empresa en el Asistente para informes de IVA y en rango de fechas debe ser la misma."
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:0
+#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:113
 #, python-format
 msgid "The hierarchy level to filter on must be greater than 0."
 msgstr "El nivel de jerarquía a filtrar debe ser mayor que 0."
 
 #. module: account_financial_report
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters
-#, fuzzy
-#| msgid "To:"
 msgid "To"
-msgstr "A:"
+msgstr "A"
 
 #. module: account_financial_report
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
@@ -1556,7 +1595,7 @@ msgid "Total"
 msgstr "Total"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:15
 #: model:ir.actions.act_window,name:account_financial_report.action_trial_balance_wizard
 #: model:ir.actions.client,name:account_financial_report.action_report_trial_balance
 #: model:ir.actions.report,name:account_financial_report.action_report_trial_balance_html
@@ -1573,10 +1612,8 @@ msgstr "Balance de Sumas y Saldos -"
 
 #. module: account_financial_report
 #: model:ir.model,name:account_financial_report.model_report_account_financial_report_trial_balance
-#, fuzzy
-#| msgid "Trial Balance Report Wizard"
 msgid "Trial Balance Report"
-msgstr "Asistente del informe de balance de sumas y saldos"
+msgstr "Informe Balance de Sumas y Saldos"
 
 #. module: account_financial_report
 #: model:ir.model,name:account_financial_report.model_trial_balance_report_wizard
@@ -1597,36 +1634,27 @@ msgstr "Balance de Sumas y Saldos XLSX"
 
 #. module: account_financial_report
 #: model_terms:ir.ui.view,arch_db:account_financial_report.trial_balance_wizard
-msgid ""
-"Trial Balance can be computed only if selected company have only one "
-"unaffected earnings account."
-msgstr ""
-"El balance de sumas y saldos solo puede calcularse si la compañía "
-"seleccionada tiene una y solo una cuenta de ganancias."
+msgid "Trial Balance can be computed only if selected company have only one unaffected earnings account."
+msgstr "El balance de sumas y saldos solo puede calcularse si la compañía seleccionada tiene una y solo una cuenta de ganancias."
 
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__unaffected_earnings_account
 #: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__unaffected_earnings_account
 msgid "Unaffected Earnings Account"
-msgstr "Cuenta de ganancias no afectadas"
+msgstr "Cuenta de Ganancias No Afectadas"
 
 #. module: account_financial_report
 #: model:ir.model.fields,help:account_financial_report.field_general_ledger_report_wizard__hide_account_at_0
 #: model:ir.model.fields,help:account_financial_report.field_open_items_report_wizard__hide_account_at_0
-msgid ""
-"Use this filter to hide an account or a partner with an ending balance at 0. "
-"If partners are filtered, debits and credits totals will not match the trial "
-"balance."
-msgstr ""
-"Use este filtro para ocultar las cuentas o empresas con saldo final 0. Si "
-"las empresas se filtran, los debe y haber totales no coincidirán con el "
-"balance de sumas y saldos."
+msgid "Use this filter to hide an account or a partner with an ending balance at 0. If partners are filtered, debits and credits totals will not match the trial balance."
+msgstr "Use este filtro para ocultar las cuentas o empresas con saldo final 0. Si las empresas se filtran, los debe y haber totales no coincidirán con el balance de sumas y saldos."
 
 #. module: account_financial_report
 #: model:ir.actions.act_window,name:account_financial_report.action_vat_report_wizard
 #: model:ir.actions.client,name:account_financial_report.action_report_vat_report
 #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_html
 #: model:ir.actions.report,name:account_financial_report.action_print_report_vat_report_qweb
+#: model:ir.model,name:account_financial_report.model_report_account_financial_report_vat_report
 #: model:ir.ui.menu,name:account_financial_report.menu_vat_report_wizard
 msgid "VAT Report"
 msgstr "Informe de impuestos"
@@ -1652,25 +1680,10 @@ msgid "VAT Report XLSX"
 msgstr "Informe de impuestos XLSX"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/vat_report_xlsx.py:0
-#, fuzzy, python-format
-#| msgid "VAT Report"
+#: code:addons/account_financial_report/report/vat_report_xlsx.py:13
+#, python-format
 msgid "Vat Report"
-msgstr "Informe de impuestos"
-
-#. module: account_financial_report
-#: model:ir.model,name:account_financial_report.model_report_account_financial_report_vat_report
-#, fuzzy
-#| msgid "VAT Report Options"
-msgid "Vat Report Report"
-msgstr "Opciones Informes de impuestos"
-
-#. module: account_financial_report
-#: model:ir.model,name:account_financial_report.model_report_a_f_r_report_vat_report_xlsx
-#, fuzzy
-#| msgid "VAT Report XLSX"
-msgid "Vat Report XLSX Report"
-msgstr "Informe de impuestos XLSX"
+msgstr "Informe de Impuestos"
 
 #. module: account_financial_report
 #: model_terms:ir.ui.view,arch_db:account_financial_report.aged_partner_balance_wizard
@@ -1680,16 +1693,12 @@ msgstr "Informe de impuestos XLSX"
 #: model_terms:ir.ui.view,arch_db:account_financial_report.trial_balance_wizard
 #: model_terms:ir.ui.view,arch_db:account_financial_report.vat_report_wizard
 msgid "View"
-msgstr "Vista"
+msgstr "Ver"
 
 #. module: account_financial_report
 #: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard__hide_account_at_0
-msgid ""
-"When this option is enabled, the trial balance will not display accounts "
-"that have initial balance = debit = credit = end balance = 0"
-msgstr ""
-"Cuando habilite esta opción el balance de sumas y saldos no va a mostrar "
-"cuentas que tengan saldo inicial = débito = crédito = saldo final = 0"
+msgid "When this option is enabled, the trial balance will not display accounts that have initial balance = debit = credit = end balance = 0"
+msgstr "Cuando habilite esta opción el balance de sumas y saldos no va a mostrar cuentas que tengan saldo inicial = débito = crédito = saldo final = 0"
 
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__with_account_name
@@ -1697,9 +1706,11 @@ msgid "With Account Name"
 msgstr "Cuenta con Nombre"
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:0
-#: code:addons/account_financial_report/report/open_items_xlsx.py:0
-#: code:addons/account_financial_report/report/trial_balance_xlsx.py:0
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:96
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:100
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:104
+#: code:addons/account_financial_report/report/open_items_xlsx.py:72
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:118
 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
 #, python-format
 msgid "Yes"
@@ -1833,296 +1844,7 @@ msgstr "ancho: 8.11%;"
 #~ msgid "Filter Cost Center"
 #~ msgstr "Filtro Centro de Costos"
 
-#~ msgid "Filter Journal"
-#~ msgstr "Filtrar por Diario"
-
-#~ msgid "Filter Partner"
-#~ msgstr "Filtro Empresa"
-
-#~ msgid "Final Amount Residual"
-#~ msgstr "Saldo Residual Final"
-
-#~ msgid "Final Amount Residual Currency"
-#~ msgstr "Saldo Residual Acumulado"
-
-#~ msgid "Final Amount Total Due"
-#~ msgstr "Saldo Final"
-
-#~ msgid "Final Amount Total Due Currency"
-#~ msgstr "Moneda de Saldo Final"
-
-#~ msgid "Final Balance"
-#~ msgstr "Total Saldo"
-
-#~ msgid "Final Balance Foreign Currency"
-#~ msgstr "Saldo Final Moneda Extranjera"
-
-#~ msgid "Final Credit"
-#~ msgstr "Total Haber"
-
-#~ msgid "Final Debit"
-#~ msgstr "Total Debe"
-
-#~ msgid "Group Option"
-#~ msgstr "Opción de Agrupación"
-
-#~ msgid "Hide Account At 0"
-#~ msgstr "Ocultar Cuentas a 0"
-
-#~ msgid "Hide Line"
-#~ msgstr "Ocultar Línea"
-
-#~ msgid "Initial Balance"
-#~ msgstr "Saldo Inicial"
-
-#~ msgid "Initial Balance Foreign Currency"
-#~ msgstr "Saldo Inicial Moneda Extranjera"
-
-#~ msgid "Initial Credit"
-#~ msgstr "Saldo inicial Haber"
-
-#~ msgid "Initial Debit"
-#~ msgstr "Saldo inicial Debe"
-
-#~ msgid "Initial blance cur."
-#~ msgstr "Saldo inicial Act."
-
-#~ msgid "Is Partner Account"
-#~ msgstr "Es cuenta de Asociado"
-
-#~ msgid "Label"
-#~ msgstr "Etiqueta"
-
-#~ msgid "Line"
-#~ msgstr "Línea"
-
-#~ msgid "Matching Number"
-#~ msgstr "Número Coincidente"
-
-#~ msgid "Move"
-#~ msgstr "Asiento"
-
-#~ msgid "Move Line"
-#~ msgstr "Línea de Asiento"
-
-#~ msgid "No partner allocated"
-#~ msgstr "Empresa sin asignar"
-
-#~ msgid "Only Posted Moves"
-#~ msgstr "Solo Asientos Posteados"
-
-#~ msgid "Parent"
-#~ msgstr "Padre"
-
-#~ msgid "Partner ID"
-#~ msgstr "Cliente"
-
-#~ msgid "Percent Age 120 Days"
-#~ msgstr "Porcentaje a 120 días"
-
-#~ msgid "Percent Age 30 Days"
-#~ msgstr "Porcentaje a 30 días"
-
-#~ msgid "Percent Age 60 Days"
-#~ msgstr "Porcentaje a 60 días"
-
-#~ msgid "Percent Age 90 Days"
-#~ msgstr "Porcentaje a 90 días"
-
-#~ msgid "Percent Current"
-#~ msgstr "Porcentaje Actual"
-
-#~ msgid "Percent Older"
-#~ msgstr "Porcentaje Anterior"
-
-#~ msgid "Period Balance"
-#~ msgstr "Saldo de Periodo"
-
-#~ msgid "Report"
-#~ msgstr "Informe"
-
-#~ msgid "Report Account"
-#~ msgstr "Informe de cuenta"
-
-#~ msgid "Report Journal Ledger"
-#~ msgstr "Libro diario"
-
-#~ msgid "Report Journal Ledger Tax Line"
-#~ msgstr "Informe de Línea de Impuestos de libro Diario"
-
-#~ msgid "Report Move"
-#~ msgstr "Informe de Asiento"
-
-#~ msgid "Report Move Line"
-#~ msgstr "Informe de cuenta"
-
-#~ msgid "Report Partner"
-#~ msgstr "Informe de empresa"
-
-#~ msgid "Report Tax"
-#~ msgstr "Informe de impuestos"
-
-#~ msgid "Report Tax Line"
-#~ msgstr "Informe de Línea de Impuestos"
-
-#~ msgid "Sequence"
-#~ msgstr "Secuencia"
-
-#~ msgid "Show Analytic Tags"
-#~ msgstr "Mostrar Etiquetas Analíticas"
-
-#~ msgid "Show Cost Center"
-#~ msgstr "Mostrar centro de costos"
-
-#~ msgid "Sort Option"
-#~ msgstr "Opción de Ordenar"
-
-#~ msgid "Tax Code"
-#~ msgstr "Código de Impuesto"
-
-#~ msgid "Tax Detail"
-#~ msgstr "Detalle de Impuesto"
-
-#~ msgid "Tax ID"
-#~ msgstr "Impuesto"
-
-#~ msgid "Tax Name"
-#~ msgstr "Nombre"
-
-#~ msgid "Taxes Description"
-#~ msgstr "Descripción"
-
-#~ msgid "Taxgroup"
-#~ msgstr "Grupo de impuestos"
-
-#~ msgid "Taxtag"
-#~ msgstr "Etiqueta de impuesto"
-
-#~ msgid "Taxtags"
-#~ msgstr "Etiquetas de impuestos"
-
-#~ msgid "report.a_f_r.report_aged_partner_balance_xlsx"
-#~ msgstr "informe.a_f_r.reporte_vencidos_de_empresa_xlxs"
-
-#~ msgid "report.a_f_r.report_general_ledger_xlsx"
-#~ msgstr "informe_a_f_r.libro_general_xlsx"
-
-#~ msgid "report.a_f_r.report_journal_ledger_xlsx"
-#~ msgstr "informe_a_f_r.informe_libro_diario_xlsx"
-
-#~ msgid "report.a_f_r.report_open_items_xlsx"
-#~ msgstr "informe.a_f_r.informe_abiertos_xlsx"
-
-#~ msgid "report.a_f_r.report_trial_balance_xlsx"
-#~ msgstr "informe.a_f_r.informe_balance_sumas_y_saldos_xlsx"
-
-#~ msgid "report.a_f_r.report_vat_report_xlsx"
-#~ msgstr "informe.a_f_r.informe_impuestos_xlsx"
-
-#~ msgid "report.account_financial_report.abstract_report_xlsx"
-#~ msgstr "informe.informes_de_contabilidad.informe_abstracto_xlsx"
-
-#~ msgid "report_aged_partner_balance"
-#~ msgstr "informe_saldos_vencidos_empresa"
-
-#~ msgid "report_aged_partner_balance_account"
-#~ msgstr "informe_saldos_vencidos_empresa"
-
-#~ msgid "report_aged_partner_balance_line"
-#~ msgstr "informe_linea_saldos_vencidos_empresa"
-
-#~ msgid "report_aged_partner_balance_move_line"
-#~ msgstr "informe_linea_de_asiento_saldos_vencidos_empresa"
-
-#~ msgid "report_aged_partner_balance_partner"
-#~ msgstr "informe_saldo_vencido_empresa"
-
-#~ msgid "report_general_ledger"
-#~ msgstr "informe_libro_mayor"
-
-#~ msgid "report_general_ledger_account"
-#~ msgstr "informe_cuenta_libro_mayor"
-
-#~ msgid "report_general_ledger_move_line"
-#~ msgstr "informe_linea_asiento_libro_mayor"
-
-#~ msgid "report_general_ledger_partner"
-#~ msgstr "informe_libro_mayor_empresa"
-
-#~ msgid "report_journal_ledger"
-#~ msgstr "informe_libro_diario"
-
-#~ msgid "report_journal_ledger_journal"
-#~ msgstr "informe_diario_libro_diario"
-
-#~ msgid "report_journal_ledger_journal_tax_line"
-#~ msgstr "informe_linea_impuesto_libro_diario"
-
-#~ msgid "report_journal_ledger_move"
-#~ msgstr "informe_asiento_libro_diario"
-
-#~ msgid "report_journal_ledger_move_line"
-#~ msgstr "informe_linea_asiento_libro_diario"
-
-#~ msgid "report_journal_ledger_report_tax_line"
-#~ msgstr "informe_linea_impuesto_libro_diario"
-
-#~ msgid "report_open_items"
-#~ msgstr "informe_items_abiertos"
-
-#~ msgid "report_open_items_account"
-#~ msgstr "informe_cuenta_elementos_abiertos"
-
-#~ msgid "report_open_items_move_line"
-#~ msgstr "informe_linea_asiento_elementos_abiertos"
-
-#~ msgid "report_open_items_partner"
-#~ msgstr "informe_elementos_abiertos_empresa"
-
-#~ msgid "report_trial_balance"
-#~ msgstr "informe_balance_de_sumas_y_saldos"
-
-#~ msgid "report_trial_balance_account"
-#~ msgstr "informe_cuenta_balance_sumas_y_saldos"
-
-#~ msgid "report_trial_balance_partner"
-#~ msgstr "informe_balance_sumas_y_saldos_empresa"
-
-#~ msgid "report_vat_report"
-#~ msgstr "informe_informe_impuestos"
-
-#~ msgid "report_vat_report_tax"
-#~ msgstr "informe_informe_impuestos"
-
-#~ msgid "report_vat_report_taxtag"
-#~ msgstr "informe_etiquetas_de_impuesto"
-
-#~ msgid "account.group"
-#~ msgstr "cuenta.grupo"
-
-#~ msgid "account_financial_report_abstract"
-#~ msgstr "'account_financial_report_abstract'"
-
-#~ msgid "vat.report.wizard"
-#~ msgstr "asistente.reporte.impuestos"
-
-#~ msgid "Aged Partner Balance - %s - %s"
-#~ msgstr "Balance vencido empresa - %s - %s"
-
-#~ msgid "General Ledger - %s - %s"
-#~ msgstr "Libro mayor - %s - %s"
-
-#~ msgid "Journal Ledger - %s - %s"
-#~ msgstr "Libro diario - %s - %s"
-
-#~ msgid "Open Items - %s - %s"
-#~ msgstr "Partidas abiertas - %s - %s"
-
-#~ msgid "Trial Balance - %s - %s"
-#~ msgstr "Balance de Sumas y Saldos - %s - %s"
-
-#~ msgid "VAT Report - %s - %s"
-#~ msgstr "Informe de impuestos - %s - %s"
-
-#~ msgid "Hide Account Balance At 0"
-#~ msgstr "Ocultar saldos con valor a 0"
+#. module: account_financial_report
+#: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header
+msgid "width: 8.11%;"
+msgstr "ancho: 8.11%;"
diff --git a/account_financial_report/report/abstract_report_xlsx.py b/account_financial_report/report/abstract_report_xlsx.py
index ce972dde..64fc5d15 100644
--- a/account_financial_report/report/abstract_report_xlsx.py
+++ b/account_financial_report/report/abstract_report_xlsx.py
@@ -440,25 +440,29 @@ class AbstractReportXslx(models.AbstractModel):
                         self.sheet.write_string(
                             self.row_pos, col_pos, value or "", self.format_header_right
                         )
+                elif cell_type == "currency_name":
+                    self.sheet.write_string(
+                        self.row_pos, col_pos, value or "", self.format_header_right
+                    )
         self.row_pos += 1
 
     def _get_currency_amt_format(self, line_object):
         """ Return amount format specific for each currency. """
-        if hasattr(line_object, "account_group_id") and line_object.account_group_id:
-            format_amt = self.format_amount_bold
+        if "account_group_id" in line_object and line_object["account_group_id"]:
+            format_amt = getattr(self, "format_amount_bold")
             field_prefix = "format_amount_bold"
         else:
-            format_amt = self.format_amount
+            format_amt = getattr(self, "format_amount")
             field_prefix = "format_amount"
-        if line_object.currency_id:
-            field_name = "{}_{}".format(field_prefix, line_object.currency_id.name)
+        if "currency_id" in line_object and line_object.get("currency_id", False):
+            field_name = "{}_{}".format(field_prefix, line_object["currency_id"].name)
             if hasattr(self, field_name):
                 format_amt = getattr(self, field_name)
             else:
                 format_amt = self.workbook.add_format()
-                self.field_name = format_amt
+                setattr(self, "field_name", format_amt)
                 format_amount = "#,##0." + (
-                    "0" * line_object.currency_id.decimal_places
+                    "0" * line_object["currency_id"].decimal_places
                 )
                 format_amt.set_num_format(format_amount)
         return format_amt
@@ -469,10 +473,13 @@ class AbstractReportXslx(models.AbstractModel):
             format_amt = self.format_amount_bold
             field_prefix = "format_amount_bold"
         else:
-            format_amt = self.format_amount
+            format_amt = getattr(self, "format_amount")
             field_prefix = "format_amount"
         if line_dict.get("currency_id", False) and line_dict["currency_id"]:
-            currency = self.env["res.currency"].browse([line_dict["currency_id"]])
+            if isinstance(line_dict["currency_id"], int):
+                currency = self.env["res.currency"].browse(line_dict["currency_id"])
+            else:
+                currency = line_dict["currency_id"]
             field_name = "{}_{}".format(field_prefix, currency.name)
             if hasattr(self, field_name):
                 format_amt = getattr(self, field_name)
diff --git a/account_financial_report/report/aged_partner_balance.py b/account_financial_report/report/aged_partner_balance.py
index e67d25ee..d24ef85b 100644
--- a/account_financial_report/report/aged_partner_balance.py
+++ b/account_financial_report/report/aged_partner_balance.py
@@ -2,6 +2,7 @@
 # Copyright 2020 ForgeFlow S.L. (https://www.forgeflow.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
+import operator
 from datetime import date, datetime, timedelta
 
 from odoo import api, models
@@ -63,7 +64,7 @@ class AgedPartnerBalanceReport(models.AbstractModel):
 
     @api.model
     def _get_move_lines_domain(
-        self, company_id, account_ids, partner_ids, only_posted_moves
+        self, company_id, account_ids, partner_ids, only_posted_moves, date_from
     ):
         domain = [
             ("account_id", "in", account_ids),
@@ -74,6 +75,8 @@ class AgedPartnerBalanceReport(models.AbstractModel):
             domain += [("partner_id", "in", partner_ids)]
         if only_posted_moves:
             domain += [("move_id.state", "=", "posted")]
+        if date_from:
+            domain += [("date", ">", date_from)]
         return domain
 
     @api.model
@@ -104,7 +107,7 @@ class AgedPartnerBalanceReport(models.AbstractModel):
         return ag_pb_data
 
     def _get_account_partial_reconciled(self, company_id, date_at_object):
-        domain = [("max_date", ">=", date_at_object), ("company_id", "=", company_id)]
+        domain = [("max_date", ">", date_at_object), ("company_id", "=", company_id)]
         fields = ["debit_move_id", "credit_move_id", "amount"]
         accounts_partial_reconcile = self.env["account.partial.reconcile"].search_read(
             domain=domain, fields=fields
@@ -153,11 +156,14 @@ class AgedPartnerBalanceReport(models.AbstractModel):
         partner_ids,
         only_posted_moves,
     ):
-        reconciled_ids = list(debit_ids) + list(credit_ids)
-        new_ml_ids = []
-        for reconciled_id in reconciled_ids:
-            if reconciled_id not in ml_ids and reconciled_id not in new_ml_ids:
-                new_ml_ids += [reconciled_id]
+        debit_ids = set(debit_ids)
+        credit_ids = set(credit_ids)
+        in_credit_but_not_in_debit = credit_ids - debit_ids
+        reconciled_ids = list(debit_ids) + list(in_credit_but_not_in_debit)
+        reconciled_ids = set(reconciled_ids)
+        ml_ids = set(ml_ids)
+        new_ml_ids = reconciled_ids - ml_ids
+        new_ml_ids = list(new_ml_ids)
         new_domain = self._get_new_move_lines_domain(
             new_ml_ids, account_ids, company_id, partner_ids, only_posted_moves
         )
@@ -192,11 +198,12 @@ class AgedPartnerBalanceReport(models.AbstractModel):
         account_ids,
         partner_ids,
         date_at_object,
+        date_from,
         only_posted_moves,
         show_move_line_details,
     ):
         domain = self._get_move_lines_domain(
-            company_id, account_ids, partner_ids, only_posted_moves
+            company_id, account_ids, partner_ids, only_posted_moves, date_from
         )
         ml_fields = [
             "id",
@@ -225,9 +232,13 @@ class AgedPartnerBalanceReport(models.AbstractModel):
                 credit_amount,
             ) = self._get_account_partial_reconciled(company_id, date_at_object)
             if acc_partial_rec:
-                ml_ids = map(lambda r: r["id"], move_lines)
-                debit_ids = map(lambda r: r["debit_move_id"], acc_partial_rec)
-                credit_ids = map(lambda r: r["credit_move_id"], acc_partial_rec)
+                ml_ids = list(map(operator.itemgetter("id"), move_lines))
+                debit_ids = list(
+                    map(operator.itemgetter("debit_move_id"), acc_partial_rec)
+                )
+                credit_ids = list(
+                    map(operator.itemgetter("credit_move_id"), acc_partial_rec)
+                )
                 move_lines = self._recalculate_move_lines(
                     move_lines,
                     debit_ids,
@@ -240,15 +251,12 @@ class AgedPartnerBalanceReport(models.AbstractModel):
                     partner_ids,
                     only_posted_moves,
                 )
-            moves_lines_to_remove = []
-            for move_line in move_lines:
-                if move_line["date"] > date_at_object or float_is_zero(
-                    move_line["amount_residual"], precision_digits=2
-                ):
-                    moves_lines_to_remove.append(move_line)
-            if len(moves_lines_to_remove) > 0:
-                for move_line_to_remove in moves_lines_to_remove:
-                    move_lines.remove(move_line_to_remove)
+            move_lines = [
+                move_line
+                for move_line in move_lines
+                if move_line["date"] <= date_at_object
+                and not float_is_zero(move_line["amount_residual"], precision_digits=2)
+            ]
         for move_line in move_lines:
             journals_ids.add(move_line["journal_id"][0])
             acc_id = move_line["account_id"][0]
@@ -267,6 +275,17 @@ class AgedPartnerBalanceReport(models.AbstractModel):
                 ag_pb_data = self._initialize_partner(ag_pb_data, acc_id, prt_id)
             move_line_data = {}
             if show_move_line_details:
+                if move_line["ref"] == move_line["name"]:
+                    if move_line["ref"]:
+                        ref_label = move_line["ref"]
+                    else:
+                        ref_label = ""
+                elif not move_line["ref"]:
+                    ref_label = move_line["name"]
+                elif not move_line["name"]:
+                    ref_label = move_line["ref"]
+                else:
+                    ref_label = move_line["ref"] + str(" - ") + move_line["name"]
                 move_line_data.update(
                     {
                         "date": move_line["date"],
@@ -274,7 +293,7 @@ class AgedPartnerBalanceReport(models.AbstractModel):
                         "jnl_id": move_line["journal_id"][0],
                         "acc_id": acc_id,
                         "partner": prt_name,
-                        "ref": move_line["ref"],
+                        "ref_label": ref_label,
                         "due_date": move_line["date_maturity"],
                         "residual": move_line["amount_residual"],
                     }
@@ -420,7 +439,7 @@ class AgedPartnerBalanceReport(models.AbstractModel):
         partner_ids = data["partner_ids"]
         date_at = data["date_at"]
         date_at_object = datetime.strptime(date_at, "%Y-%m-%d").date()
-
+        date_from = data["date_from"]
         only_posted_moves = data["only_posted_moves"]
         show_move_line_details = data["show_move_line_details"]
         (
@@ -433,6 +452,7 @@ class AgedPartnerBalanceReport(models.AbstractModel):
             account_ids,
             partner_ids,
             date_at_object,
+            date_from,
             only_posted_moves,
             show_move_line_details,
         )
diff --git a/account_financial_report/report/aged_partner_balance_xlsx.py b/account_financial_report/report/aged_partner_balance_xlsx.py
index ea2c1084..aea918a9 100644
--- a/account_financial_report/report/aged_partner_balance_xlsx.py
+++ b/account_financial_report/report/aged_partner_balance_xlsx.py
@@ -85,7 +85,7 @@ class AgedPartnerBalanceXslx(models.AbstractModel):
             2: {"header": _("Journal"), "field": "journal", "width": 8},
             3: {"header": _("Account"), "field": "account", "width": 9},
             4: {"header": _("Partner"), "field": "partner", "width": 25},
-            5: {"header": _("Ref - Label"), "field": "ref", "width": 40},
+            5: {"header": _("Ref - Label"), "field": "ref_label", "width": 40},
             6: {"header": _("Due date"), "field": "due_date", "width": 11},
             7: {
                 "header": _("Residual"),
diff --git a/account_financial_report/report/general_ledger.py b/account_financial_report/report/general_ledger.py
index f5b38a62..9ebaae34 100644
--- a/account_financial_report/report/general_ledger.py
+++ b/account_financial_report/report/general_ledger.py
@@ -4,6 +4,7 @@
 
 import calendar
 import datetime
+import operator
 
 from odoo import api, models
 
@@ -55,6 +56,7 @@ class GeneralLedgerReport(models.AbstractModel):
                         "id": tax.id,
                         "amount": tax.amount,
                         "amount_type": tax.amount_type,
+                        "display_name": tax.display_name,
                     }
                 }
             )
@@ -62,6 +64,13 @@ class GeneralLedgerReport(models.AbstractModel):
                 taxes_data[tax.id]["string"] = "%"
             else:
                 taxes_data[tax.id]["string"] = ""
+            taxes_data[tax.id]["tax_name"] = (
+                tax.display_name
+                + " ("
+                + str(tax.amount)
+                + taxes_data[tax.id]["string"]
+                + ")"
+            )
         return taxes_data
 
     def _get_acc_prt_accounts_ids(self, company_id):
@@ -301,6 +310,7 @@ class GeneralLedgerReport(models.AbstractModel):
             if move_line["partner_id"]
             else "",
             "ref": "" if not move_line["ref"] else move_line["ref"],
+            "name": "" if not move_line["name"] else move_line["name"],
             "tax_ids": move_line["tax_ids"],
             "debit": move_line["debit"],
             "credit": move_line["credit"],
@@ -315,6 +325,16 @@ class GeneralLedgerReport(models.AbstractModel):
             "tag_ids": move_line["analytic_tag_ids"],
             "currency_id": move_line["currency_id"],
         }
+        if (
+            move_line_data["ref"] == move_line_data["name"]
+            or move_line_data["ref"] == ""
+        ):
+            ref_label = move_line_data["name"]
+        elif move_line_data["name"] == "":
+            ref_label = move_line_data["ref"]
+        else:
+            ref_label = move_line_data["ref"] + str(" - ") + move_line_data["name"]
+        move_line_data.update({"ref_label": ref_label})
         return move_line_data
 
     @api.model
@@ -383,6 +403,22 @@ class GeneralLedgerReport(models.AbstractModel):
             gen_ld_data[acc_id]["fin_bal"]["bal_curr"] = 0.0
         return gen_ld_data
 
+    def _get_reconciled_after_date_to_ids(self, full_reconcile_ids, date_to):
+        full_reconcile_ids = list(full_reconcile_ids)
+        domain = [
+            ("max_date", ">", date_to),
+            ("full_reconcile_id", "in", full_reconcile_ids),
+        ]
+        fields = ["full_reconcile_id"]
+        reconciled_after_date_to = self.env["account.partial.reconcile"].search_read(
+            domain=domain, fields=fields
+        )
+        rec_after_date_to_ids = list(
+            map(operator.itemgetter("full_reconcile_id"), reconciled_after_date_to)
+        )
+        rec_after_date_to_ids = [i[0] for i in rec_after_date_to_ids]
+        return rec_after_date_to_ids
+
     def _get_period_ml_data(
         self,
         account_ids,
@@ -427,6 +463,7 @@ class GeneralLedgerReport(models.AbstractModel):
             "analytic_tag_ids",
             "amount_currency",
             "ref",
+            "name",
         ]
         move_lines = self.env["account.move.line"].search_read(
             domain=domain, fields=ml_fields
@@ -497,6 +534,9 @@ class GeneralLedgerReport(models.AbstractModel):
         accounts_data = self._get_accounts_data(gen_ld_data.keys())
         taxes_data = self._get_taxes_data(list(taxes_ids))
         tags_data = self._get_tags_data(list(tags_ids))
+        rec_after_date_to_ids = self._get_reconciled_after_date_to_ids(
+            full_reconcile_data.keys(), date_to
+        )
         return (
             gen_ld_data,
             accounts_data,
@@ -505,17 +545,24 @@ class GeneralLedgerReport(models.AbstractModel):
             full_reconcile_data,
             taxes_data,
             tags_data,
+            rec_after_date_to_ids,
         )
 
     @api.model
-    def _recalculate_cumul_balance(self, move_lines, last_cumul_balance):
+    def _recalculate_cumul_balance(
+        self, move_lines, last_cumul_balance, rec_after_date_to_ids
+    ):
         for move_line in move_lines:
             move_line["balance"] += last_cumul_balance
             last_cumul_balance = move_line["balance"]
+            if move_line["rec_id"] in rec_after_date_to_ids:
+                move_line["rec_name"] = str("*") + move_line["rec_name"]
         return move_lines
 
     @api.model
-    def _create_general_ledger(self, gen_led_data, accounts_data):
+    def _create_general_ledger(
+        self, gen_led_data, accounts_data, show_partner_details, rec_after_date_to_ids
+    ):
         general_ledger = []
         for acc_id in gen_led_data.keys():
             account = {}
@@ -537,32 +584,52 @@ class GeneralLedgerReport(models.AbstractModel):
                         move_lines += [gen_led_data[acc_id][ml_id]]
                 move_lines = sorted(move_lines, key=lambda k: (k["date"]))
                 move_lines = self._recalculate_cumul_balance(
-                    move_lines, gen_led_data[acc_id]["init_bal"]["balance"]
+                    move_lines,
+                    gen_led_data[acc_id]["init_bal"]["balance"],
+                    rec_after_date_to_ids,
                 )
                 account.update({"move_lines": move_lines})
             else:
-                list_partner = []
-                for prt_id in gen_led_data[acc_id].keys():
-                    partner = {}
+                if show_partner_details:
+                    list_partner = []
+                    for prt_id in gen_led_data[acc_id].keys():
+                        partner = {}
+                        move_lines = []
+                        if not isinstance(prt_id, int):
+                            account.update({prt_id: gen_led_data[acc_id][prt_id]})
+                        else:
+                            for ml_id in gen_led_data[acc_id][prt_id].keys():
+                                if not isinstance(ml_id, int):
+                                    partner.update(
+                                        {ml_id: gen_led_data[acc_id][prt_id][ml_id]}
+                                    )
+                                else:
+                                    move_lines += [gen_led_data[acc_id][prt_id][ml_id]]
+                            move_lines = sorted(move_lines, key=lambda k: (k["date"]))
+                            move_lines = self._recalculate_cumul_balance(
+                                move_lines,
+                                gen_led_data[acc_id][prt_id]["init_bal"]["balance"],
+                                rec_after_date_to_ids,
+                            )
+                            partner.update({"move_lines": move_lines})
+                            list_partner += [partner]
+                    account.update({"list_partner": list_partner})
+                else:
                     move_lines = []
-                    if not isinstance(prt_id, int):
-                        account.update({prt_id: gen_led_data[acc_id][prt_id]})
-                    else:
-                        for ml_id in gen_led_data[acc_id][prt_id].keys():
-                            if not isinstance(ml_id, int):
-                                partner.update(
-                                    {ml_id: gen_led_data[acc_id][prt_id][ml_id]}
-                                )
-                            else:
-                                move_lines += [gen_led_data[acc_id][prt_id][ml_id]]
-                        move_lines = sorted(move_lines, key=lambda k: (k["date"]))
-                        move_lines = self._recalculate_cumul_balance(
-                            move_lines,
-                            gen_led_data[acc_id][prt_id]["init_bal"]["balance"],
-                        )
-                        partner.update({"move_lines": move_lines})
-                        list_partner += [partner]
-                account.update({"list_partner": list_partner})
+                    for prt_id in gen_led_data[acc_id].keys():
+                        if not isinstance(prt_id, int):
+                            account.update({prt_id: gen_led_data[acc_id][prt_id]})
+                        else:
+                            for ml_id in gen_led_data[acc_id][prt_id].keys():
+                                if isinstance(ml_id, int):
+                                    move_lines += [gen_led_data[acc_id][prt_id][ml_id]]
+                    move_lines = sorted(move_lines, key=lambda k: (k["date"]))
+                    move_lines = self._recalculate_cumul_balance(
+                        move_lines,
+                        gen_led_data[acc_id]["init_bal"]["balance"],
+                        rec_after_date_to_ids,
+                    )
+                    account.update({"move_lines": move_lines, "partners": False})
             general_ledger += [account]
         return general_ledger
 
@@ -581,7 +648,7 @@ class GeneralLedgerReport(models.AbstractModel):
             centralized_ml[jnl_id][month].update(
                 {
                     "journal_id": jnl_id,
-                    "ref": "Centralized entries",
+                    "ref_label": "Centralized entries",
                     "date": date,
                     "debit": 0.0,
                     "credit": 0.0,
@@ -640,6 +707,7 @@ class GeneralLedgerReport(models.AbstractModel):
         account_ids = data["account_ids"]
         analytic_tag_ids = data["analytic_tag_ids"]
         cost_center_ids = data["cost_center_ids"]
+        show_partner_details = data["show_partner_details"]
         hide_account_at_0 = data["hide_account_at_0"]
         foreign_currency = data["foreign_currency"]
         only_posted_moves = data["only_posted_moves"]
@@ -667,6 +735,7 @@ class GeneralLedgerReport(models.AbstractModel):
             full_reconcile_data,
             taxes_data,
             tags_data,
+            rec_after_date_to_ids,
         ) = self._get_period_ml_data(
             account_ids,
             partner_ids,
@@ -683,7 +752,9 @@ class GeneralLedgerReport(models.AbstractModel):
             analytic_tag_ids,
             cost_center_ids,
         )
-        general_ledger = self._create_general_ledger(gen_ld_data, accounts_data)
+        general_ledger = self._create_general_ledger(
+            gen_ld_data, accounts_data, show_partner_details, rec_after_date_to_ids
+        )
         if centralize:
             for account in general_ledger:
                 if account["centralized"]:
diff --git a/account_financial_report/report/general_ledger_xlsx.py b/account_financial_report/report/general_ledger_xlsx.py
index ff2da940..d4deffd6 100644
--- a/account_financial_report/report/general_ledger_xlsx.py
+++ b/account_financial_report/report/general_ledger_xlsx.py
@@ -28,7 +28,7 @@ class GeneralLedgerXslx(models.AbstractModel):
             3: {"header": _("Account"), "field": "account", "width": 9},
             4: {"header": _("Taxes"), "field": "taxes_description", "width": 15},
             5: {"header": _("Partner"), "field": "partner_name", "width": 25},
-            6: {"header": _("Ref - Label"), "field": "ref", "width": 40},
+            6: {"header": _("Ref - Label"), "field": "ref_label", "width": 40},
             7: {"header": _("Cost center"), "field": "cost_center", "width": 15},
             8: {"header": _("Tags"), "field": "tags", "width": 10},
             9: {"header": _("Rec."), "field": "rec_name", "width": 5},
@@ -173,20 +173,15 @@ class GeneralLedgerXslx(models.AbstractModel):
                                 "currency_id": line["currency_id"][0],
                             }
                         )
-                    if line["ref"] != "Centralized entries":
+                    if line["ref_label"] != "Centralized entries":
                         taxes_description = ""
                         tags = ""
                         for tax_id in line["tax_ids"]:
-                            taxes_description += (
-                                str(taxes_data[tax_id]["amount"])
-                                + " "
-                                + taxes_data[tax_id]["string"]
-                                + " "
-                            )
+                            taxes_description += taxes_data[tax_id]["tax_name"] + " "
                         for tag_id in line["tag_ids"]:
                             tags += tags_data[tag_id]["name"] + " "
                         line.update(
-                            {"taxes_description": taxes_description, "tags": tags}
+                            {"taxes_description": taxes_description, "tags": tags,}
                         )
                     self.write_line_from_dict(line)
                 # Display ending balance line for account
@@ -225,7 +220,7 @@ class GeneralLedgerXslx(models.AbstractModel):
                     )
                     if foreign_currency:
                         partner.update(
-                            {"initial_bal_culrr": partner["init_bal"]["bal_curr"]}
+                            {"initial_bal_curr": partner["init_bal"]["bal_curr"],}
                         )
                     self.write_initial_balance_from_dict(partner)
 
@@ -237,20 +232,24 @@ class GeneralLedgerXslx(models.AbstractModel):
                                 "journal": journals_data[line["journal_id"]]["code"],
                             }
                         )
-                        if line["ref"] != "Centralized entries":
+                        if line["currency_id"]:
+                            line.update(
+                                {
+                                    "currency_name": line["currency_id"][1],
+                                    "currency_id": line["currency_id"][0],
+                                }
+                            )
+                        if line["ref_label"] != "Centralized entries":
                             taxes_description = ""
                             tags = ""
                             for tax_id in line["tax_ids"]:
                                 taxes_description += (
-                                    str(taxes_data[tax_id]["amount"])
-                                    + " "
-                                    + taxes_data[tax_id]["string"]
-                                    + " "
+                                    taxes_data[tax_id]["tax_name"] + " "
                                 )
                             for tag_id in line["tag_ids"]:
                                 tags += tags_data[tag_id]["name"] + " "
                             line.update(
-                                {"taxes_description": taxes_description, "tags": tags}
+                                {"taxes_description": taxes_description, "tags": tags,}
                             )
                         self.write_line_from_dict(line)
 
@@ -262,9 +261,13 @@ class GeneralLedgerXslx(models.AbstractModel):
                             "final_balance": partner["fin_bal"]["balance"],
                         }
                     )
-                    if foreign_currency:
+                    if foreign_currency and partner["currency_id"]:
                         partner.update(
-                            {"final_bal_curr": partner["fin_bal"]["bal_curr"]}
+                            {
+                                "final_bal_curr": partner["fin_bal"]["bal_curr"],
+                                "currency_name": partner["currency_id"].name,
+                                "currency_id": partner["currency_id"].id,
+                            }
                         )
                     self.write_ending_balance_from_dict(partner)
 
@@ -279,9 +282,13 @@ class GeneralLedgerXslx(models.AbstractModel):
                             "final_balance": account["fin_bal"]["balance"],
                         }
                     )
-                    if foreign_currency:
+                    if foreign_currency and account["currency_id"]:
                         account.update(
-                            {"final_bal_curr": account["fin_bal"]["bal_curr"],}
+                            {
+                                "final_bal_curr": account["fin_bal"]["bal_curr"],
+                                "currency_name": account["currency_id"].name,
+                                "currency_id": account["currency_id"].id,
+                            }
                         )
                     self.write_ending_balance_from_dict(account)
 
diff --git a/account_financial_report/report/open_items.py b/account_financial_report/report/open_items.py
index 544cc3e1..9b7e87a9 100644
--- a/account_financial_report/report/open_items.py
+++ b/account_financial_report/report/open_items.py
@@ -6,7 +6,6 @@ import operator
 from datetime import date, datetime
 
 from odoo import api, models
-from odoo.osv import expression
 from odoo.tools import float_is_zero
 
 
@@ -31,137 +30,113 @@ class OpenItemsReport(models.AbstractModel):
         ).render(rcontext)
         return result
 
-    def _get_account_partial_reconciled(self, move_lines_data, date_at_object):
-        reconciled_ids = []
-        for move_line in move_lines_data:
-            if move_line["reconciled"]:
-                reconciled_ids += [move_line["id"]]
-        domain = [("max_date", ">=", date_at_object)]
-        domain += expression.OR(
-            [
-                [("debit_move_id", "in", reconciled_ids)],
-                [("credit_move_id", "in", reconciled_ids)],
-            ]
-        )
+    def _get_account_partial_reconciled(self, company_id, date_at_object):
+        domain = [("max_date", ">", date_at_object), ("company_id", "=", company_id)]
         fields = ["debit_move_id", "credit_move_id", "amount"]
         accounts_partial_reconcile = self.env["account.partial.reconcile"].search_read(
             domain=domain, fields=fields
         )
-        debit_accounts_partial_amount = {}
-        credit_accounts_partial_amount = {}
+        debit_amount = {}
+        credit_amount = {}
         for account_partial_reconcile_data in accounts_partial_reconcile:
             debit_move_id = account_partial_reconcile_data["debit_move_id"][0]
             credit_move_id = account_partial_reconcile_data["credit_move_id"][0]
-            if debit_move_id not in debit_accounts_partial_amount.keys():
-                debit_accounts_partial_amount[debit_move_id] = 0.0
-            debit_accounts_partial_amount[
-                debit_move_id
-            ] += account_partial_reconcile_data["amount"]
-            if credit_move_id not in credit_accounts_partial_amount.keys():
-                credit_accounts_partial_amount[credit_move_id] = 0.0
-            credit_accounts_partial_amount[
-                credit_move_id
-            ] += account_partial_reconcile_data["amount"]
+            if debit_move_id not in debit_amount.keys():
+                debit_amount[debit_move_id] = 0.0
+            debit_amount[debit_move_id] += account_partial_reconcile_data["amount"]
+            if credit_move_id not in credit_amount.keys():
+                credit_amount[credit_move_id] = 0.0
+            credit_amount[credit_move_id] += account_partial_reconcile_data["amount"]
             account_partial_reconcile_data.update(
                 {"debit_move_id": debit_move_id, "credit_move_id": credit_move_id}
             )
-        return (
-            accounts_partial_reconcile,
-            debit_accounts_partial_amount,
-            credit_accounts_partial_amount,
-        )
+        return accounts_partial_reconcile, debit_amount, credit_amount
 
     @api.model
-    def _get_query_domain(
-        self,
-        account_ids,
-        partner_ids,
-        date_at_object,
-        target_move,
-        company_id,
-        date_from,
+    def _get_new_move_lines_domain(
+        self, new_ml_ids, account_ids, company_id, partner_ids, target_moves
     ):
-        query = """
-            WHERE aml.account_id in %s and aml.company_id = %s
-        """ % (
-            tuple(account_ids) if len(account_ids) > 1 else "(%s)" % account_ids[0],
-            company_id,
-        )
-        if date_from:
-            query += " and aml.date >= '%s'" % date_from
+        domain = [
+            ("account_id", "in", account_ids),
+            ("company_id", "=", company_id),
+            ("id", "in", new_ml_ids),
+        ]
         if partner_ids:
-            query += " and aml.partner_id in {}".format(tuple(partner_ids))
-        if target_move == "posted":
-            query += " and am.state = 'posted'"
-        if date_at_object >= date.today():
-            query += " and aml.reconciled IS FALSE"
-        else:
-            query += (
-                """ and ((aml.reconciled IS FALSE OR aml.date >= '%s')
-            OR aml.full_reconcile_id IS NOT NULL)"""
-                % date_at_object
-            )
-        return query
+            domain += [("partner_id", "in", partner_ids)]
+        if target_moves == "posted":
+            domain += [("move_id.state", "=", "posted")]
+        return domain
 
-    @api.model
-    def _get_query(
+    def _recalculate_move_lines(
         self,
+        move_lines,
+        debit_ids,
+        credit_ids,
+        debit_amount,
+        credit_amount,
+        ml_ids,
         account_ids,
-        partner_ids,
-        date_at_object,
-        target_move,
         company_id,
-        date_from,
+        partner_ids,
+        target_moves,
     ):
-        aml_fields = [
+        debit_ids = set(debit_ids)
+        credit_ids = set(credit_ids)
+        in_credit_but_not_in_debit = credit_ids - debit_ids
+        reconciled_ids = list(debit_ids) + list(in_credit_but_not_in_debit)
+        reconciled_ids = set(reconciled_ids)
+        ml_ids = set(ml_ids)
+        new_ml_ids = reconciled_ids - ml_ids
+        new_ml_ids = list(new_ml_ids)
+        new_domain = self._get_new_move_lines_domain(
+            new_ml_ids, account_ids, company_id, partner_ids, target_moves
+        )
+        ml_fields = [
             "id",
+            "name",
             "date",
             "move_id",
             "journal_id",
             "account_id",
             "partner_id",
-            "ref",
-            "date_maturity",
             "amount_residual",
-            "amount_currency",
-            "amount_residual_currency",
+            "date_maturity",
+            "ref",
             "debit",
             "credit",
-            "currency_id",
             "reconciled",
-            "full_reconcile_id",
+            "currency_id",
+            "amount_currency",
+            "amount_residual_currency",
         ]
-        query = ""
-
-        # SELECT
-        for field in aml_fields:
-            if not query:
-                query = "SELECT aml.%s" % field
-            else:
-                query += ", aml.%s" % field
-        # name from res_partner
-        query += ", rp.name as partner_name"
-        # name from res_currency
-        query += ", rc.name as currency_name"
-        # state and name from account_move
-        query += ", am.state, am.name as move_name"
-
-        # FROM
-        query += """
-            FROM account_move_line as aml
-            LEFT JOIN res_partner as rp
-                ON aml.partner_id = rp.id
-            LEFT JOIN res_currency as rc
-                ON aml.currency_id = rc.id
-            LEFT JOIN account_move as am
-                ON am.id = aml.move_id
-        """
-
-        # WHERE
-        query += self._get_query_domain(
-            account_ids, partner_ids, date_at_object, target_move, company_id, date_from
+        new_move_lines = self.env["account.move.line"].search_read(
+            domain=new_domain, fields=ml_fields
         )
-        return query
+        move_lines = move_lines + new_move_lines
+        for move_line in move_lines:
+            ml_id = move_line["id"]
+            if ml_id in debit_ids:
+                move_line["amount_residual"] += debit_amount[ml_id]
+            if ml_id in credit_ids:
+                move_line["amount_residual"] -= credit_amount[ml_id]
+        return move_lines
+
+    @api.model
+    def _get_move_lines_domain(
+        self, company_id, account_ids, partner_ids, target_move, date_from
+    ):
+        domain = [
+            ("account_id", "in", account_ids),
+            ("company_id", "=", company_id),
+            ("reconciled", "=", False),
+        ]
+        if partner_ids:
+            domain += [("partner_id", "in", partner_ids)]
+        if target_move == "posted":
+            domain += [("move_id.state", "=", "posted")]
+        if date_from:
+            domain += [("date", ">", date_from)]
+        return domain
 
     def _get_accounts_data(self, accounts_ids):
         accounts = self.env["account.account"].browse(accounts_ids)
@@ -188,7 +163,6 @@ class OpenItemsReport(models.AbstractModel):
             journals_data.update({journal.id: {"id": journal.id, "code": journal.code}})
         return journals_data
 
-    # flake8: noqa: C901
     def _get_data(
         self,
         account_ids,
@@ -198,69 +172,80 @@ class OpenItemsReport(models.AbstractModel):
         company_id,
         date_from,
     ):
-        query = self._get_query(
-            account_ids, partner_ids, date_at_object, target_move, company_id, date_from
+        domain = self._get_move_lines_domain(
+            company_id, account_ids, partner_ids, target_move, date_from
         )
-        self._cr.execute(query)
-        move_lines_data = self._cr.dictfetchall()
-        account_ids = map(lambda r: r["account_id"], move_lines_data)
-        accounts_data = self._get_accounts_data(list(account_ids))
-        journal_ids = map(lambda r: r["journal_id"], move_lines_data)
-        journals_data = self._get_journals_data(list(journal_ids))
-
+        ml_fields = [
+            "id",
+            "name",
+            "date",
+            "move_id",
+            "journal_id",
+            "account_id",
+            "partner_id",
+            "amount_residual",
+            "date_maturity",
+            "ref",
+            "debit",
+            "credit",
+            "reconciled",
+            "currency_id",
+            "amount_currency",
+            "amount_residual_currency",
+        ]
+        move_lines = self.env["account.move.line"].search_read(
+            domain=domain, fields=ml_fields
+        )
+        journals_ids = set()
+        partners_ids = set()
+        partners_data = {}
         if date_at_object < date.today():
             (
-                accounts_partial_reconcile,
-                debit_accounts_partial_amount,
-                credit_accounts_partial_amount,
-            ) = self._get_account_partial_reconciled(move_lines_data, date_at_object)
-            if accounts_partial_reconcile:
-                debit_ids = map(
-                    operator.itemgetter("debit_move_id"), accounts_partial_reconcile
+                acc_partial_rec,
+                debit_amount,
+                credit_amount,
+            ) = self._get_account_partial_reconciled(company_id, date_at_object)
+            if acc_partial_rec:
+                ml_ids = list(map(operator.itemgetter("id"), move_lines))
+                debit_ids = list(
+                    map(operator.itemgetter("debit_move_id"), acc_partial_rec)
                 )
-                credit_ids = map(
-                    operator.itemgetter("credit_move_id"), accounts_partial_reconcile
+                credit_ids = list(
+                    map(operator.itemgetter("credit_move_id"), acc_partial_rec)
                 )
-                for move_line in move_lines_data:
-                    if move_line["id"] in debit_ids:
-                        move_line["amount_residual"] += debit_accounts_partial_amount[
-                            move_line["id"]
-                        ]
-                    if move_line["id"] in credit_ids:
-                        move_line["amount_residual"] -= credit_accounts_partial_amount[
-                            move_line["id"]
-                        ]
-            moves_lines_to_remove = []
-            for move_line in move_lines_data:
-                if move_line["date"] > date_at_object or float_is_zero(
-                    move_line["amount_residual"], precision_digits=2
-                ):
-                    moves_lines_to_remove.append(move_line)
-            if len(moves_lines_to_remove) > 0:
-                for move_line_to_remove in moves_lines_to_remove:
-                    move_lines_data.remove(move_line_to_remove)
-        partners_data = {0: {"id": 0, "name": "Missing Partner"}}
+                move_lines = self._recalculate_move_lines(
+                    move_lines,
+                    debit_ids,
+                    credit_ids,
+                    debit_amount,
+                    credit_amount,
+                    ml_ids,
+                    account_ids,
+                    company_id,
+                    partner_ids,
+                    target_move,
+                )
+            move_lines = [
+                move_line
+                for move_line in move_lines
+                if move_line["date"] <= date_at_object
+                and not float_is_zero(move_line["amount_residual"], precision_digits=2)
+            ]
+
         open_items_move_lines_data = {}
-        for move_line in move_lines_data:
-            no_partner = True
+        for move_line in move_lines:
+            journals_ids.add(move_line["journal_id"][0])
+            acc_id = move_line["account_id"][0]
             # Partners data
             if move_line["partner_id"]:
-                no_partner = False
-                partners_data.update(
-                    {
-                        move_line["partner_id"]: {
-                            "id": move_line["partner_id"],
-                            "name": move_line["partner_name"],
-                            "currency_id": accounts_data[move_line["account_id"]][
-                                "currency_id"
-                            ],
-                        }
-                    }
-                )
+                prt_id = move_line["partner_id"][0]
+                prt_name = move_line["partner_id"][1]
             else:
-                partners_data[0]["currency_id"] = accounts_data[
-                    move_line["account_id"]
-                ]["currency_id"]
+                prt_id = 0
+                prt_name = "Missing Partner"
+            if prt_id not in partners_ids:
+                partners_data.update({prt_id: {"id": prt_id, "name": prt_name}})
+                partners_ids.add(prt_id)
 
             # Move line update
             original = 0
@@ -269,39 +254,51 @@ class OpenItemsReport(models.AbstractModel):
                 original = move_line["credit"] * (-1)
             if not float_is_zero(move_line["debit"], precision_digits=2):
                 original = move_line["debit"]
+
+            if move_line["ref"] == move_line["name"]:
+                if move_line["ref"]:
+                    ref_label = move_line["ref"]
+                else:
+                    ref_label = ""
+            elif not move_line["ref"]:
+                ref_label = move_line["name"]
+            elif not move_line["name"]:
+                ref_label = move_line["ref"]
+            else:
+                ref_label = move_line["ref"] + str(" - ") + move_line["name"]
+
             move_line.update(
                 {
-                    "date": move_line["date"].strftime("%d/%m/%Y"),
+                    "date": move_line["date"],
                     "date_maturity": move_line["date_maturity"]
                     and move_line["date_maturity"].strftime("%d/%m/%Y"),
                     "original": original,
-                    "partner_id": 0 if no_partner else move_line["partner_id"],
-                    "partner_name": "" if no_partner else move_line["partner_name"],
-                    "ref": "" if not move_line["ref"] else move_line["ref"],
-                    "account": accounts_data[move_line["account_id"]]["code"],
-                    "journal": journals_data[move_line["journal_id"]]["code"],
+                    "partner_id": prt_id,
+                    "partner_name": prt_name,
+                    "ref_label": ref_label,
+                    "journal_id": move_line["journal_id"][0],
+                    "move_name": move_line["move_id"][1],
+                    "currency_id": move_line["currency_id"][0]
+                    if move_line["currency_id"]
+                    else False,
+                    "currency_name": move_line["currency_id"][1]
+                    if move_line["currency_id"]
+                    else False,
                 }
             )
 
             # Open Items Move Lines Data
-            if move_line["account_id"] not in open_items_move_lines_data.keys():
-                open_items_move_lines_data[move_line["account_id"]] = {
-                    move_line["partner_id"]: [move_line]
-                }
+            if acc_id not in open_items_move_lines_data.keys():
+                open_items_move_lines_data[acc_id] = {prt_id: [move_line]}
             else:
-                if (
-                    move_line["partner_id"]
-                    not in open_items_move_lines_data[move_line["account_id"]].keys()
-                ):
-                    open_items_move_lines_data[move_line["account_id"]][
-                        move_line["partner_id"]
-                    ] = [move_line]
+                if prt_id not in open_items_move_lines_data[acc_id].keys():
+                    open_items_move_lines_data[acc_id][prt_id] = [move_line]
                 else:
-                    open_items_move_lines_data[move_line["account_id"]][
-                        move_line["partner_id"]
-                    ].append(move_line)
+                    open_items_move_lines_data[acc_id][prt_id].append(move_line)
+        journals_data = self._get_journals_data(list(journals_ids))
+        accounts_data = self._get_accounts_data(open_items_move_lines_data.keys())
         return (
-            move_lines_data,
+            move_lines,
             partners_data,
             journals_data,
             accounts_data,
@@ -325,19 +322,31 @@ class OpenItemsReport(models.AbstractModel):
         return total_amount
 
     @api.model
-    def _get_open_items_no_partners(self, open_items_move_lines_data):
+    def _order_open_items_by_date(
+        self, open_items_move_lines_data, show_partner_details
+    ):
         new_open_items = {}
-        for acc_id in open_items_move_lines_data.keys():
-            new_open_items[acc_id] = {}
-            move_lines = []
-            for prt_id in open_items_move_lines_data[acc_id]:
-                for move_line in open_items_move_lines_data[acc_id][prt_id]:
-                    move_lines += [move_line]
-            move_lines = sorted(move_lines, key=lambda k: (k["date"]))
-            new_open_items[acc_id] = move_lines
+        if not show_partner_details:
+            for acc_id in open_items_move_lines_data.keys():
+                new_open_items[acc_id] = {}
+                move_lines = []
+                for prt_id in open_items_move_lines_data[acc_id]:
+                    for move_line in open_items_move_lines_data[acc_id][prt_id]:
+                        move_lines += [move_line]
+                move_lines = sorted(move_lines, key=lambda k: (k["date"]))
+                new_open_items[acc_id] = move_lines
+        else:
+            for acc_id in open_items_move_lines_data.keys():
+                new_open_items[acc_id] = {}
+                for prt_id in open_items_move_lines_data[acc_id]:
+                    new_open_items[acc_id][prt_id] = {}
+                    move_lines = []
+                    for move_line in open_items_move_lines_data[acc_id][prt_id]:
+                        move_lines += [move_line]
+                    move_lines = sorted(move_lines, key=lambda k: (k["date"]))
+                    new_open_items[acc_id][prt_id] = move_lines
         return new_open_items
 
-    @api.multi
     def _get_report_values(self, docids, data):
         wizard_id = data["wizard_id"]
         company = self.env["res.company"].browse(data["company_id"])
@@ -361,10 +370,9 @@ class OpenItemsReport(models.AbstractModel):
         )
 
         total_amount = self._calculate_amounts(open_items_move_lines_data)
-        if not show_partner_details:
-            open_items_move_lines_data = self._get_open_items_no_partners(
-                open_items_move_lines_data
-            )
+        open_items_move_lines_data = self._order_open_items_by_date(
+            open_items_move_lines_data, show_partner_details
+        )
         return {
             "doc_ids": [wizard_id],
             "doc_model": "open.items.report.wizard",
@@ -376,6 +384,7 @@ class OpenItemsReport(models.AbstractModel):
             "date_at": date_at_object.strftime("%d/%m/%Y"),
             "hide_account_at_0": data["hide_account_at_0"],
             "target_move": data["target_move"],
+            "journals_data": journals_data,
             "partners_data": partners_data,
             "accounts_data": accounts_data,
             "total_amount": total_amount,
diff --git a/account_financial_report/report/open_items_xlsx.py b/account_financial_report/report/open_items_xlsx.py
index 5fc0841d..65345775 100644
--- a/account_financial_report/report/open_items_xlsx.py
+++ b/account_financial_report/report/open_items_xlsx.py
@@ -22,11 +22,11 @@ class OpenItemsXslx(models.AbstractModel):
     def _get_report_columns(self, report):
         res = {
             0: {"header": _("Date"), "field": "date", "width": 11},
-            1: {"header": _("Entry"), "field": "move_id_name", "width": 18},
+            1: {"header": _("Entry"), "field": "move_name", "width": 18},
             2: {"header": _("Journal"), "field": "journal", "width": 8},
             3: {"header": _("Account"), "field": "account", "width": 9},
-            4: {"header": _("Partner"), "field": "partner", "width": 25},
-            5: {"header": _("Ref - Label"), "field": "ref", "width": 40},
+            4: {"header": _("Partner"), "field": "partner_name", "width": 25},
+            5: {"header": _("Ref - Label"), "field": "ref_label", "width": 40},
             6: {"header": _("Due date"), "field": "date_maturity", "width": 11},
             7: {
                 "header": _("Original"),
@@ -108,6 +108,7 @@ class OpenItemsXslx(models.AbstractModel):
         Open_items = res_data["Open_Items"]
         accounts_data = res_data["accounts_data"]
         partners_data = res_data["partners_data"]
+        journals_data = res_data["journals_data"]
         total_amount = res_data["total_amount"]
         show_partner_details = res_data["show_partner_details"]
         for account_id in Open_items.keys():
@@ -131,9 +132,25 @@ class OpenItemsXslx(models.AbstractModel):
 
                         # Display account move lines
                         for line in Open_items[account_id][partner_id]:
+                            line.update(
+                                {
+                                    "account": accounts_data[account_id]["code"],
+                                    "journal": journals_data[line["journal_id"]][
+                                        "code"
+                                    ],
+                                }
+                            )
                             self.write_line_from_dict(line)
 
                         # Display ending balance line for partner
+                        partners_data[partner_id].update(
+                            {
+                                "currency_id": accounts_data[account_id]["currency_id"],
+                                "currency_name": accounts_data[account_id][
+                                    "currency_name"
+                                ],
+                            }
+                        )
                         self.write_ending_balance_from_dict(
                             partners_data[partner_id],
                             type_object,
@@ -150,6 +167,12 @@ class OpenItemsXslx(models.AbstractModel):
 
                     # Display account move lines
                     for line in Open_items[account_id]:
+                        line.update(
+                            {
+                                "account": accounts_data[account_id]["code"],
+                                "journal": journals_data[line["journal_id"]]["code"],
+                            }
+                        )
                         self.write_line_from_dict(line)
 
                 # Display ending balance line for account
diff --git a/account_financial_report/report/templates/aged_partner_balance.xml b/account_financial_report/report/templates/aged_partner_balance.xml
index 8dc8fdc2..e5f4a8d1 100644
--- a/account_financial_report/report/templates/aged_partner_balance.xml
+++ b/account_financial_report/report/templates/aged_partner_balance.xml
@@ -295,7 +295,7 @@
                         <!--                               t-att-data-res-model="'account.move.line'"-->
                         <!--                               class="o_account_financial_reports_web_action"-->
                         <!--                               style="color: black;">-->
-                        <t t-raw="line['ref']" />
+                        <t t-raw="line['ref_label']" />
                         <!--                            </a>-->
                         <!--                        </span>-->
                     </div>
diff --git a/account_financial_report/report/templates/general_ledger.xml b/account_financial_report/report/templates/general_ledger.xml
index 42610b54..bd85cfd2 100644
--- a/account_financial_report/report/templates/general_ledger.xml
+++ b/account_financial_report/report/templates/general_ledger.xml
@@ -357,7 +357,7 @@
                     >
                         <div class="act_as_cell amount" style="width: 2.08%;">
                             <span
-                                t-field="o._get_atr_from_dict(account['id'], accounts_data, 'currency_name')"
+                                t-esc="o._get_atr_from_dict(account['id'], accounts_data, 'currency_name')"
                             />
                         </div>
                         <div class="act_as_cell amount" style="width: 5.19%;">
@@ -376,7 +376,7 @@
                                     >
                                         <t
                                             t-raw="account_or_partner_object['init_bal']['bal_curr']"
-                                            t-options="{'widget': 'monetary', 'display_currency': account.account_id.currency_id}"
+                                            t-options="{'widget': 'monetary', 'display_currency': o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')}"
                                         />
                                     </a>
                                 </span>
@@ -397,7 +397,7 @@
                                     >
                                         <t
                                             t-raw="account_or_partner_object['init_bal']['bal_curr']"
-                                            t-options="{'widget': 'monetary', 'display_currency': account.account_id.currency_id}"
+                                            t-options="{'widget': 'monetary', 'display_currency': o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')}"
                                         />
                                     </a>
                                 </span>
@@ -501,10 +501,7 @@
                         <t t-if="taxes_data and line['tax_ids']">
                             <t t-foreach="line['tax_ids']" t-as="tax_id">
                                 <span
-                                    t-esc="o._get_atr_from_dict(tax_id, taxes_data, 'amount')"
-                                />
-                                <span
-                                    t-esc="o._get_atr_from_dict(tax_id, taxes_data, 'string')"
+                                    t-esc="o._get_atr_from_dict(tax_id, taxes_data, 'tax_name')"
                                 />
                             </t>
                         </t>
@@ -534,7 +531,7 @@
                                     class="o_account_financial_reports_web_action"
                                     style="color: black;"
                                 >
-                                    <t t-raw="line['ref']" />
+                                    <t t-raw="line['ref_label']" />
                                 </a>
                             </span>
                         </t>
@@ -544,7 +541,7 @@
                                     class="o_account_financial_reports_web_action"
                                     style="color: black;"
                                 >
-                                    <t t-raw="line['ref']" />
+                                    <t t-raw="line['ref_label']" />
                                 </a>
                             </span>
                         </t>
@@ -780,7 +777,7 @@
                     >
                         <div class="act_as_cell amount" style="width: 2.08%;">
                             <span
-                                t-field="o._get_atr_from_dict(account['id'], accounts_data, 'currency_name')"
+                                t-esc="o._get_atr_from_dict(account['id'], accounts_data, 'currency_name')"
                             />
                         </div>
                         <div class="act_as_cell amount" style="width: 5.19%;">
@@ -799,7 +796,7 @@
                                     >
                                         <t
                                             t-raw="account_or_partner_object['fin_bal']['bal_curr']"
-                                            t-options="{'widget': 'monetary', 'display_currency': account_or_partner_object.account_id.currency_id}"
+                                            t-options="{'widget': 'monetary', 'display_currency': o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')}"
                                         />
                                     </a>
                                 </span>
@@ -820,7 +817,7 @@
                                     >
                                         <t
                                             t-raw="account_or_partner_object['fin_bal']['bal_curr']"
-                                            t-options="{'widget': 'monetary', 'display_currency': account_or_partner_object.report_account_id.currency_id}"
+                                            t-options="{'widget': 'monetary', 'display_currency': o._get_atr_from_dict(account['id'], accounts_data, 'currency_id')}"
                                         />
                                     </a>
                                 </span>
diff --git a/account_financial_report/report/templates/open_items.xml b/account_financial_report/report/templates/open_items.xml
index 56a59539..30662a7d 100644
--- a/account_financial_report/report/templates/open_items.xml
+++ b/account_financial_report/report/templates/open_items.xml
@@ -172,7 +172,7 @@
         <div class="act_as_row lines">
             <!--## date-->
             <div class="act_as_cell left">
-                <span t-raw="line['date']" />
+                <span t-raw="line['date'].strftime('%d/%m/%Y')" />
             </div>
             <!--## move-->
             <div class="act_as_cell left">
@@ -190,11 +190,11 @@
             </div>
             <!--## journal-->
             <div class="act_as_cell left">
-                <span t-esc="line['journal']" />
+                <span t-esc="journals_data[line['journal_id']]['code']" />
             </div>
             <!--## account code-->
             <div class="act_as_cell left">
-                <span t-esc="line['account']" />
+                <span t-esc="accounts_data[account_id]['code']" />
             </div>
             <!--## partner-->
             <div class="act_as_cell left">
@@ -203,7 +203,7 @@
             </div>
             <!--## ref - label-->
             <div class="act_as_cell left">
-                <span t-esc="line['ref']" />
+                <span t-esc="line['ref_label']" />
             </div>
             <!--## date_due-->
             <div class="act_as_cell left">
diff --git a/account_financial_report/report/trial_balance.py b/account_financial_report/report/trial_balance.py
index 9dce0232..f6bad477 100644
--- a/account_financial_report/report/trial_balance.py
+++ b/account_financial_report/report/trial_balance.py
@@ -3,7 +3,6 @@
 # Copyright 2020 ForgeFlow S.L. (https://www.forgeflow.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from operator import itemgetter
 
 from odoo import api, models
 
@@ -203,10 +202,11 @@ class TrialBalanceReport(models.AbstractModel):
         for initial_balance in initial_balances:
             pl_initial_balance += initial_balance["balance"]
             if foreign_currency:
-                pl_initial_currency_balance += initial_balance["amount_currency"]
+                pl_initial_currency_balance += round(
+                    initial_balance["amount_currency"], 2
+                )
         return pl_initial_balance, pl_initial_currency_balance
 
-    # flake8: noqa: C901
     def _get_data(
         self,
         account_ids,
@@ -222,6 +222,15 @@ class TrialBalanceReport(models.AbstractModel):
         unaffected_earnings_account,
         fy_start_date,
     ):
+        accounts_domain = [("company_id", "=", company_id)]
+        if account_ids:
+            accounts_domain += [("id", "in", account_ids)]
+        accounts = self.env["account.account"].search(accounts_domain)
+        tb_initial_acc = []
+        for account in accounts:
+            tb_initial_acc.append(
+                {"account_id": account.id, "balance": 0.0, "amount_currency": 0.0}
+            )
         initial_domain_bs = self._get_initial_balances_bs_ml_domain(
             account_ids,
             journal_ids,
@@ -251,7 +260,18 @@ class TrialBalanceReport(models.AbstractModel):
             fields=["account_id", "balance", "amount_currency"],
             groupby=["account_id"],
         )
-        tb_initial_acc = tb_initial_acc_bs + tb_initial_acc_pl
+        tb_initial_acc_rg = tb_initial_acc_bs + tb_initial_acc_pl
+        for account_rg in tb_initial_acc_rg:
+            element = list(
+                filter(
+                    lambda acc_dict: acc_dict["account_id"]
+                    == account_rg["account_id"][0],
+                    tb_initial_acc,
+                )
+            )
+            if element:
+                element[0]["balance"] += account_rg["balance"]
+                element[0]["amount_currency"] += account_rg["amount_currency"]
         if hide_account_at_0:
             tb_initial_acc = [p for p in tb_initial_acc if p["balance"] != 0]
 
@@ -311,9 +331,11 @@ class TrialBalanceReport(models.AbstractModel):
             total_amount[acc_id]["ending_balance"] = tb["balance"]
             if foreign_currency:
                 total_amount[acc_id]["initial_currency_balance"] = 0.0
-                total_amount[acc_id]["ending_currency_balance"] = tb["amount_currency"]
+                total_amount[acc_id]["ending_currency_balance"] = round(
+                    tb["amount_currency"], 2
+                )
         for tb in tb_initial_acc:
-            acc_id = tb["account_id"][0]
+            acc_id = tb["account_id"]
             if acc_id not in total_amount.keys():
                 total_amount[acc_id] = {}
                 total_amount[acc_id]["credit"] = 0.0
@@ -322,22 +344,22 @@ class TrialBalanceReport(models.AbstractModel):
                 total_amount[acc_id]["initial_balance"] = tb["balance"]
                 total_amount[acc_id]["ending_balance"] = tb["balance"]
                 if foreign_currency:
-                    total_amount[acc_id]["initial_currency_balance"] = tb[
-                        "amount_currency"
-                    ]
-                    total_amount[acc_id]["ending_currency_balance"] = tb[
-                        "amount_currency"
-                    ]
+                    total_amount[acc_id]["initial_currency_balance"] = round(
+                        tb["amount_currency"], 2
+                    )
+                    total_amount[acc_id]["ending_currency_balance"] = round(
+                        tb["amount_currency"], 2
+                    )
             else:
                 total_amount[acc_id]["initial_balance"] = tb["balance"]
                 total_amount[acc_id]["ending_balance"] += tb["balance"]
                 if foreign_currency:
-                    total_amount[acc_id]["initial_currency_balance"] = tb[
-                        "amount_currency"
-                    ]
-                    total_amount[acc_id]["ending_currency_balance"] += tb[
-                        "amount_currency"
-                    ]
+                    total_amount[acc_id]["initial_currency_balance"] = round(
+                        tb["amount_currency"], 2
+                    )
+                    total_amount[acc_id]["ending_currency_balance"] += round(
+                        tb["amount_currency"], 2
+                    )
         if show_partner_details:
             partners_ids = set()
             partners_data = {}
@@ -357,9 +379,9 @@ class TrialBalanceReport(models.AbstractModel):
                     total_amount[acc_id][prt_id]["ending_balance"] = tb["balance"]
                     if foreign_currency:
                         total_amount[acc_id][prt_id]["initial_currency_balance"] = 0.0
-                        total_amount[acc_id][prt_id]["ending_currency_balance"] = tb[
-                            "amount_currency"
-                        ]
+                        total_amount[acc_id][prt_id]["ending_currency_balance"] = round(
+                            tb["amount_currency"], 2
+                        )
                         partners_ids.add(tb["partner_id"])
             for tb in tb_initial_prt:
                 acc_id = tb["account_id"][0]
@@ -379,10 +401,10 @@ class TrialBalanceReport(models.AbstractModel):
                         if foreign_currency:
                             total_amount[acc_id][prt_id][
                                 "initial_currency_balance"
-                            ] = tb["amount_currency"]
+                            ] = round(tb["amount_currency"], 2)
                             total_amount[acc_id][prt_id][
                                 "ending_currency_balance"
-                            ] = tb["amount_currency"]
+                            ] = round(tb["amount_currency"], 2)
                         partners_ids.add(tb["partner_id"])
                     elif prt_id not in total_amount[acc_id].keys():
                         total_amount[acc_id][prt_id] = {}
@@ -394,10 +416,10 @@ class TrialBalanceReport(models.AbstractModel):
                         if foreign_currency:
                             total_amount[acc_id][prt_id][
                                 "initial_currency_balance"
-                            ] = tb["amount_currency"]
+                            ] = round(tb["amount_currency"], 2)
                             total_amount[acc_id][prt_id][
                                 "ending_currency_balance"
-                            ] = tb["amount_currency"]
+                            ] = round(tb["amount_currency"], 2)
                         partners_ids.add(tb["partner_id"])
                     else:
                         total_amount[acc_id][prt_id]["initial_balance"] += tb["balance"]
@@ -405,10 +427,10 @@ class TrialBalanceReport(models.AbstractModel):
                         if foreign_currency:
                             total_amount[acc_id][prt_id][
                                 "initial_currency_balance"
-                            ] += tb["amount_currency"]
+                            ] += round(tb["amount_currency"], 2)
                             total_amount[acc_id][prt_id][
                                 "ending_currency_balance"
-                            ] += tb["amount_currency"]
+                            ] += round(tb["amount_currency"], 2)
         accounts_ids = list(total_amount.keys())
         unaffected_id = unaffected_earnings_account
         if unaffected_id not in accounts_ids:
diff --git a/account_financial_report/report/vat_report.py b/account_financial_report/report/vat_report.py
index 7789a917..26d69dd8 100644
--- a/account_financial_report/report/vat_report.py
+++ b/account_financial_report/report/vat_report.py
@@ -2,6 +2,8 @@
 # Copyright 2020 ForgeFlow S.L. (https://www.forgeflow.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
+import operator
+
 from odoo import api, models
 
 
@@ -19,6 +21,7 @@ class VATReport(models.AbstractModel):
                         "id": tax.id,
                         "name": tax.name,
                         "tax_group_id": tax.tax_group_id.id,
+                        "type_tax_use": tax.type_tax_use,
                     }
                 }
             )
@@ -49,26 +52,27 @@ class VATReport(models.AbstractModel):
             domain=domain, fields=ml_fields
         )
         vat_data = {}
-        tax_ids = set()
+        tax_ids = list(map(operator.itemgetter("tax_line_id"), tax_move_lines))
+        tax_ids = [i[0] for i in tax_ids]
+        tax_data = self._get_tax_data(tax_ids)
         for tax_move_line in tax_move_lines:
             tax_ml_id = tax_move_line["id"]
             repartition = self.env["account.tax.repartition.line"].browse(
                 tax_move_line["tax_repartition_line_id"][0]
             )
+            tax_id = tax_move_line["tax_line_id"][0]
             vat_data[tax_ml_id] = {}
             vat_data[tax_ml_id].update(
                 {
                     "id": tax_ml_id,
                     "net": tax_move_line["tax_base_amount"],
-                    "tax": tax_move_line["balance"]
-                    if tax_move_line["balance"] > 0
-                    else (-1) * tax_move_line["balance"],
+                    "tax": (-1) * tax_move_line["balance"]
+                    if tax_data[tax_id]["type_tax_use"] == "sale"
+                    else tax_move_line["balance"],
                     "tax_line_id": tax_move_line["tax_line_id"],
                     "tags_ids": repartition.tag_ids.ids,
                 }
             )
-            tax_ids.add(tax_move_line["tax_line_id"][0])
-        tax_data = self._get_tax_data(tax_ids)
         return vat_data, tax_data
 
     def _get_tax_group_data(self, tax_group_ids):
diff --git a/account_financial_report/wizard/aged_partner_balance_wizard.py b/account_financial_report/wizard/aged_partner_balance_wizard.py
index b1d67361..c609a820 100644
--- a/account_financial_report/wizard/aged_partner_balance_wizard.py
+++ b/account_financial_report/wizard/aged_partner_balance_wizard.py
@@ -20,6 +20,7 @@ class AgedPartnerBalanceWizard(models.TransientModel):
         string="Company",
     )
     date_at = fields.Date(required=True, default=fields.Date.context_today)
+    date_from = fields.Date(string="Date From")
     target_move = fields.Selection(
         [("posted", "All Posted Entries"), ("all", "All Entries")],
         string="Target Moves",
@@ -152,6 +153,7 @@ class AgedPartnerBalanceWizard(models.TransientModel):
         return {
             "wizard_id": self.id,
             "date_at": self.date_at,
+            "date_from": self.date_from or False,
             "only_posted_moves": self.target_move == "posted",
             "company_id": self.company_id.id,
             "account_ids": self.account_ids.ids,
diff --git a/account_financial_report/wizard/aged_partner_balance_wizard_view.xml b/account_financial_report/wizard/aged_partner_balance_wizard_view.xml
index 337b2114..ebef2daa 100644
--- a/account_financial_report/wizard/aged_partner_balance_wizard_view.xml
+++ b/account_financial_report/wizard/aged_partner_balance_wizard_view.xml
@@ -16,6 +16,7 @@
                 <group name="filters">
                     <group name="date_range">
                         <field name="date_at" />
+                        <field name="date_from" />
                     </group>
                     <group name="other_filters">
                         <field name="target_move" widget="radio" />
diff --git a/account_financial_report/wizard/general_ledger_wizard.py b/account_financial_report/wizard/general_ledger_wizard.py
index 20efdbeb..ab0963f0 100644
--- a/account_financial_report/wizard/general_ledger_wizard.py
+++ b/account_financial_report/wizard/general_ledger_wizard.py
@@ -85,6 +85,7 @@ class GeneralLedgerReportWizard(models.TransientModel):
         string="Account Code To",
         help="Ending account in a range",
     )
+    show_partner_details = fields.Boolean(string="Show Partner Details", default=True,)
 
     @api.onchange("account_code_from", "account_code_to")
     def on_change_account_range(self):
@@ -300,6 +301,7 @@ class GeneralLedgerReportWizard(models.TransientModel):
             "company_id": self.company_id.id,
             "account_ids": self.account_ids.ids,
             "partner_ids": self.partner_ids.ids,
+            "show_partner_details": self.show_partner_details,
             "cost_center_ids": self.cost_center_ids.ids,
             "analytic_tag_ids": self.analytic_tag_ids.ids,
             "journal_ids": self.account_journal_ids.ids,
diff --git a/account_financial_report/wizard/general_ledger_wizard_view.xml b/account_financial_report/wizard/general_ledger_wizard_view.xml
index d1b0b49d..a75ee728 100644
--- a/account_financial_report/wizard/general_ledger_wizard_view.xml
+++ b/account_financial_report/wizard/general_ledger_wizard_view.xml
@@ -26,6 +26,7 @@
                         <group name="other_filters">
                             <field name="target_move" widget="radio" />
                             <field name="centralize" />
+                            <field name="show_partner_details" />
                             <field name="hide_account_at_0" />
                             <field name="foreign_currency" />
                             <field name="show_analytic_tags" />

From d0ae3d660fe4a12b8da1f8d36b86c7e73b5f6f2b Mon Sep 17 00:00:00 2001
From: Joan Sisquella <joan.sisquella@forgeflow.com>
Date: Fri, 22 May 2020 17:01:17 +0200
Subject: [PATCH 05/10] [IMP] account_financial_report: Fix VAT Report and
 other improvements

---
 .../report/abstract_report_xlsx.py            |   8 +-
 .../report/aged_partner_balance.py            |   1 +
 .../report/general_ledger.py                  |   5 +-
 .../report/general_ledger_xlsx.py             |   2 +-
 .../report/trial_balance.py                   | 237 ++++++++++--------
 account_financial_report/report/vat_report.py | 148 ++++++-----
 .../tests/test_vat_report.py                  |  36 +--
 .../wizard/general_ledger_wizard.py           |   2 +-
 .../wizard/vat_report_wizard.py               |   7 +
 .../wizard/vat_report_wizard_view.xml         |   9 +-
 10 files changed, 260 insertions(+), 195 deletions(-)

diff --git a/account_financial_report/report/abstract_report_xlsx.py b/account_financial_report/report/abstract_report_xlsx.py
index 64fc5d15..984b659c 100644
--- a/account_financial_report/report/abstract_report_xlsx.py
+++ b/account_financial_report/report/abstract_report_xlsx.py
@@ -449,10 +449,10 @@ class AbstractReportXslx(models.AbstractModel):
     def _get_currency_amt_format(self, line_object):
         """ Return amount format specific for each currency. """
         if "account_group_id" in line_object and line_object["account_group_id"]:
-            format_amt = getattr(self, "format_amount_bold")
+            format_amt = self.format_amount_bold
             field_prefix = "format_amount_bold"
         else:
-            format_amt = getattr(self, "format_amount")
+            format_amt = self.format_amount
             field_prefix = "format_amount"
         if "currency_id" in line_object and line_object.get("currency_id", False):
             field_name = "{}_{}".format(field_prefix, line_object["currency_id"].name)
@@ -460,7 +460,7 @@ class AbstractReportXslx(models.AbstractModel):
                 format_amt = getattr(self, field_name)
             else:
                 format_amt = self.workbook.add_format()
-                setattr(self, "field_name", format_amt)
+                self.field_name = format_amt
                 format_amount = "#,##0." + (
                     "0" * line_object["currency_id"].decimal_places
                 )
@@ -473,7 +473,7 @@ class AbstractReportXslx(models.AbstractModel):
             format_amt = self.format_amount_bold
             field_prefix = "format_amount_bold"
         else:
-            format_amt = getattr(self, "format_amount")
+            format_amt = self.format_amount
             field_prefix = "format_amount"
         if line_dict.get("currency_id", False) and line_dict["currency_id"]:
             if isinstance(line_dict["currency_id"], int):
diff --git a/account_financial_report/report/aged_partner_balance.py b/account_financial_report/report/aged_partner_balance.py
index d24ef85b..0713259d 100644
--- a/account_financial_report/report/aged_partner_balance.py
+++ b/account_financial_report/report/aged_partner_balance.py
@@ -386,6 +386,7 @@ class AgedPartnerBalanceReport(models.AbstractModel):
                             )
                             self._compute_maturity_date(ml, date_at_oject)
                             move_lines.append(ml)
+                        move_lines = sorted(move_lines, key=lambda k: (k["date"]))
                         partner.update({"move_lines": move_lines})
                     account["partners"].append(partner)
             aged_partner_data.append(account)
diff --git a/account_financial_report/report/general_ledger.py b/account_financial_report/report/general_ledger.py
index 9ebaae34..74884af6 100644
--- a/account_financial_report/report/general_ledger.py
+++ b/account_financial_report/report/general_ledger.py
@@ -6,7 +6,7 @@ import calendar
 import datetime
 import operator
 
-from odoo import api, models
+from odoo import _, api, models
 
 
 class GeneralLedgerReport(models.AbstractModel):
@@ -556,7 +556,7 @@ class GeneralLedgerReport(models.AbstractModel):
             move_line["balance"] += last_cumul_balance
             last_cumul_balance = move_line["balance"]
             if move_line["rec_id"] in rec_after_date_to_ids:
-                move_line["rec_name"] = str("*") + move_line["rec_name"]
+                move_line["rec_name"] = "(" + _("future") + ") " + move_line["rec_name"]
         return move_lines
 
     @api.model
@@ -763,6 +763,7 @@ class GeneralLedgerReport(models.AbstractModel):
                     account["move_lines"] = self._recalculate_cumul_balance(
                         account["move_lines"],
                         gen_ld_data[account["id"]]["init_bal"]["balance"],
+                        rec_after_date_to_ids,
                     )
                     if account["partners"]:
                         account["partners"] = False
diff --git a/account_financial_report/report/general_ledger_xlsx.py b/account_financial_report/report/general_ledger_xlsx.py
index d4deffd6..6cc876b3 100644
--- a/account_financial_report/report/general_ledger_xlsx.py
+++ b/account_financial_report/report/general_ledger_xlsx.py
@@ -31,7 +31,7 @@ class GeneralLedgerXslx(models.AbstractModel):
             6: {"header": _("Ref - Label"), "field": "ref_label", "width": 40},
             7: {"header": _("Cost center"), "field": "cost_center", "width": 15},
             8: {"header": _("Tags"), "field": "tags", "width": 10},
-            9: {"header": _("Rec."), "field": "rec_name", "width": 5},
+            9: {"header": _("Rec."), "field": "rec_name", "width": 15},
             10: {
                 "header": _("Debit"),
                 "field": "debit",
diff --git a/account_financial_report/report/trial_balance.py b/account_financial_report/report/trial_balance.py
index f6bad477..147978e0 100644
--- a/account_financial_report/report/trial_balance.py
+++ b/account_financial_report/report/trial_balance.py
@@ -207,6 +207,128 @@ class TrialBalanceReport(models.AbstractModel):
                 )
         return pl_initial_balance, pl_initial_currency_balance
 
+    @api.model
+    def _compute_account_amount(
+        self, total_amount, tb_initial_acc, tb_period_acc, foreign_currency
+    ):
+        for tb in tb_period_acc:
+            acc_id = tb["account_id"][0]
+            total_amount[acc_id] = {}
+            total_amount[acc_id]["credit"] = tb["credit"]
+            total_amount[acc_id]["debit"] = tb["debit"]
+            total_amount[acc_id]["balance"] = tb["balance"]
+            total_amount[acc_id]["initial_balance"] = 0.0
+            total_amount[acc_id]["ending_balance"] = tb["balance"]
+            if foreign_currency:
+                total_amount[acc_id]["initial_currency_balance"] = 0.0
+                total_amount[acc_id]["ending_currency_balance"] = round(
+                    tb["amount_currency"], 2
+                )
+        for tb in tb_initial_acc:
+            acc_id = tb["account_id"]
+            if acc_id not in total_amount.keys():
+                total_amount[acc_id] = {}
+                total_amount[acc_id]["credit"] = 0.0
+                total_amount[acc_id]["debit"] = 0.0
+                total_amount[acc_id]["balance"] = 0.0
+                total_amount[acc_id]["initial_balance"] = tb["balance"]
+                total_amount[acc_id]["ending_balance"] = tb["balance"]
+                if foreign_currency:
+                    total_amount[acc_id]["initial_currency_balance"] = round(
+                        tb["amount_currency"], 2
+                    )
+                    total_amount[acc_id]["ending_currency_balance"] = round(
+                        tb["amount_currency"], 2
+                    )
+            else:
+                total_amount[acc_id]["initial_balance"] = tb["balance"]
+                total_amount[acc_id]["ending_balance"] += tb["balance"]
+                if foreign_currency:
+                    total_amount[acc_id]["initial_currency_balance"] = round(
+                        tb["amount_currency"], 2
+                    )
+                    total_amount[acc_id]["ending_currency_balance"] += round(
+                        tb["amount_currency"], 2
+                    )
+        return total_amount
+
+    @api.model
+    def _compute_partner_amount(
+        self, total_amount, tb_initial_prt, tb_period_prt, foreign_currency
+    ):
+        partners_ids = set()
+        partners_data = {}
+        for tb in tb_period_prt:
+            acc_id = tb["account_id"][0]
+            if tb["partner_id"]:
+                prt_id = tb["partner_id"][0]
+                if tb["partner_id"] not in partners_ids:
+                    partners_data.update(
+                        {prt_id: {"id": prt_id, "name": tb["partner_id"][1]}}
+                    )
+                total_amount[acc_id][prt_id] = {}
+                total_amount[acc_id][prt_id]["credit"] = tb["credit"]
+                total_amount[acc_id][prt_id]["debit"] = tb["debit"]
+                total_amount[acc_id][prt_id]["balance"] = tb["balance"]
+                total_amount[acc_id][prt_id]["initial_balance"] = 0.0
+                total_amount[acc_id][prt_id]["ending_balance"] = tb["balance"]
+                if foreign_currency:
+                    total_amount[acc_id][prt_id]["initial_currency_balance"] = 0.0
+                    total_amount[acc_id][prt_id]["ending_currency_balance"] = round(
+                        tb["amount_currency"], 2
+                    )
+                    partners_ids.add(tb["partner_id"])
+        for tb in tb_initial_prt:
+            acc_id = tb["account_id"][0]
+            if tb["partner_id"]:
+                prt_id = tb["partner_id"][0]
+                if tb["partner_id"] not in partners_ids:
+                    partners_data.update(
+                        {prt_id: {"id": prt_id, "name": tb["partner_id"][1]}}
+                    )
+                if acc_id not in total_amount.keys():
+                    total_amount[acc_id][prt_id] = {}
+                    total_amount[acc_id][prt_id]["credit"] = 0.0
+                    total_amount[acc_id][prt_id]["debit"] = 0.0
+                    total_amount[acc_id][prt_id]["balance"] = 0.0
+                    total_amount[acc_id][prt_id]["initial_balance"] = tb["balance"]
+                    total_amount[acc_id][prt_id]["ending_balance"] = tb["balance"]
+                    if foreign_currency:
+                        total_amount[acc_id][prt_id][
+                            "initial_currency_balance"
+                        ] = round(tb["amount_currency"], 2)
+                        total_amount[acc_id][prt_id]["ending_currency_balance"] = round(
+                            tb["amount_currency"], 2
+                        )
+                    partners_ids.add(tb["partner_id"])
+                elif prt_id not in total_amount[acc_id].keys():
+                    total_amount[acc_id][prt_id] = {}
+                    total_amount[acc_id][prt_id]["credit"] = 0.0
+                    total_amount[acc_id][prt_id]["debit"] = 0.0
+                    total_amount[acc_id][prt_id]["balance"] = 0.0
+                    total_amount[acc_id][prt_id]["initial_balance"] = tb["balance"]
+                    total_amount[acc_id][prt_id]["ending_balance"] = tb["balance"]
+                    if foreign_currency:
+                        total_amount[acc_id][prt_id][
+                            "initial_currency_balance"
+                        ] = round(tb["amount_currency"], 2)
+                        total_amount[acc_id][prt_id]["ending_currency_balance"] = round(
+                            tb["amount_currency"], 2
+                        )
+                    partners_ids.add(tb["partner_id"])
+                else:
+                    total_amount[acc_id][prt_id]["initial_balance"] += tb["balance"]
+                    total_amount[acc_id][prt_id]["ending_balance"] += tb["balance"]
+                    if foreign_currency:
+                        total_amount[acc_id][prt_id][
+                            "initial_currency_balance"
+                        ] += round(tb["amount_currency"], 2)
+                        total_amount[acc_id][prt_id][
+                            "ending_currency_balance"
+                        ] += round(tb["amount_currency"], 2)
+        return total_amount, partners_data
+
+    @api.model
     def _get_data(
         self,
         account_ids,
@@ -321,116 +443,13 @@ class TrialBalanceReport(models.AbstractModel):
             )
         total_amount = {}
         partners_data = []
-        for tb in tb_period_acc:
-            acc_id = tb["account_id"][0]
-            total_amount[acc_id] = {}
-            total_amount[acc_id]["credit"] = tb["credit"]
-            total_amount[acc_id]["debit"] = tb["debit"]
-            total_amount[acc_id]["balance"] = tb["balance"]
-            total_amount[acc_id]["initial_balance"] = 0.0
-            total_amount[acc_id]["ending_balance"] = tb["balance"]
-            if foreign_currency:
-                total_amount[acc_id]["initial_currency_balance"] = 0.0
-                total_amount[acc_id]["ending_currency_balance"] = round(
-                    tb["amount_currency"], 2
-                )
-        for tb in tb_initial_acc:
-            acc_id = tb["account_id"]
-            if acc_id not in total_amount.keys():
-                total_amount[acc_id] = {}
-                total_amount[acc_id]["credit"] = 0.0
-                total_amount[acc_id]["debit"] = 0.0
-                total_amount[acc_id]["balance"] = 0.0
-                total_amount[acc_id]["initial_balance"] = tb["balance"]
-                total_amount[acc_id]["ending_balance"] = tb["balance"]
-                if foreign_currency:
-                    total_amount[acc_id]["initial_currency_balance"] = round(
-                        tb["amount_currency"], 2
-                    )
-                    total_amount[acc_id]["ending_currency_balance"] = round(
-                        tb["amount_currency"], 2
-                    )
-            else:
-                total_amount[acc_id]["initial_balance"] = tb["balance"]
-                total_amount[acc_id]["ending_balance"] += tb["balance"]
-                if foreign_currency:
-                    total_amount[acc_id]["initial_currency_balance"] = round(
-                        tb["amount_currency"], 2
-                    )
-                    total_amount[acc_id]["ending_currency_balance"] += round(
-                        tb["amount_currency"], 2
-                    )
+        total_amount = self._compute_account_amount(
+            total_amount, tb_initial_acc, tb_period_acc, foreign_currency
+        )
         if show_partner_details:
-            partners_ids = set()
-            partners_data = {}
-            for tb in tb_period_prt:
-                acc_id = tb["account_id"][0]
-                if tb["partner_id"]:
-                    prt_id = tb["partner_id"][0]
-                    if tb["partner_id"] not in partners_ids:
-                        partners_data.update(
-                            {prt_id: {"id": prt_id, "name": tb["partner_id"][1]}}
-                        )
-                    total_amount[acc_id][prt_id] = {}
-                    total_amount[acc_id][prt_id]["credit"] = tb["credit"]
-                    total_amount[acc_id][prt_id]["debit"] = tb["debit"]
-                    total_amount[acc_id][prt_id]["balance"] = tb["balance"]
-                    total_amount[acc_id][prt_id]["initial_balance"] = 0.0
-                    total_amount[acc_id][prt_id]["ending_balance"] = tb["balance"]
-                    if foreign_currency:
-                        total_amount[acc_id][prt_id]["initial_currency_balance"] = 0.0
-                        total_amount[acc_id][prt_id]["ending_currency_balance"] = round(
-                            tb["amount_currency"], 2
-                        )
-                        partners_ids.add(tb["partner_id"])
-            for tb in tb_initial_prt:
-                acc_id = tb["account_id"][0]
-                if tb["partner_id"]:
-                    prt_id = tb["partner_id"][0]
-                    if tb["partner_id"] not in partners_ids:
-                        partners_data.update(
-                            {prt_id: {"id": prt_id, "name": tb["partner_id"][1]}}
-                        )
-                    if acc_id not in total_amount.keys():
-                        total_amount[acc_id][prt_id] = {}
-                        total_amount[acc_id][prt_id]["credit"] = 0.0
-                        total_amount[acc_id][prt_id]["debit"] = 0.0
-                        total_amount[acc_id][prt_id]["balance"] = 0.0
-                        total_amount[acc_id][prt_id]["initial_balance"] = tb["balance"]
-                        total_amount[acc_id][prt_id]["ending_balance"] = tb["balance"]
-                        if foreign_currency:
-                            total_amount[acc_id][prt_id][
-                                "initial_currency_balance"
-                            ] = round(tb["amount_currency"], 2)
-                            total_amount[acc_id][prt_id][
-                                "ending_currency_balance"
-                            ] = round(tb["amount_currency"], 2)
-                        partners_ids.add(tb["partner_id"])
-                    elif prt_id not in total_amount[acc_id].keys():
-                        total_amount[acc_id][prt_id] = {}
-                        total_amount[acc_id][prt_id]["credit"] = 0.0
-                        total_amount[acc_id][prt_id]["debit"] = 0.0
-                        total_amount[acc_id][prt_id]["balance"] = 0.0
-                        total_amount[acc_id][prt_id]["initial_balance"] = tb["balance"]
-                        total_amount[acc_id][prt_id]["ending_balance"] = tb["balance"]
-                        if foreign_currency:
-                            total_amount[acc_id][prt_id][
-                                "initial_currency_balance"
-                            ] = round(tb["amount_currency"], 2)
-                            total_amount[acc_id][prt_id][
-                                "ending_currency_balance"
-                            ] = round(tb["amount_currency"], 2)
-                        partners_ids.add(tb["partner_id"])
-                    else:
-                        total_amount[acc_id][prt_id]["initial_balance"] += tb["balance"]
-                        total_amount[acc_id][prt_id]["ending_balance"] += tb["balance"]
-                        if foreign_currency:
-                            total_amount[acc_id][prt_id][
-                                "initial_currency_balance"
-                            ] += round(tb["amount_currency"], 2)
-                            total_amount[acc_id][prt_id][
-                                "ending_currency_balance"
-                            ] += round(tb["amount_currency"], 2)
+            total_amount, partners_data = self._compute_partner_amount(
+                total_amount, tb_initial_prt, tb_period_prt, foreign_currency
+            )
         accounts_ids = list(total_amount.keys())
         unaffected_id = unaffected_earnings_account
         if unaffected_id not in accounts_ids:
diff --git a/account_financial_report/report/vat_report.py b/account_financial_report/report/vat_report.py
index 26d69dd8..9db78b78 100644
--- a/account_financial_report/report/vat_report.py
+++ b/account_financial_report/report/vat_report.py
@@ -22,57 +22,82 @@ class VATReport(models.AbstractModel):
                         "name": tax.name,
                         "tax_group_id": tax.tax_group_id.id,
                         "type_tax_use": tax.type_tax_use,
+                        "amount_type": tax.amount_type,
+                        "tags_ids": tax.invoice_repartition_line_ids.tag_ids.ids,
                     }
                 }
             )
         return tax_data
 
     @api.model
-    def _get_vat_report_domain(self, company_id, date_from, date_to):
+    def _get_tax_report_domain(self, company_id, date_from, date_to, only_posted_moves):
         domain = [
             ("company_id", "=", company_id),
             ("date", ">=", date_from),
-            ("date", "<", date_to),
+            ("date", "<=", date_to),
             ("tax_line_id", "!=", False),
             ("tax_exigible", "=", True),
         ]
+        if only_posted_moves:
+            domain += [("move_id.state", "=", "posted")]
         return domain
 
-    def _get_vat_report_data(self, company_id, date_from, date_to):
-        domain = self._get_vat_report_domain(company_id, date_from, date_to)
+    @api.model
+    def _get_net_report_domain(self, company_id, date_from, date_to, only_posted_moves):
+        domain = [
+            ("company_id", "=", company_id),
+            ("date", ">=", date_from),
+            ("date", "<=", date_to),
+            ("tax_ids", "!=", False),
+            ("tax_exigible", "=", True),
+        ]
+        if only_posted_moves:
+            domain += [("move_id.state", "=", "posted")]
+        return domain
+
+    def _get_vat_report_data(self, company_id, date_from, date_to, only_posted_moves):
+        tax_domain = self._get_tax_report_domain(
+            company_id, date_from, date_to, only_posted_moves
+        )
         ml_fields = [
             "id",
             "tax_base_amount",
             "balance",
             "tax_line_id",
-            "tax_repartition_line_id",
+            "tax_ids",
             "analytic_tag_ids",
+            "tag_ids",
         ]
         tax_move_lines = self.env["account.move.line"].search_read(
-            domain=domain, fields=ml_fields
+            domain=tax_domain, fields=ml_fields,
         )
-        vat_data = {}
-        tax_ids = list(map(operator.itemgetter("tax_line_id"), tax_move_lines))
-        tax_ids = [i[0] for i in tax_ids]
-        tax_data = self._get_tax_data(tax_ids)
+        net_domain = self._get_net_report_domain(
+            company_id, date_from, date_to, only_posted_moves
+        )
+        taxed_move_lines = self.env["account.move.line"].search_read(
+            domain=net_domain, fields=ml_fields,
+        )
+        vat_data = []
         for tax_move_line in tax_move_lines:
-            tax_ml_id = tax_move_line["id"]
-            repartition = self.env["account.tax.repartition.line"].browse(
-                tax_move_line["tax_repartition_line_id"][0]
-            )
-            tax_id = tax_move_line["tax_line_id"][0]
-            vat_data[tax_ml_id] = {}
-            vat_data[tax_ml_id].update(
+            vat_data.append(
                 {
-                    "id": tax_ml_id,
-                    "net": tax_move_line["tax_base_amount"],
-                    "tax": (-1) * tax_move_line["balance"]
-                    if tax_data[tax_id]["type_tax_use"] == "sale"
-                    else tax_move_line["balance"],
-                    "tax_line_id": tax_move_line["tax_line_id"],
-                    "tags_ids": repartition.tag_ids.ids,
+                    "net": 0.0,
+                    "tax": tax_move_line["balance"],
+                    "tax_line_id": tax_move_line["tax_line_id"][0],
                 }
             )
+        for taxed_move_line in taxed_move_lines:
+            for tax_id in taxed_move_line["tax_ids"]:
+                vat_data.append(
+                    {
+                        "net": taxed_move_line["balance"],
+                        "tax": 0.0,
+                        "tax_line_id": tax_id,
+                    }
+                )
+        tax_ids = list(map(operator.itemgetter("tax_line_id"), vat_data))
+        tax_ids = list(set(tax_ids))
+        tax_data = self._get_tax_data(tax_ids)
         return vat_data, tax_data
 
     def _get_tax_group_data(self, tax_group_ids):
@@ -92,23 +117,28 @@ class VATReport(models.AbstractModel):
 
     def _get_vat_report_group_data(self, vat_report_data, tax_data, tax_detail):
         vat_report = {}
-        for tax_move_line in vat_report_data.values():
-            tax_id = tax_move_line["tax_line_id"][0]
-            tax_group_id = tax_data[tax_id]["tax_group_id"]
-            if tax_group_id not in vat_report.keys():
-                vat_report[tax_group_id] = {}
-                vat_report[tax_group_id]["net"] = 0.0
-                vat_report[tax_group_id]["tax"] = 0.0
-                vat_report[tax_group_id][tax_id] = dict(tax_data[tax_id])
-                vat_report[tax_group_id][tax_id].update({"net": 0.0, "tax": 0.0})
+        for tax_move_line in vat_report_data:
+            tax_id = tax_move_line["tax_line_id"]
+            if tax_data[tax_id]["amount_type"] == "group":
+                pass
             else:
-                if tax_id not in vat_report[tax_group_id].keys():
+                tax_group_id = tax_data[tax_id]["tax_group_id"]
+                if tax_group_id not in vat_report.keys():
+                    vat_report[tax_group_id] = {}
+                    vat_report[tax_group_id]["net"] = 0.0
+                    vat_report[tax_group_id]["tax"] = 0.0
                     vat_report[tax_group_id][tax_id] = dict(tax_data[tax_id])
                     vat_report[tax_group_id][tax_id].update({"net": 0.0, "tax": 0.0})
-            vat_report[tax_group_id]["net"] += tax_move_line["net"]
-            vat_report[tax_group_id]["tax"] += tax_move_line["tax"]
-            vat_report[tax_group_id][tax_id]["net"] += tax_move_line["net"]
-            vat_report[tax_group_id][tax_id]["tax"] += tax_move_line["tax"]
+                else:
+                    if tax_id not in vat_report[tax_group_id].keys():
+                        vat_report[tax_group_id][tax_id] = dict(tax_data[tax_id])
+                        vat_report[tax_group_id][tax_id].update(
+                            {"net": 0.0, "tax": 0.0}
+                        )
+                vat_report[tax_group_id]["net"] += tax_move_line["net"]
+                vat_report[tax_group_id]["tax"] += tax_move_line["tax"]
+                vat_report[tax_group_id][tax_id]["net"] += tax_move_line["net"]
+                vat_report[tax_group_id][tax_id]["tax"] += tax_move_line["tax"]
         tax_group_data = self._get_tax_group_data(vat_report.keys())
         vat_report_list = []
         for tax_group_id in vat_report.keys():
@@ -133,25 +163,30 @@ class VATReport(models.AbstractModel):
 
     def _get_vat_report_tag_data(self, vat_report_data, tax_data, tax_detail):
         vat_report = {}
-        for tax_move_line in vat_report_data.values():
-            tax_id = tax_move_line["tax_line_id"][0]
-            tags_ids = tax_move_line["tags_ids"]
-            if tags_ids:
-                for tag_id in tags_ids:
-                    if tag_id not in vat_report.keys():
-                        vat_report[tag_id] = {}
-                        vat_report[tag_id]["net"] = 0.0
-                        vat_report[tag_id]["tax"] = 0.0
-                        vat_report[tag_id][tax_id] = dict(tax_data[tax_id])
-                        vat_report[tag_id][tax_id].update({"net": 0.0, "tax": 0.0})
-                    else:
-                        if tax_id not in vat_report[tag_id].keys():
+        for tax_move_line in vat_report_data:
+            tax_id = tax_move_line["tax_line_id"]
+            tags_ids = tax_data[tax_id]["tags_ids"]
+            if tax_data[tax_id]["amount_type"] == "group":
+                continue
+            else:
+                if tags_ids:
+                    for tag_id in tags_ids:
+                        if tag_id not in vat_report.keys():
+                            vat_report[tag_id] = {}
+                            vat_report[tag_id]["net"] = 0.0
+                            vat_report[tag_id]["tax"] = 0.0
                             vat_report[tag_id][tax_id] = dict(tax_data[tax_id])
                             vat_report[tag_id][tax_id].update({"net": 0.0, "tax": 0.0})
-                    vat_report[tag_id][tax_id]["net"] += tax_move_line["net"]
-                    vat_report[tag_id][tax_id]["tax"] += tax_move_line["tax"]
-                    vat_report[tag_id]["net"] += tax_move_line["net"]
-                    vat_report[tag_id]["tax"] += tax_move_line["tax"]
+                        else:
+                            if tax_id not in vat_report[tag_id].keys():
+                                vat_report[tag_id][tax_id] = dict(tax_data[tax_id])
+                                vat_report[tag_id][tax_id].update(
+                                    {"net": 0.0, "tax": 0.0}
+                                )
+                        vat_report[tag_id][tax_id]["net"] += tax_move_line["net"]
+                        vat_report[tag_id][tax_id]["tax"] += tax_move_line["tax"]
+                        vat_report[tag_id]["net"] += tax_move_line["net"]
+                        vat_report[tag_id]["tax"] += tax_move_line["tax"]
         tags_data = self._get_tags_data(vat_report.keys())
         vat_report_list = []
         for tag_id in vat_report.keys():
@@ -173,8 +208,9 @@ class VATReport(models.AbstractModel):
         date_to = data["date_to"]
         based_on = data["based_on"]
         tax_detail = data["tax_detail"]
+        only_posted_moves = data["only_posted_moves"]
         vat_report_data, tax_data = self._get_vat_report_data(
-            company_id, date_from, date_to
+            company_id, date_from, date_to, only_posted_moves
         )
         if based_on == "taxgroups":
             vat_report = self._get_vat_report_group_data(
diff --git a/account_financial_report/tests/test_vat_report.py b/account_financial_report/tests/test_vat_report.py
index 7ee15f9c..4dd8980d 100644
--- a/account_financial_report/tests/test_vat_report.py
+++ b/account_financial_report/tests/test_vat_report.py
@@ -267,16 +267,16 @@ class TestVATReport(common.TransactionCase):
         tax_10_net, tax_10_tax = self._get_tax_line(self.tax_10.name, vat_report)
         tax_20_net, tax_20_tax = self._get_tax_line(self.tax_20.name, vat_report)
 
-        self.assertEqual(tag_01_net, 100)
-        self.assertEqual(tag_01_tax, 10)
-        self.assertEqual(tag_02_net, 350)
-        self.assertEqual(tag_02_tax, 60)
-        self.assertEqual(tag_03_net, 250)
-        self.assertEqual(tag_03_tax, 50)
-        self.assertEqual(tax_10_net, 100)
-        self.assertEqual(tax_10_tax, 10)
-        self.assertEqual(tax_20_net, 250)
-        self.assertEqual(tax_20_tax, 50)
+        self.assertEqual(tag_01_net, -100)
+        self.assertEqual(tag_01_tax, -10)
+        self.assertEqual(tag_02_net, -350)
+        self.assertEqual(tag_02_tax, -60)
+        self.assertEqual(tag_03_net, -250)
+        self.assertEqual(tag_03_tax, -50)
+        self.assertEqual(tax_10_net, -100)
+        self.assertEqual(tax_10_tax, -10)
+        self.assertEqual(tax_20_net, -250)
+        self.assertEqual(tax_20_tax, -50)
 
         # Check report based on taxgroups
         res_data = self._get_report_lines(taxgroups=True)
@@ -304,14 +304,14 @@ class TestVATReport(common.TransactionCase):
         tax_10_net, tax_10_tax = self._get_tax_line(self.tax_10.name, vat_report)
         tax_20_net, tax_20_tax = self._get_tax_line(self.tax_20.name, vat_report)
 
-        self.assertEqual(group_10_net, 100)
-        self.assertEqual(group_10_tax, 10)
-        self.assertEqual(group_20_net, 250)
-        self.assertEqual(group_20_tax, 50)
-        self.assertEqual(tax_10_net, 100)
-        self.assertEqual(tax_10_tax, 10)
-        self.assertEqual(tax_20_net, 250)
-        self.assertEqual(tax_20_tax, 50)
+        self.assertEqual(group_10_net, -100)
+        self.assertEqual(group_10_tax, -10)
+        self.assertEqual(group_20_net, -250)
+        self.assertEqual(group_20_tax, -50)
+        self.assertEqual(tax_10_net, -100)
+        self.assertEqual(tax_10_tax, -10)
+        self.assertEqual(tax_20_net, -250)
+        self.assertEqual(tax_20_tax, -50)
 
     def test_wizard_date_range(self):
         vat_wizard = self.env["vat.report.wizard"]
diff --git a/account_financial_report/wizard/general_ledger_wizard.py b/account_financial_report/wizard/general_ledger_wizard.py
index ab0963f0..cd254b4d 100644
--- a/account_financial_report/wizard/general_ledger_wizard.py
+++ b/account_financial_report/wizard/general_ledger_wizard.py
@@ -47,7 +47,7 @@ class GeneralLedgerReportWizard(models.TransientModel):
         "If partners are filtered, "
         "debits and credits totals will not match the trial balance.",
     )
-    show_analytic_tags = fields.Boolean(string="Show analytic tags")
+    show_analytic_tags = fields.Boolean(string="Show analytic tags",)
     receivable_accounts_only = fields.Boolean()
     payable_accounts_only = fields.Boolean()
     partner_ids = fields.Many2many(
diff --git a/account_financial_report/wizard/vat_report_wizard.py b/account_financial_report/wizard/vat_report_wizard.py
index 49bec66c..0b2771d2 100644
--- a/account_financial_report/wizard/vat_report_wizard.py
+++ b/account_financial_report/wizard/vat_report_wizard.py
@@ -25,6 +25,12 @@ class VATReportWizard(models.TransientModel):
         default="taxtags",
     )
     tax_detail = fields.Boolean("Detail Taxes")
+    target_move = fields.Selection(
+        [("posted", "All Posted Entries"), ("all", "All Entries")],
+        string="Target Moves",
+        required=True,
+        default="posted",
+    )
 
     @api.onchange("company_id")
     def onchange_company_id(self):
@@ -105,6 +111,7 @@ class VATReportWizard(models.TransientModel):
             "date_from": self.date_from,
             "date_to": self.date_to,
             "based_on": self.based_on,
+            "only_posted_moves": self.target_move == "posted",
             "tax_detail": self.tax_detail,
         }
 
diff --git a/account_financial_report/wizard/vat_report_wizard_view.xml b/account_financial_report/wizard/vat_report_wizard_view.xml
index ed82894c..7421a4dc 100644
--- a/account_financial_report/wizard/vat_report_wizard_view.xml
+++ b/account_financial_report/wizard/vat_report_wizard_view.xml
@@ -18,10 +18,11 @@
                         <field name="date_from" />
                         <field name="date_to" />
                     </group>
-                    <group name="other_filters">
-                        <field name="based_on" widget="radio" />
-                        <field name="tax_detail" />
-                    </group>
+                </group>
+                <group name="other_filters">
+                    <field name="target_move" widget="radio" />
+                    <field name="based_on" widget="radio" />
+                    <field name="tax_detail" />
                 </group>
                 <footer>
                     <button

From 3268f74ccab19f822c112f4634e501e93062f64a Mon Sep 17 00:00:00 2001
From: Joan Sisquella <joan.sisquella@forgeflow.com>
Date: Thu, 11 Jun 2020 09:32:30 +0200
Subject: [PATCH 06/10] [IMP] account_financial_report: * filter by
 analytic_account

---
 .../report/general_ledger.py                  |  9 ++++
 .../report/general_ledger_xlsx.py             | 52 +++++++++++--------
 .../report/templates/general_ledger.xml       |  6 +--
 .../wizard/general_ledger_wizard.py           |  3 ++
 .../wizard/general_ledger_wizard_view.xml     |  1 +
 5 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/account_financial_report/report/general_ledger.py b/account_financial_report/report/general_ledger.py
index 74884af6..6fdd979d 100644
--- a/account_financial_report/report/general_ledger.py
+++ b/account_financial_report/report/general_ledger.py
@@ -324,6 +324,12 @@ class GeneralLedgerReport(models.AbstractModel):
             else "",
             "tag_ids": move_line["analytic_tag_ids"],
             "currency_id": move_line["currency_id"],
+            "analytic_account": move_line["analytic_account_id"][1]
+            if move_line["analytic_account_id"]
+            else "",
+            "analytic_account_id": move_line["analytic_account_id"][0]
+            if move_line["analytic_account_id"]
+            else False,
         }
         if (
             move_line_data["ref"] == move_line_data["name"]
@@ -464,6 +470,7 @@ class GeneralLedgerReport(models.AbstractModel):
             "amount_currency",
             "ref",
             "name",
+            "analytic_account_id",
         ]
         move_lines = self.env["account.move.line"].search_read(
             domain=domain, fields=ml_fields
@@ -662,6 +669,7 @@ class GeneralLedgerReport(models.AbstractModel):
                     "id": False,
                     "tag_ids": False,
                     "currency_id": False,
+                    "analytic_account_id": False,
                 }
             )
         centralized_ml[jnl_id][month]["debit"] += move_line["debit"]
@@ -782,6 +790,7 @@ class GeneralLedgerReport(models.AbstractModel):
             "only_posted_moves": data["only_posted_moves"],
             "hide_account_at_0": data["hide_account_at_0"],
             "show_analytic_tags": data["show_analytic_tags"],
+            "show_cost_center": data["show_cost_center"],
             "general_ledger": general_ledger,
             "accounts_data": accounts_data,
             "partners_data": partners_data,
diff --git a/account_financial_report/report/general_ledger_xlsx.py b/account_financial_report/report/general_ledger_xlsx.py
index 6cc876b3..ca9ae8db 100644
--- a/account_financial_report/report/general_ledger_xlsx.py
+++ b/account_financial_report/report/general_ledger_xlsx.py
@@ -21,18 +21,26 @@ class GeneralLedgerXslx(models.AbstractModel):
         return report_name
 
     def _get_report_columns(self, report):
-        res = {
-            0: {"header": _("Date"), "field": "date", "width": 11},
-            1: {"header": _("Entry"), "field": "entry", "width": 18},
-            2: {"header": _("Journal"), "field": "journal", "width": 8},
-            3: {"header": _("Account"), "field": "account", "width": 9},
-            4: {"header": _("Taxes"), "field": "taxes_description", "width": 15},
-            5: {"header": _("Partner"), "field": "partner_name", "width": 25},
-            6: {"header": _("Ref - Label"), "field": "ref_label", "width": 40},
-            7: {"header": _("Cost center"), "field": "cost_center", "width": 15},
-            8: {"header": _("Tags"), "field": "tags", "width": 10},
-            9: {"header": _("Rec."), "field": "rec_name", "width": 15},
-            10: {
+        res = [
+            {"header": _("Date"), "field": "date", "width": 11},
+            {"header": _("Entry"), "field": "entry", "width": 18},
+            {"header": _("Journal"), "field": "journal", "width": 8},
+            {"header": _("Account"), "field": "account", "width": 9},
+            {"header": _("Taxes"), "field": "taxes_description", "width": 15},
+            {"header": _("Partner"), "field": "partner_name", "width": 25},
+            {"header": _("Ref - Label"), "field": "ref_label", "width": 40},
+        ]
+        if report.show_cost_center:
+            res += [
+                {"header": _("Cost center"), "field": "analytic_account", "width": 15},
+            ]
+        if report.show_analytic_tags:
+            res += [
+                {"header": _("Tags"), "field": "tags", "width": 10},
+            ]
+        res += [
+            {"header": _("Rec."), "field": "rec_name", "width": 15},
+            {
                 "header": _("Debit"),
                 "field": "debit",
                 "field_initial_balance": "initial_debit",
@@ -40,7 +48,7 @@ class GeneralLedgerXslx(models.AbstractModel):
                 "type": "amount",
                 "width": 14,
             },
-            11: {
+            {
                 "header": _("Credit"),
                 "field": "credit",
                 "field_initial_balance": "initial_credit",
@@ -48,7 +56,7 @@ class GeneralLedgerXslx(models.AbstractModel):
                 "type": "amount",
                 "width": 14,
             },
-            12: {
+            {
                 "header": _("Cumul. Bal."),
                 "field": "balance",
                 "field_initial_balance": "initial_balance",
@@ -56,17 +64,17 @@ class GeneralLedgerXslx(models.AbstractModel):
                 "type": "amount",
                 "width": 14,
             },
-        }
+        ]
         if report.foreign_currency:
-            foreign_currency = {
-                13: {
+            res += [
+                {
                     "header": _("Cur."),
                     "field": "currency_name",
                     "field_currency_balance": "currency_name",
                     "type": "currency_name",
                     "width": 7,
                 },
-                14: {
+                {
                     "header": _("Amount cur."),
                     "field": "bal_curr",
                     "field_initial_balance": "initial_bal_curr",
@@ -74,9 +82,11 @@ class GeneralLedgerXslx(models.AbstractModel):
                     "type": "amount_currency",
                     "width": 14,
                 },
-            }
-            res = {**res, **foreign_currency}
-        return res
+            ]
+        res_as_dict = {}
+        for i, column in enumerate(res):
+            res_as_dict[i] = column
+        return res_as_dict
 
     def _get_report_filters(self, report):
         return [
diff --git a/account_financial_report/report/templates/general_ledger.xml b/account_financial_report/report/templates/general_ledger.xml
index bd85cfd2..c7b6d92e 100644
--- a/account_financial_report/report/templates/general_ledger.xml
+++ b/account_financial_report/report/templates/general_ledger.xml
@@ -550,14 +550,14 @@
                     <t t-if="show_cost_center">
                         <div class="act_as_cell left">
                             <t t-set="res_model" t-value="'account.analytic.account'" />
-                            <span t-if="line.cost_center">
+                            <span t-if="line['analytic_account_id']">
                                 <a
-                                    t-att-data-active-id="line.move_line_id.analytic_account_id.id"
+                                    t-att-data-active-id="line['analytic_account_id']"
                                     t-att-data-res-model="res_model"
                                     class="o_account_financial_reports_web_action"
                                     style="color: black;"
                                 >
-                                    <t t-raw="line.cost_center" />
+                                    <t t-raw="line['analytic_account']" />
                                 </a>
                             </span>
                         </div>
diff --git a/account_financial_report/wizard/general_ledger_wizard.py b/account_financial_report/wizard/general_ledger_wizard.py
index cd254b4d..f2d8aada 100644
--- a/account_financial_report/wizard/general_ledger_wizard.py
+++ b/account_financial_report/wizard/general_ledger_wizard.py
@@ -87,6 +87,8 @@ class GeneralLedgerReportWizard(models.TransientModel):
     )
     show_partner_details = fields.Boolean(string="Show Partner Details", default=True,)
 
+    show_cost_center = fields.Boolean(string="Show Cost Center", default=True,)
+
     @api.onchange("account_code_from", "account_code_to")
     def on_change_account_range(self):
         if (
@@ -303,6 +305,7 @@ class GeneralLedgerReportWizard(models.TransientModel):
             "partner_ids": self.partner_ids.ids,
             "show_partner_details": self.show_partner_details,
             "cost_center_ids": self.cost_center_ids.ids,
+            "show_cost_center": self.show_cost_center,
             "analytic_tag_ids": self.analytic_tag_ids.ids,
             "journal_ids": self.account_journal_ids.ids,
             "centralize": self.centralize,
diff --git a/account_financial_report/wizard/general_ledger_wizard_view.xml b/account_financial_report/wizard/general_ledger_wizard_view.xml
index a75ee728..c16a4709 100644
--- a/account_financial_report/wizard/general_ledger_wizard_view.xml
+++ b/account_financial_report/wizard/general_ledger_wizard_view.xml
@@ -30,6 +30,7 @@
                             <field name="hide_account_at_0" />
                             <field name="foreign_currency" />
                             <field name="show_analytic_tags" />
+                            <field name="show_cost_center" />
                         </group>
                     </group>
                     <notebook>

From 6ee8d72ea3dae6ad16985cd74586d1b7036d6443 Mon Sep 17 00:00:00 2001
From: Jordi Ballester Alomar <jordi.ballester@eficent.com>
Date: Fri, 12 Jun 2020 16:17:08 +0200
Subject: [PATCH 07/10] [IMP] account_financial_report: * fix speed issue in
 VAT report * rename Cost Center to Analytic Account in General Ledger

---
 account_financial_report/report/general_ledger_xlsx.py      | 6 +++++-
 .../report/templates/general_ledger.xml                     | 6 ++++--
 account_financial_report/report/vat_report.py               | 2 +-
 account_financial_report/wizard/general_ledger_wizard.py    | 3 +--
 .../wizard/general_ledger_wizard_view.xml                   | 4 ++--
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/account_financial_report/report/general_ledger_xlsx.py b/account_financial_report/report/general_ledger_xlsx.py
index ca9ae8db..79b848f1 100644
--- a/account_financial_report/report/general_ledger_xlsx.py
+++ b/account_financial_report/report/general_ledger_xlsx.py
@@ -32,7 +32,11 @@ class GeneralLedgerXslx(models.AbstractModel):
         ]
         if report.show_cost_center:
             res += [
-                {"header": _("Cost center"), "field": "analytic_account", "width": 15},
+                {
+                    "header": _("Analytic Account"),
+                    "field": "analytic_account",
+                    "width": 20,
+                },
             ]
         if report.show_analytic_tags:
             res += [
diff --git a/account_financial_report/report/templates/general_ledger.xml b/account_financial_report/report/templates/general_ledger.xml
index c7b6d92e..5498839e 100644
--- a/account_financial_report/report/templates/general_ledger.xml
+++ b/account_financial_report/report/templates/general_ledger.xml
@@ -160,8 +160,10 @@
                         Label</div>
                     <t t-if="show_cost_center">
                         <!--## cost_center-->
-                        <div class="act_as_cell" style="width: 8.03%;">Cost
-                            center</div>
+                        <div
+                            class="act_as_cell"
+                            style="width: 8.03%;"
+                        >Analytic Account</div>
                     </t>
                     <t t-if="show_analytic_tags">
                         <!--## analytic tags-->
diff --git a/account_financial_report/report/vat_report.py b/account_financial_report/report/vat_report.py
index 9db78b78..ad6f5aa3 100644
--- a/account_financial_report/report/vat_report.py
+++ b/account_financial_report/report/vat_report.py
@@ -48,7 +48,6 @@ class VATReport(models.AbstractModel):
             ("company_id", "=", company_id),
             ("date", ">=", date_from),
             ("date", "<=", date_to),
-            ("tax_ids", "!=", False),
             ("tax_exigible", "=", True),
         ]
         if only_posted_moves:
@@ -77,6 +76,7 @@ class VATReport(models.AbstractModel):
         taxed_move_lines = self.env["account.move.line"].search_read(
             domain=net_domain, fields=ml_fields,
         )
+        taxed_move_lines = list(filter(lambda d: d["tax_ids"], taxed_move_lines))
         vat_data = []
         for tax_move_line in tax_move_lines:
             vat_data.append(
diff --git a/account_financial_report/wizard/general_ledger_wizard.py b/account_financial_report/wizard/general_ledger_wizard.py
index f2d8aada..77382e63 100644
--- a/account_financial_report/wizard/general_ledger_wizard.py
+++ b/account_financial_report/wizard/general_ledger_wizard.py
@@ -86,8 +86,7 @@ class GeneralLedgerReportWizard(models.TransientModel):
         help="Ending account in a range",
     )
     show_partner_details = fields.Boolean(string="Show Partner Details", default=True,)
-
-    show_cost_center = fields.Boolean(string="Show Cost Center", default=True,)
+    show_cost_center = fields.Boolean(string="Show Analytic Account", default=True,)
 
     @api.onchange("account_code_from", "account_code_to")
     def on_change_account_range(self):
diff --git a/account_financial_report/wizard/general_ledger_wizard_view.xml b/account_financial_report/wizard/general_ledger_wizard_view.xml
index c16a4709..44453051 100644
--- a/account_financial_report/wizard/general_ledger_wizard_view.xml
+++ b/account_financial_report/wizard/general_ledger_wizard_view.xml
@@ -75,14 +75,14 @@
                             />
                         </page>
                         <page
-                            string="Filter cost centers"
+                            string="Filter analytic accounts"
                             groups="analytic.group_analytic_accounting"
                         >
                             <field
                                 name="cost_center_ids"
                                 nolabel="1"
+                                widget="many2many_tags"
                                 options="{'no_create': True}"
-                                groups="analytic.group_analytic_accounting"
                             />
                         </page>
                         <page string="Filter analytic tags">

From 85c257aac097d2834e56e503ae5be3d077c88fd3 Mon Sep 17 00:00:00 2001
From: Joan Sisquella <joan.sisquella@forgeflow.com>
Date: Thu, 18 Jun 2020 16:13:48 +0200
Subject: [PATCH 08/10] [FIX] account_financial_report: Not showing journal
 items with amount residual equal to 0

---
 .../report/aged_partner_balance.py                   | 12 ++++++------
 account_financial_report/report/open_items.py        | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/account_financial_report/report/aged_partner_balance.py b/account_financial_report/report/aged_partner_balance.py
index 0713259d..9158bfbe 100644
--- a/account_financial_report/report/aged_partner_balance.py
+++ b/account_financial_report/report/aged_partner_balance.py
@@ -251,12 +251,12 @@ class AgedPartnerBalanceReport(models.AbstractModel):
                     partner_ids,
                     only_posted_moves,
                 )
-            move_lines = [
-                move_line
-                for move_line in move_lines
-                if move_line["date"] <= date_at_object
-                and not float_is_zero(move_line["amount_residual"], precision_digits=2)
-            ]
+        move_lines = [
+            move_line
+            for move_line in move_lines
+            if move_line["date"] <= date_at_object
+            and not float_is_zero(move_line["amount_residual"], precision_digits=2)
+        ]
         for move_line in move_lines:
             journals_ids.add(move_line["journal_id"][0])
             acc_id = move_line["account_id"][0]
diff --git a/account_financial_report/report/open_items.py b/account_financial_report/report/open_items.py
index 9b7e87a9..6383dbd4 100644
--- a/account_financial_report/report/open_items.py
+++ b/account_financial_report/report/open_items.py
@@ -225,12 +225,12 @@ class OpenItemsReport(models.AbstractModel):
                     partner_ids,
                     target_move,
                 )
-            move_lines = [
-                move_line
-                for move_line in move_lines
-                if move_line["date"] <= date_at_object
-                and not float_is_zero(move_line["amount_residual"], precision_digits=2)
-            ]
+        move_lines = [
+            move_line
+            for move_line in move_lines
+            if move_line["date"] <= date_at_object
+            and not float_is_zero(move_line["amount_residual"], precision_digits=2)
+        ]
 
         open_items_move_lines_data = {}
         for move_line in move_lines:

From 632fd32d791fe82d81ce601987bd0c1d71c6cf8b Mon Sep 17 00:00:00 2001
From: Joan Sisquella <joan.sisquella@forgeflow.com>
Date: Tue, 23 Jun 2020 16:33:56 +0200
Subject: [PATCH 09/10] [IMP] account_financial_report: general_ledger * "hide
 account at 0" hides account/partner if inital cumul balance is 0 and there
 are not movements in the period

---
 .../report/general_ledger.py                  | 124 +++++++++++++-----
 1 file changed, 89 insertions(+), 35 deletions(-)

diff --git a/account_financial_report/report/general_ledger.py b/account_financial_report/report/general_ledger.py
index 6fdd979d..bffe2886 100644
--- a/account_financial_report/report/general_ledger.py
+++ b/account_financial_report/report/general_ledger.py
@@ -7,6 +7,7 @@ import datetime
 import operator
 
 from odoo import _, api, models
+from odoo.tools import float_is_zero
 
 
 class GeneralLedgerReport(models.AbstractModel):
@@ -177,7 +178,6 @@ class GeneralLedgerReport(models.AbstractModel):
         date_from,
         foreign_currency,
         only_posted_moves,
-        hide_account_at_0,
         unaffected_earnings_account,
         fy_start_date,
         analytic_tag_ids,
@@ -432,13 +432,11 @@ class GeneralLedgerReport(models.AbstractModel):
         company_id,
         foreign_currency,
         only_posted_moves,
-        hide_account_at_0,
         date_from,
         date_to,
         partners_data,
         gen_ld_data,
         partners_ids,
-        centralize,
         analytic_tag_ids,
         cost_center_ids,
     ):
@@ -566,11 +564,52 @@ class GeneralLedgerReport(models.AbstractModel):
                 move_line["rec_name"] = "(" + _("future") + ") " + move_line["rec_name"]
         return move_lines
 
-    @api.model
+    def _create_account(self, account, acc_id, gen_led_data, rec_after_date_to_ids):
+        move_lines = []
+        for ml_id in gen_led_data[acc_id].keys():
+            if not isinstance(ml_id, int):
+                account.update({ml_id: gen_led_data[acc_id][ml_id]})
+            else:
+                move_lines += [gen_led_data[acc_id][ml_id]]
+        move_lines = sorted(move_lines, key=lambda k: (k["date"]))
+        move_lines = self._recalculate_cumul_balance(
+            move_lines,
+            gen_led_data[acc_id]["init_bal"]["balance"],
+            rec_after_date_to_ids,
+        )
+        account.update({"move_lines": move_lines})
+        return account
+
+    def _create_account_not_show_partner(
+        self, account, acc_id, gen_led_data, rec_after_date_to_ids
+    ):
+        move_lines = []
+        for prt_id in gen_led_data[acc_id].keys():
+            if not isinstance(prt_id, int):
+                account.update({prt_id: gen_led_data[acc_id][prt_id]})
+            else:
+                for ml_id in gen_led_data[acc_id][prt_id].keys():
+                    if isinstance(ml_id, int):
+                        move_lines += [gen_led_data[acc_id][prt_id][ml_id]]
+        move_lines = sorted(move_lines, key=lambda k: (k["date"]))
+        move_lines = self._recalculate_cumul_balance(
+            move_lines,
+            gen_led_data[acc_id]["init_bal"]["balance"],
+            rec_after_date_to_ids,
+        )
+        account.update({"move_lines": move_lines, "partners": False})
+        return account
+
     def _create_general_ledger(
-        self, gen_led_data, accounts_data, show_partner_details, rec_after_date_to_ids
+        self,
+        gen_led_data,
+        accounts_data,
+        show_partner_details,
+        rec_after_date_to_ids,
+        hide_account_at_0,
     ):
         general_ledger = []
+        rounding = self.env.user.company_id.currency_id.rounding
         for acc_id in gen_led_data.keys():
             account = {}
             account.update(
@@ -583,19 +622,18 @@ class GeneralLedgerReport(models.AbstractModel):
                 }
             )
             if not gen_led_data[acc_id]["partners"]:
-                move_lines = []
-                for ml_id in gen_led_data[acc_id].keys():
-                    if not isinstance(ml_id, int):
-                        account.update({ml_id: gen_led_data[acc_id][ml_id]})
-                    else:
-                        move_lines += [gen_led_data[acc_id][ml_id]]
-                move_lines = sorted(move_lines, key=lambda k: (k["date"]))
-                move_lines = self._recalculate_cumul_balance(
-                    move_lines,
-                    gen_led_data[acc_id]["init_bal"]["balance"],
-                    rec_after_date_to_ids,
+                account = self._create_account(
+                    account, acc_id, gen_led_data, rec_after_date_to_ids
                 )
-                account.update({"move_lines": move_lines})
+                if (
+                    hide_account_at_0
+                    and float_is_zero(
+                        gen_led_data[acc_id]["init_bal"]["balance"],
+                        precision_rounding=rounding,
+                    )
+                    and account["move_lines"] == []
+                ):
+                    continue
             else:
                 if show_partner_details:
                     list_partner = []
@@ -619,24 +657,39 @@ class GeneralLedgerReport(models.AbstractModel):
                                 rec_after_date_to_ids,
                             )
                             partner.update({"move_lines": move_lines})
+                            if (
+                                hide_account_at_0
+                                and float_is_zero(
+                                    gen_led_data[acc_id][prt_id]["init_bal"]["balance"],
+                                    precision_rounding=rounding,
+                                )
+                                and partner["move_lines"] == []
+                            ):
+                                continue
                             list_partner += [partner]
                     account.update({"list_partner": list_partner})
+                    if (
+                        hide_account_at_0
+                        and float_is_zero(
+                            gen_led_data[acc_id]["init_bal"]["balance"],
+                            precision_rounding=rounding,
+                        )
+                        and account["list_partner"] == []
+                    ):
+                        continue
                 else:
-                    move_lines = []
-                    for prt_id in gen_led_data[acc_id].keys():
-                        if not isinstance(prt_id, int):
-                            account.update({prt_id: gen_led_data[acc_id][prt_id]})
-                        else:
-                            for ml_id in gen_led_data[acc_id][prt_id].keys():
-                                if isinstance(ml_id, int):
-                                    move_lines += [gen_led_data[acc_id][prt_id][ml_id]]
-                    move_lines = sorted(move_lines, key=lambda k: (k["date"]))
-                    move_lines = self._recalculate_cumul_balance(
-                        move_lines,
-                        gen_led_data[acc_id]["init_bal"]["balance"],
-                        rec_after_date_to_ids,
+                    account = self._create_account_not_show_partner(
+                        account, acc_id, gen_led_data, rec_after_date_to_ids
                     )
-                    account.update({"move_lines": move_lines, "partners": False})
+                    if (
+                        hide_account_at_0
+                        and float_is_zero(
+                            gen_led_data[acc_id]["init_bal"]["balance"],
+                            precision_rounding=rounding,
+                        )
+                        and account["move_lines"] == []
+                    ):
+                        continue
             general_ledger += [account]
         return general_ledger
 
@@ -728,7 +781,6 @@ class GeneralLedgerReport(models.AbstractModel):
             date_from,
             foreign_currency,
             only_posted_moves,
-            hide_account_at_0,
             unaffected_earnings_account,
             fy_start_date,
             analytic_tag_ids,
@@ -750,18 +802,20 @@ class GeneralLedgerReport(models.AbstractModel):
             company_id,
             foreign_currency,
             only_posted_moves,
-            hide_account_at_0,
             date_from,
             date_to,
             partners_data,
             gen_ld_data,
             partners_ids,
-            centralize,
             analytic_tag_ids,
             cost_center_ids,
         )
         general_ledger = self._create_general_ledger(
-            gen_ld_data, accounts_data, show_partner_details, rec_after_date_to_ids
+            gen_ld_data,
+            accounts_data,
+            show_partner_details,
+            rec_after_date_to_ids,
+            hide_account_at_0,
         )
         if centralize:
             for account in general_ledger:

From 65a58a28fab1e02a56883e1ffe37450b9fa29eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@acsone.eu>
Date: Tue, 11 Aug 2020 10:48:05 +0200
Subject: [PATCH 10/10] [FIX] duplicates in es.po

---
 account_financial_report/i18n/es.po | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/account_financial_report/i18n/es.po b/account_financial_report/i18n/es.po
index 5e5750f0..543c5d17 100644
--- a/account_financial_report/i18n/es.po
+++ b/account_financial_report/i18n/es.po
@@ -991,19 +991,6 @@ msgstr ""
 "Balance\n"
 "                        inicial moneda"
 
-#. module: account_financial_report
-#: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_lines_header
-#, fuzzy
-#| msgid ""
-#| "Initial\n"
-#| "                    balance"
-msgid ""
-"Initial\n"
-"                        balance cur."
-msgstr ""
-"Saldo\n"
-"                    inicial"
-
 #. module: account_financial_report
 #: code:addons/account_financial_report/report/general_ledger_xlsx.py:283
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:28
@@ -1843,8 +1830,3 @@ msgstr "ancho: 8.11%;"
 
 #~ msgid "Filter Cost Center"
 #~ msgstr "Filtro Centro de Costos"
-
-#. module: account_financial_report
-#: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header
-msgid "width: 8.11%;"
-msgstr "ancho: 8.11%;"