diff --git a/account_financial_report/README.rst b/account_financial_report/README.rst
index 92978013..cf1a8f08 100644
--- a/account_financial_report/README.rst
+++ b/account_financial_report/README.rst
@@ -1,10 +1,29 @@
-.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
-   :target: https://www.gnu.org/licenses/agpl-3.0-standalone.html
-   :alt: License: AGPL-3
-
-======================
-QWeb Financial Reports
-======================
+=========================
+Account Financial Reports
+=========================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--financial--reporting-lightgray.png?logo=github
+    :target: https://github.com/OCA/account-financial-reporting/tree/11.0/account_financial_report
+    :alt: OCA/account-financial-reporting
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/account-financial-reporting-11-0/account-financial-reporting-11-0-account_financial_report
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/91/11.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
 
 This module adds a set of financial reports. They are accessible under
 Accounting / Reporting / OCA Reports.
@@ -14,6 +33,7 @@ Accounting / Reporting / OCA Reports.
 - Open Items
 - Aged Partner Balance
 - VAT Report
+- Journal Ledger
 
 Currently General ledger, Trial Balance and Open Items are fully compatible with a foreign
 currency set up in account in order to display balances. Moreover, any foreign
@@ -22,29 +42,44 @@ currency used in account move lines is properly shown.
 In case that in an account has not been configured a second currency foreign
 currency balances are not available.
 
+**Table of contents**
+
+.. contents::
+   :local:
+
+Changelog
+=========
 
-.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
-   :alt: Try me on Runbot
-   :target: https://runbot.odoo-community.org/runbot/91/11.0
+11.0.2.3.1 (2018-11-29)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* In the Trial Balance you can apply a filter by hierarchy levels
+* In the General Ledger you can apply a filter by Analytic Tag
+* In the Journal Ledger the field 'Journal' is now optional
 
 Bug Tracker
 ===========
 
-Bugs are tracked on `GitHub Issues
-<https://github.com/OCA/account-financial-reporting/issues>`_. In case of trouble, please
-check there if your issue has already been reported. If you spotted it first,
-help us smashing it by providing a detailed and welcomed feedback.
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/account-financial-reporting/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/account-financial-reporting/issues/new?body=module:%20account_financial_report%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
 
 Credits
 =======
 
-Images
-------
+Authors
+~~~~~~~
 
-* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
+* Camptocamp SA
+* initOS GmbH
+* redCOR AG
+* Eficent
 
 Contributors
-------------
+~~~~~~~~~~~~
 
 * Jordi Ballester <jordi.ballester@eficient.com>
 * Yannick Vaucher <yannick.vaucher@camptocamp.com>
@@ -66,17 +101,19 @@ Contributors
 Much of the work in this module was done at a sprint in Sorrento, Italy in
 April 2016.
 
-Maintainer
-----------
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
 
 .. image:: https://odoo-community.org/logo.png
    :alt: Odoo Community Association
    :target: https://odoo-community.org
 
-This module is maintained by the OCA.
-
 OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-To contribute to this module, please visit https://odoo-community.org.
+This module is part of the `OCA/account-financial-reporting <https://github.com/OCA/account-financial-reporting/tree/11.0/account_financial_report>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/account_financial_report/i18n/account_financial_report.pot b/account_financial_report/i18n/account_financial_report.pot
index b50b4840..e7a3ab4b 100644
--- a/account_financial_report/i18n/account_financial_report.pot
+++ b/account_financial_report/i18n/account_financial_report.pot
@@ -111,16 +111,16 @@ msgstr ""
 
 #. module: account_financial_report
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:108
+#: model:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters
 #, python-format
 msgid "Account at 0 filter"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:76
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:84
 #: code:addons/account_financial_report/report/open_items_xlsx.py:61
 #: model:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
 #: model:ir.ui.view,arch_db:account_financial_report.report_open_items_filters
-#: model:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters
 #, python-format
 msgid "Account balance at 0 filter"
 msgstr ""
@@ -260,7 +260,7 @@ msgstr ""
 
 #. module: account_financial_report
 #: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:124
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:74
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:81
 #: code:addons/account_financial_report/report/open_items_xlsx.py:59
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:106
 #: model:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_filters
@@ -273,7 +273,7 @@ msgstr ""
 
 #. module: account_financial_report
 #: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:124
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:74
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:80
 #: code:addons/account_financial_report/report/open_items_xlsx.py:59
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:106
 #: model:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_filters
@@ -320,7 +320,7 @@ msgid "Amount Total Due Currency"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:57
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:60
 #: model:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
 #, python-format
 msgid "Amount cur."
@@ -391,7 +391,7 @@ msgid "Centralize"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:78
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:88
 #: model:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
 #, python-format
 msgid "Centralize filter"
@@ -403,7 +403,7 @@ msgid "Centralized"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:1237
+#: code:addons/account_financial_report/report/general_ledger.py:1433
 #, python-format
 msgid "Centralized Entries"
 msgstr ""
@@ -567,7 +567,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:38
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:41
 #: code:addons/account_financial_report/report/journal_ledger_xlsx.py:65
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:29
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:70
@@ -626,14 +626,14 @@ msgid "Cumul Older"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:44
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:47
 #: model:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
 #, python-format
 msgid "Cumul. Bal."
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:53
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:56
 #: code:addons/account_financial_report/report/open_items_xlsx.py:36
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:44
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:85
@@ -768,7 +768,7 @@ msgid "Date range"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:71
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:75
 #: code:addons/account_financial_report/report/journal_ledger_xlsx.py:168
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:103
 #: model:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
@@ -784,7 +784,7 @@ msgid "Date to"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:32
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:35
 #: code:addons/account_financial_report/report/journal_ledger_xlsx.py:59
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:25
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:66
@@ -896,7 +896,7 @@ msgid "Ending\n"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:162
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:179
 #: code:addons/account_financial_report/report/open_items_xlsx.py:117
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:37
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:52
@@ -970,6 +970,11 @@ msgstr ""
 msgid "Filter Account"
 msgstr ""
 
+#. module: account_financial_report
+#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_filter_analytic_tag_ids
+msgid "Filter Analytic Tag"
+msgstr ""
+
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_filter_cost_center_ids
 msgid "Filter Cost Center"
@@ -992,13 +997,21 @@ msgstr ""
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_wizard_account_ids
 #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard_account_ids
+#: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard_analytic_tag_ids
 #: model:ir.model.fields,field_description:account_financial_report.field_open_items_report_wizard_account_ids
 #: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard_account_ids
+#: model:ir.ui.view,arch_db:account_financial_report.general_ledger_wizard
 msgid "Filter accounts"
 msgstr ""
 
+#. module: account_financial_report
+#: model:ir.ui.view,arch_db:account_financial_report.general_ledger_wizard
+msgid "Filter analytic tags"
+msgstr ""
+
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard_cost_center_ids
+#: model:ir.ui.view,arch_db:account_financial_report.general_ledger_wizard
 msgid "Filter cost centers"
 msgstr ""
 
@@ -1012,6 +1025,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard_partner_ids
 #: model:ir.model.fields,field_description:account_financial_report.field_open_items_report_wizard_partner_ids
 #: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard_partner_ids
+#: model:ir.ui.view,arch_db:account_financial_report.general_ledger_wizard
 msgid "Filter partners"
 msgstr ""
 
@@ -1083,7 +1097,7 @@ msgid "From:"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:72
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:76
 #: code:addons/account_financial_report/report/journal_ledger_xlsx.py:169
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:104
 #, python-format
@@ -1137,7 +1151,7 @@ msgid "Group entries by"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:77
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:85
 #: code:addons/account_financial_report/report/open_items_xlsx.py:62
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:109
 #: model:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
@@ -1148,19 +1162,20 @@ msgid "Hide"
 msgstr ""
 
 #. module: account_financial_report
+#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_hide_account_at_0
+#: model:ir.model.fields,field_description:account_financial_report.field_report_open_items_hide_account_at_0
 #: model:ir.model.fields,field_description:account_financial_report.field_report_trial_balance_hide_account_at_0
 msgid "Hide Account At 0"
 msgstr ""
 
 #. module: account_financial_report
-#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_hide_account_balance_at_0
-#: model:ir.model.fields,field_description:account_financial_report.field_report_open_items_hide_account_balance_at_0
-msgid "Hide Account Balance At 0"
+#: model:ir.model.fields,field_description:account_financial_report.field_report_trial_balance_account_hide_line
+msgid "Hide Line"
 msgstr ""
 
 #. module: account_financial_report
-#: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard_hide_account_balance_at_0
-#: model:ir.model.fields,field_description:account_financial_report.field_open_items_report_wizard_hide_account_balance_at_0
+#: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard_hide_account_at_0
+#: model:ir.model.fields,field_description:account_financial_report.field_open_items_report_wizard_hide_account_at_0
 msgid "Hide account ending balance at 0"
 msgstr ""
 
@@ -1169,6 +1184,12 @@ msgstr ""
 msgid "Hide accounts at 0"
 msgstr ""
 
+#. module: account_financial_report
+#: model:ir.model.fields,field_description:account_financial_report.field_report_trial_balance_show_hierarchy_level
+#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard_show_hierarchy_level
+msgid "Hierarchy Levels to display"
+msgstr ""
+
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_report_trial_balance_hierarchy_on
 #: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard_hierarchy_on
@@ -1258,7 +1279,7 @@ msgid "Initial Debit"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:150
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:167
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:21
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:48
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:62
@@ -1450,9 +1471,25 @@ msgstr ""
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_account_group_level
 #: model:ir.model.fields,field_description:account_financial_report.field_report_trial_balance_account_level
+#: model:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters
 msgid "Level"
 msgstr ""
 
+#. module: account_financial_report
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:113
+#, python-format
+msgid "Level %s"
+msgstr ""
+
+#. module: account_financial_report
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:112
+#: model:ir.model.fields,field_description:account_financial_report.field_report_trial_balance_limit_hierarchy_level
+#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard_limit_hierarchy_level
+#: model:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters
+#, python-format
+msgid "Limit hierarchy levels"
+msgstr ""
+
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_partner_line_ids
 msgid "Line"
@@ -1523,8 +1560,9 @@ msgid "Net"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:79
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:81
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:89
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:93
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:97
 #: code:addons/account_financial_report/report/open_items_xlsx.py:64
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:111
 #: model:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
@@ -1545,8 +1583,15 @@ msgid "No hierarchy"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger.py:688
-#: code:addons/account_financial_report/report/general_ledger.py:985
+#: code:addons/account_financial_report/report/trial_balance_xlsx.py:114
+#: model:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters
+#, python-format
+msgid "No limit"
+msgstr ""
+
+#. module: account_financial_report
+#: code:addons/account_financial_report/report/general_ledger.py:758
+#: code:addons/account_financial_report/report/general_ledger.py:1137
 #: code:addons/account_financial_report/report/open_items.py:306
 #: code:addons/account_financial_report/report/open_items.py:555
 #, python-format
@@ -1671,7 +1716,7 @@ msgid "Partner\n"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:147
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:164
 #, python-format
 msgid "Partner Initial balance"
 msgstr ""
@@ -1683,7 +1728,7 @@ msgid "Partner cumul aged balance"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:159
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:176
 #: code:addons/account_financial_report/report/open_items_xlsx.py:113
 #: model:ir.ui.view,arch_db:account_financial_report.report_general_ledger_ending_cumul
 #: model:ir.ui.view,arch_db:account_financial_report.report_open_items_ending_cumul
@@ -1763,7 +1808,7 @@ msgid "Posted"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:31
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:34
 #: model:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
 #, python-format
 msgid "Rec."
@@ -1880,7 +1925,7 @@ msgid "Sequence"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:77
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:85
 #: code:addons/account_financial_report/report/open_items_xlsx.py:62
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:109
 #: model:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
@@ -1890,6 +1935,11 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
+#. module: account_financial_report
+#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_show_analytic_tags
+msgid "Show Analytic Tags"
+msgstr ""
+
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_show_cost_center
 msgid "Show Cost Center"
@@ -1908,7 +1958,15 @@ msgid "Show Partner Details"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:80
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:92
+#: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard_show_analytic_tags
+#: model:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
+#, python-format
+msgid "Show analytic tags"
+msgstr ""
+
+#. module: account_financial_report
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:96
 #: code:addons/account_financial_report/report/open_items_xlsx.py:63
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:110
 #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard_foreign_currency
@@ -1938,6 +1996,14 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
+#. module: account_financial_report
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:31
+#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_tags
+#: model:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
+#, python-format
+msgid "Tags"
+msgstr ""
+
 #. module: account_financial_report
 #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_wizard_target_move
 #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard_target_move
@@ -1948,7 +2014,7 @@ msgstr ""
 
 #. module: account_financial_report
 #: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:123
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:73
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:79
 #: code:addons/account_financial_report/report/journal_ledger_xlsx.py:172
 #: code:addons/account_financial_report/report/open_items_xlsx.py:58
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:105
@@ -2063,6 +2129,12 @@ msgstr ""
 msgid "Taxtags"
 msgstr ""
 
+#. module: account_financial_report
+#: code:addons/account_financial_report/wizard/trial_balance_wizard.py:90
+#, python-format
+msgid "The hierarchy level to filter on must be greater than 0."
+msgstr ""
+
 #. module: account_financial_report
 #: model:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
 #: model:ir.ui.view,arch_db:account_financial_report.report_trial_balance_filters
@@ -2110,8 +2182,8 @@ msgid "Unaffected Earnings Account"
 msgstr ""
 
 #. module: account_financial_report
-#: model:ir.model.fields,help:account_financial_report.field_general_ledger_report_wizard_hide_account_balance_at_0
-#: model:ir.model.fields,help:account_financial_report.field_open_items_report_wizard_hide_account_balance_at_0
+#: 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 ""
 
@@ -2159,8 +2231,9 @@ msgid "With Account Name"
 msgstr ""
 
 #. module: account_financial_report
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:79
-#: code:addons/account_financial_report/report/general_ledger_xlsx.py:81
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:89
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:93
+#: code:addons/account_financial_report/report/general_ledger_xlsx.py:97
 #: code:addons/account_financial_report/report/open_items_xlsx.py:64
 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:111
 #: model:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
diff --git a/account_financial_report/readme/CONTRIBUTORS.rst b/account_financial_report/readme/CONTRIBUTORS.rst
new file mode 100644
index 00000000..4604fe42
--- /dev/null
+++ b/account_financial_report/readme/CONTRIBUTORS.rst
@@ -0,0 +1,19 @@
+* Jordi Ballester <jordi.ballester@eficient.com>
+* Yannick Vaucher <yannick.vaucher@camptocamp.com>
+* Simone Orsi <simone.orsi@abstract.com>
+* Leonardo Pistone <leonardo.pistone@camptocamp.com>
+* Damien Crier <damien.crier@camptocamp.com>
+* Andrea Stirpe <a.stirpe@onestein.nl>
+* Thomas Rehn <thomas.rehn@initos.com>
+* Andrea Gallina <4everamd@gmail.com>
+* Robert Rottermann <robert@redcor.ch>
+* Ciro Urselli <c.urselli@apuliasoftware.it>
+* Francesco Apruzzese <opencode@e-ware.org>
+* Lorenzo Battistini <lorenzo.battistini@agilebg.com>
+* Julien Coux <julien.coux@camptocamp.com>
+* Akim Juillerat <akim.juillerat@camptocamp.com>
+* Alexis de Lattre <alexis@via.ecp.fr>
+* Mihai Fekete <feketemihai@gmail.com>
+
+Much of the work in this module was done at a sprint in Sorrento, Italy in
+April 2016.
diff --git a/account_financial_report/readme/DESCRIPTION.rst b/account_financial_report/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..6dab949f
--- /dev/null
+++ b/account_financial_report/readme/DESCRIPTION.rst
@@ -0,0 +1,16 @@
+This module adds a set of financial reports. They are accessible under
+Accounting / Reporting / OCA Reports.
+
+- General ledger
+- Trial Balance
+- Open Items
+- Aged Partner Balance
+- VAT Report
+- Journal Ledger
+
+Currently General ledger, Trial Balance and Open Items are fully compatible with a foreign
+currency set up in account in order to display balances. Moreover, any foreign
+currency used in account move lines is properly shown.
+
+In case that in an account has not been configured a second currency foreign
+currency balances are not available.
diff --git a/account_financial_report/readme/HISTORY.rst b/account_financial_report/readme/HISTORY.rst
new file mode 100644
index 00000000..b501c36d
--- /dev/null
+++ b/account_financial_report/readme/HISTORY.rst
@@ -0,0 +1,6 @@
+11.0.2.3.1 (2018-11-29)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* In the Trial Balance you can apply a filter by hierarchy levels
+* In the General Ledger you can apply a filter by Analytic Tag
+* In the Journal Ledger the field 'Journal' is now optional
diff --git a/account_financial_report/report/templates/trial_balance.xml b/account_financial_report/report/templates/trial_balance.xml
index 3359fe9e..bb00109f 100644
--- a/account_financial_report/report/templates/trial_balance.xml
+++ b/account_financial_report/report/templates/trial_balance.xml
@@ -108,7 +108,7 @@
             <div class="act_as_row labels">
                 <div class="act_as_cell">Date range filter</div>
                 <div class="act_as_cell">Target moves filter</div>
-                <div class="act_as_cell">Account balance at 0 filter</div>
+                <div class="act_as_cell">Account at 0 filter</div>
                 <div class="act_as_cell">Limit hierarchy levels</div>
             </div>
             <div class="act_as_row">
@@ -143,12 +143,12 @@
                     <!--## Code-->
                     <div class="act_as_cell" style="width: 8.86%;">Code</div>
                     <!--## Account-->
-                    <div class="act_as_cell" style="width: 52.58%;">Account
+                    <div class="act_as_cell" style="width: 37.58%;">Account
                     </div>
                 </t>
                 <t t-if="show_partner_details">
                     <!--## Partner-->
-                    <div class="act_as_cell" style="width: 61.44%;">Partner
+                    <div class="act_as_cell" style="width: 46.44%;">Partner
                     </div>
                 </t>
                 <!--## Initial balance-->
diff --git a/account_financial_report/report/trial_balance_xlsx.py b/account_financial_report/report/trial_balance_xlsx.py
index fa7e534d..57bf27c6 100644
--- a/account_financial_report/report/trial_balance_xlsx.py
+++ b/account_financial_report/report/trial_balance_xlsx.py
@@ -82,15 +82,15 @@ class TrialBalanceXslx(models.AbstractModel):
             }
             if report.foreign_currency:
                 foreign_currency = {
-                    5: {'header': _('Cur.'),
+                    6: {'header': _('Cur.'),
                         'field': 'currency_id',
                         'field_currency_balance': 'currency_id',
                         'type': 'many2one', 'width': 7},
-                    6: {'header': _('Initial balance'),
+                    7: {'header': _('Initial balance'),
                         'field': 'initial_balance_foreign_currency',
                         'type': 'amount_currency',
                         'width': 14},
-                    7: {'header': _('Ending balance'),
+                    8: {'header': _('Ending balance'),
                         'field': 'final_balance_foreign_currency',
                         'type': 'amount_currency',
                         'width': 14},
diff --git a/account_financial_report/static/description/index.html b/account_financial_report/static/description/index.html
new file mode 100644
index 00000000..ae324c29
--- /dev/null
+++ b/account_financial_report/static/description/index.html
@@ -0,0 +1,468 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
+<title>Account Financial Reports</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="account-financial-reports">
+<h1 class="title">Account Financial Reports</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/account-financial-reporting/tree/11.0/account_financial_report"><img alt="OCA/account-financial-reporting" src="https://img.shields.io/badge/github-OCA%2Faccount--financial--reporting-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/account-financial-reporting-11-0/account-financial-reporting-11-0-account_financial_report"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/91/11.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>This module adds a set of financial reports. They are accessible under
+Accounting / Reporting / OCA Reports.</p>
+<ul class="simple">
+<li>General ledger</li>
+<li>Trial Balance</li>
+<li>Open Items</li>
+<li>Aged Partner Balance</li>
+<li>VAT Report</li>
+<li>Journal Ledger</li>
+</ul>
+<p>Currently General ledger, Trial Balance and Open Items are fully compatible with a foreign
+currency set up in account in order to display balances. Moreover, any foreign
+currency used in account move lines is properly shown.</p>
+<p>In case that in an account has not been configured a second currency foreign
+currency balances are not available.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#changelog" id="id2">Changelog</a><ul>
+<li><a class="reference internal" href="#id1" id="id3">11.0.2.3.1 (2018-11-29)</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#bug-tracker" id="id4">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id5">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id6">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id7">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id8">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="changelog">
+<h1><a class="toc-backref" href="#id2">Changelog</a></h1>
+<div class="section" id="id1">
+<h2><a class="toc-backref" href="#id3">11.0.2.3.1 (2018-11-29)</a></h2>
+<ul class="simple">
+<li>In the Trial Balance you can apply a filter by hierarchy levels</li>
+<li>In the General Ledger you can apply a filter by Analytic Tag</li>
+<li>In the Journal Ledger the field ‘Journal’ is now optional</li>
+</ul>
+</div>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id4">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/account-financial-reporting/issues">GitHub Issues</a>.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/account-financial-reporting/issues/new?body=module:%20account_financial_report%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#id5">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id6">Authors</a></h2>
+<ul class="simple">
+<li>Camptocamp SA</li>
+<li>initOS GmbH</li>
+<li>redCOR AG</li>
+<li>Eficent</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id7">Contributors</a></h2>
+<ul class="simple">
+<li>Jordi Ballester &lt;<a class="reference external" href="mailto:jordi.ballester&#64;eficient.com">jordi.ballester&#64;eficient.com</a>&gt;</li>
+<li>Yannick Vaucher &lt;<a class="reference external" href="mailto:yannick.vaucher&#64;camptocamp.com">yannick.vaucher&#64;camptocamp.com</a>&gt;</li>
+<li>Simone Orsi &lt;<a class="reference external" href="mailto:simone.orsi&#64;abstract.com">simone.orsi&#64;abstract.com</a>&gt;</li>
+<li>Leonardo Pistone &lt;<a class="reference external" href="mailto:leonardo.pistone&#64;camptocamp.com">leonardo.pistone&#64;camptocamp.com</a>&gt;</li>
+<li>Damien Crier &lt;<a class="reference external" href="mailto:damien.crier&#64;camptocamp.com">damien.crier&#64;camptocamp.com</a>&gt;</li>
+<li>Andrea Stirpe &lt;<a class="reference external" href="mailto:a.stirpe&#64;onestein.nl">a.stirpe&#64;onestein.nl</a>&gt;</li>
+<li>Thomas Rehn &lt;<a class="reference external" href="mailto:thomas.rehn&#64;initos.com">thomas.rehn&#64;initos.com</a>&gt;</li>
+<li>Andrea Gallina &lt;<a class="reference external" href="mailto:4everamd&#64;gmail.com">4everamd&#64;gmail.com</a>&gt;</li>
+<li>Robert Rottermann &lt;<a class="reference external" href="mailto:robert&#64;redcor.ch">robert&#64;redcor.ch</a>&gt;</li>
+<li>Ciro Urselli &lt;<a class="reference external" href="mailto:c.urselli&#64;apuliasoftware.it">c.urselli&#64;apuliasoftware.it</a>&gt;</li>
+<li>Francesco Apruzzese &lt;<a class="reference external" href="mailto:opencode&#64;e-ware.org">opencode&#64;e-ware.org</a>&gt;</li>
+<li>Lorenzo Battistini &lt;<a class="reference external" href="mailto:lorenzo.battistini&#64;agilebg.com">lorenzo.battistini&#64;agilebg.com</a>&gt;</li>
+<li>Julien Coux &lt;<a class="reference external" href="mailto:julien.coux&#64;camptocamp.com">julien.coux&#64;camptocamp.com</a>&gt;</li>
+<li>Akim Juillerat &lt;<a class="reference external" href="mailto:akim.juillerat&#64;camptocamp.com">akim.juillerat&#64;camptocamp.com</a>&gt;</li>
+<li>Alexis de Lattre &lt;<a class="reference external" href="mailto:alexis&#64;via.ecp.fr">alexis&#64;via.ecp.fr</a>&gt;</li>
+<li>Mihai Fekete &lt;<a class="reference external" href="mailto:feketemihai&#64;gmail.com">feketemihai&#64;gmail.com</a>&gt;</li>
+</ul>
+<p>Much of the work in this module was done at a sprint in Sorrento, Italy in
+April 2016.</p>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id8">Maintainers</a></h2>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-financial-reporting/tree/11.0/account_financial_report">OCA/account-financial-reporting</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
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 2b618a4e..a2e3196c 100644
--- a/account_financial_report/wizard/aged_partner_balance_wizard_view.xml
+++ b/account_financial_report/wizard/aged_partner_balance_wizard_view.xml
@@ -19,15 +19,17 @@
                         <field name="show_move_line_details"/>
                     </group>
                 </group>
-                <label for="partner_ids"/>
-                <field name="partner_ids" nolabel="1" options="{'no_create': True}"/>
-                <group/>
-                <label for="account_ids"/>
-                <group col="4">
+                <group name="partner_filter" col="1">
+                    <label for="partner_ids"/>
+                    <field name="partner_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}"/>
+                </group>
+                <group name="account_filter" col="4">
+                    <label for="account_ids" colspan="4"/>
                     <field name="receivable_accounts_only"/>
                     <field name="payable_accounts_only"/>
+                    <field name="account_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}" colspan="4"/>
                 </group>
-                <field name="account_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
+                <field name="account_ids" nolabel="1" options="{'no_create': True}"/>
                 <footer>
                     <button name="button_export_html" string="View"
                             type="object" default_focus="1" class="oe_highlight"/>
diff --git a/account_financial_report/wizard/general_ledger_wizard_view.xml b/account_financial_report/wizard/general_ledger_wizard_view.xml
index d654ac99..d56d7c13 100644
--- a/account_financial_report/wizard/general_ledger_wizard_view.xml
+++ b/account_financial_report/wizard/general_ledger_wizard_view.xml
@@ -32,16 +32,16 @@
                                 <field name="receivable_accounts_only"/>
                                 <field name="payable_accounts_only"/>
                             </group>
-                            <field name="account_ids" nolabel="1" options="{'no_create': True}"/>
+                            <field name="account_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}"/>
                         </page>
                         <page string="Filter partners">
-                            <field name="partner_ids" nolabel="1" options="{'no_create': True}"/>
+                            <field name="partner_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}"/>
                         </page>
                         <page string="Filter cost centers" groups="analytic.group_analytic_accounting">
                             <field name="cost_center_ids" nolabel="1" options="{'no_create': True}" groups="analytic.group_analytic_accounting"/>
                         </page>
                         <page string="Filter analytic tags">
-                            <field name="analytic_tag_ids" nolabel="1" options="{'no_create': True}"/>
+                            <field name="analytic_tag_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
                         </page>
                     </notebook>
                 </div>
diff --git a/account_financial_report/wizard/open_items_wizard_view.xml b/account_financial_report/wizard/open_items_wizard_view.xml
index 9dda223d..3a6122bf 100644
--- a/account_financial_report/wizard/open_items_wizard_view.xml
+++ b/account_financial_report/wizard/open_items_wizard_view.xml
@@ -20,15 +20,16 @@
                         <field name="foreign_currency"/>
                     </group>
                 </group>
-                <label for="partner_ids"/>
-                <field name="partner_ids" nolabel="1" options="{'no_create': True}"/>
-                <group/>
-                <label for="account_ids"/>
-                <group col="4">
+                <group name="partner_filter" col="1">
+                    <label for="partner_ids"/>
+                    <field name="partner_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}"/>
+                </group>
+                <group name="account_filter" col="4">
+                    <label for="account_ids" colspan="4"/>
                     <field name="receivable_accounts_only"/>
                     <field name="payable_accounts_only"/>
+                    <field name="account_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}" colspan="4"/>
                 </group>
-                <field name="account_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
                 <footer>
                     <button name="button_export_html" string="View"
                             type="object" default_focus="1" class="oe_highlight"/>
diff --git a/account_financial_report/wizard/trial_balance_wizard_view.xml b/account_financial_report/wizard/trial_balance_wizard_view.xml
index 38bbd037..540cf0b7 100644
--- a/account_financial_report/wizard/trial_balance_wizard_view.xml
+++ b/account_financial_report/wizard/trial_balance_wizard_view.xml
@@ -28,18 +28,20 @@
                             <field name="foreign_currency"/>
                         </group>
                     </group>
-                    <label for="partner_ids" attrs="{'invisible':[('show_partner_details','!=',True)]}"/>
-                    <field name="partner_ids" nolabel="1" options="{'no_create': True}" attrs="{'invisible':[('show_partner_details','!=',True)]}"/>
+                    <group name="partner_filter" attrs="{'invisible':[('show_partner_details','!=',True)]}" col="1">
+                        <label for="partner_ids"/>
+                        <field name="partner_ids" nolabel="1"  widget="many2many_tags" options="{'no_create': True}"/>
+                    </group>
                     <label for="journal_ids"/>
                     <field name="journal_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
                     <group attrs="{'invisible':[('show_partner_details','!=',True)]}"/>
                     <div/>
-                    <label for="account_ids"/>
-                    <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"/>
+                        <field name="account_ids" nolabel="1" widget="many2many_tags" options="{'no_create': True}" colspan="4"/>
                     </group>
-                    <field name="account_ids" widget="many2many_tags" nolabel="1" options="{'no_create': True}"/>
                 </div>
                 <div attrs="{'invisible': [('not_only_one_unaffected_earnings_account', '=', False)]}">
                     <field name="not_only_one_unaffected_earnings_account" invisible="1"/>