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
- Cost
- center
+ Analytic Account
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 @@
/>