diff --git a/account_financial_report/README.rst b/account_financial_report/README.rst index 123f90c5..56ec234b 100644 --- a/account_financial_report/README.rst +++ b/account_financial_report/README.rst @@ -38,6 +38,9 @@ Invoicing / Reporting / OCA accounting reports. - VAT Report - Journal Ledger +It is possible to select the columns to show and limit the size of some of them from the +columns page. + 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. @@ -94,10 +97,18 @@ Known issues / Roadmap * It would be nice to have in reports a column indicating the state of the entries when the option "All Entries" is selected in "Target Moves" field in a wizard +* Adapt reports so that the order of the columns displayed is dynamic +* Remove duplicated options to show columns (it has not been made in a stable version so + as not to generate confusion in users) Changelog ========= +15.0.3.2.3 (2025-02-17) +~~~~~~~~~~~~~~~~~~~~~~~ + +* Added the option to select columns to display and the ability to limit the width of the text + 11.0.2.5.0 (2019-04-26) ~~~~~~~~~~~~~~~~~~~~~~~ @@ -138,6 +149,7 @@ Authors * initOS GmbH * redCOR AG * ForgeFlow +* Tecnativa Contributors ~~~~~~~~~~~~ @@ -169,6 +181,7 @@ Contributors * Alexandre D. Díaz * Víctor Martínez * Carolina Fernandez + * Carlos Dauden * `Sygel `__: diff --git a/account_financial_report/__manifest__.py b/account_financial_report/__manifest__.py index b4e0175d..9882b4b8 100644 --- a/account_financial_report/__manifest__.py +++ b/account_financial_report/__manifest__.py @@ -3,6 +3,7 @@ # Copyright 2016 Camptocamp SA # Copyright 2020 ForgeFlow S.L. (https://www.forgeflow.com) # Copyright 2021 Tecnativa - João Marques +# Copyright 2025 Tecnativa - Carlos Dauden # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Account Financial Reports", @@ -13,6 +14,7 @@ "initOS GmbH," "redCOR AG," "ForgeFlow," + "Tecnativa," "Odoo Community Association (OCA)", "website": "https://github.com/OCA/account-financial-reporting", "depends": ["account", "date_range", "report_xlsx"], @@ -37,6 +39,7 @@ "report/templates/trial_balance.xml", "report/templates/vat_report.xml", "view/account_view.xml", + "view/account_financial_report_column_view.xml", "view/report_general_ledger.xml", "view/report_journal_ledger.xml", "view/report_trial_balance.xml", diff --git a/account_financial_report/data/report_column_data.xml b/account_financial_report/data/report_column_data.xml index 58cac7a9..c3f2d4ce 100644 --- a/account_financial_report/data/report_column_data.xml +++ b/account_financial_report/data/report_column_data.xml @@ -1,5 +1,6 @@ - + + Ref - Label ref_label + string + 40 general.ledger.report.wizard 80 - Cost center + Analytic account cost_center @@ -141,4 +144,215 @@ + + + open.items.report.wizard + 10 + Date + date + + + + open.items.report.wizard + 20 + Entry + entry + + + + open.items.report.wizard + 30 + Journal + journal + + + + open.items.report.wizard + 40 + Account code + account_code + + + + open.items.report.wizard + 50 + Partner + partner + + + + open.items.report.wizard + 60 + Ref - Label + ref_label + + string + 40 + + + open.items.report.wizard + 70 + Date due + date_due + + + + open.items.report.wizard + 80 + Original + original + + + + open.items.report.wizard + 90 + Residual + residual + + + + open.items.report.wizard + 100 + Foreign currency + foreign_currency + + + + + + + journal.ledger.report.wizard + 5 + Sequence + sequence + + + + journal.ledger.report.wizard + 10 + Entry + entry + + + + journal.ledger.report.wizard + 20 + Date + date + + + + journal.ledger.report.wizard + 30 + Account code + account_code + + + + journal.ledger.report.wizard + 40 + Account name + account_name + + string + 20 + + + journal.ledger.report.wizard + 50 + Partner + partner + + + + journal.ledger.report.wizard + 60 + Label + label + + string + 40 + + + journal.ledger.report.wizard + 70 + Debit + debit + + + + journal.ledger.report.wizard + 80 + Credit + credit + + + + journal.ledger.report.wizard + 100 + Foreign currency + foreign_currency + + + diff --git a/account_financial_report/i18n/account_financial_report.pot b/account_financial_report/i18n/account_financial_report.pot index bcddeff9..7f5f6b32 100644 --- a/account_financial_report/i18n/account_financial_report.pot +++ b/account_financial_report/i18n/account_financial_report.pot @@ -6,6 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 15.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-02-11 10:45+0000\n" +"PO-Revision-Date: 2025-02-11 10:45+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -141,6 +143,18 @@ msgstr "" msgid "Account balance at 0 filter" msgstr "" +#. module: account_financial_report +#: model:account.financial.report.column,name:account_financial_report.general_ledger_report_wizard_column_account_code +#: model:account.financial.report.column,name:account_financial_report.journal_ledger_report_wizard_column_account_code +#: model:account.financial.report.column,name:account_financial_report.open_items_report_wizard_column_account_code +msgid "Account code" +msgstr "" + +#. module: account_financial_report +#: model:account.financial.report.column,name:account_financial_report.journal_ledger_report_wizard_column_account_name +msgid "Account name" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_group__account_ids msgid "Accounts" @@ -339,6 +353,17 @@ msgid "Analytic Account" msgstr "" #. module: account_financial_report +#: model:account.financial.report.column,name:account_financial_report.general_ledger_report_wizard_column_cost_center +msgid "Analytic account" +msgstr "" + +#. module: account_financial_report +#: model:account.financial.report.column,name:account_financial_report.general_ledger_report_wizard_column_analytic_tags +msgid "Analytic tags" +msgstr "" + +#. module: account_financial_report +#: model:account.financial.report.column,name:account_financial_report.general_ledger_report_wizard_column_balance #: 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 msgid "Balance" @@ -416,6 +441,24 @@ msgstr "" msgid "Code" msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_account_financial_report_abstract_wizard__column_ids +#: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__column_ids +#: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__column_ids +#: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__column_ids +#: model:ir.model.fields,field_description:account_financial_report.field_open_items_report_wizard__column_ids +#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__column_ids +#: model:ir.model.fields,field_description:account_financial_report.field_vat_report_wizard__column_ids +msgid "Column" +msgstr "" + +#. module: account_financial_report +#: model_terms:ir.ui.view,arch_db:account_financial_report.general_ledger_wizard +#: model_terms:ir.ui.view,arch_db:account_financial_report.journal_ledger_wizard +#: model_terms:ir.ui.view,arch_db:account_financial_report.open_items_wizard +msgid "Columns" +msgstr "" + #. module: account_financial_report #: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0 #: model:ir.model.fields,field_description:account_financial_report.field_account_age_report_configuration__company_id @@ -435,11 +478,6 @@ msgstr "" msgid "Compute accounts" msgstr "" -#. module: account_financial_report -#: model:ir.model,name:account_financial_report.model_res_config_settings -msgid "Config Settings" -msgstr "" - #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.res_config_settings_view_form msgid "Configurations" @@ -448,6 +486,7 @@ msgstr "" #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_age_report_configuration__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_account_age_report_configuration_line__create_uid +#: model:ir.model.fields,field_description:account_financial_report.field_account_financial_report_column__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_uid #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__create_uid @@ -460,6 +499,7 @@ msgstr "" #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_age_report_configuration__create_date #: model:ir.model.fields,field_description:account_financial_report.field_account_age_report_configuration_line__create_date +#: model:ir.model.fields,field_description:account_financial_report.field_account_financial_report_column__create_date #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__create_date #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__create_date #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__create_date @@ -474,6 +514,8 @@ msgstr "" #: 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/trial_balance_xlsx.py:0 +#: model:account.financial.report.column,name:account_financial_report.general_ledger_report_wizard_column_credit +#: model:account.financial.report.column,name:account_financial_report.journal_ledger_report_wizard_column_credit #: 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 @@ -539,6 +581,9 @@ msgstr "" #: 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 +#: model:account.financial.report.column,name:account_financial_report.general_ledger_report_wizard_column_date +#: model:account.financial.report.column,name:account_financial_report.journal_ledger_report_wizard_column_date +#: model:account.financial.report.column,name:account_financial_report.open_items_report_wizard_column_date #: 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 @@ -578,6 +623,11 @@ msgstr "" msgid "Date at filter" msgstr "" +#. module: account_financial_report +#: model:account.financial.report.column,name:account_financial_report.open_items_report_wizard_column_date_due +msgid "Date due" +msgstr "" + #. module: account_financial_report #: code:addons/account_financial_report/report/vat_report_xlsx.py:0 #, python-format @@ -613,6 +663,8 @@ msgstr "" #: 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/trial_balance_xlsx.py:0 +#: model:account.financial.report.column,name:account_financial_report.general_ledger_report_wizard_column_debit +#: model:account.financial.report.column,name:account_financial_report.journal_ledger_report_wizard_column_debit #: 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 @@ -638,6 +690,7 @@ msgstr "" #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_age_report_configuration__display_name #: model:ir.model.fields,field_description:account_financial_report.field_account_age_report_configuration_line__display_name +#: model:ir.model.fields,field_description:account_financial_report.field_account_financial_report_column__display_name #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__display_name #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__display_name #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__display_name @@ -740,6 +793,9 @@ msgstr "" #: 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:account.financial.report.column,name:account_financial_report.general_ledger_report_wizard_column_entry +#: model:account.financial.report.column,name:account_financial_report.journal_ledger_report_wizard_column_entry +#: model:account.financial.report.column,name:account_financial_report.open_items_report_wizard_column_entry #: 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 @@ -782,6 +838,16 @@ msgstr "" msgid "Export XLSX" msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_account_financial_report_column__expression_label +msgid "Expression Label" +msgstr "" + +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_account_financial_report_column__field_type +msgid "Field Type" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__account_ids #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__account_ids @@ -823,11 +889,24 @@ msgstr "" msgid "Filter partners" msgstr "" +#. module: account_financial_report +#: model_terms:ir.ui.view,arch_db:account_financial_report.journal_ledger_wizard +#: model_terms:ir.ui.view,arch_db:account_financial_report.open_items_wizard +msgid "Filters" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__foreign_currency msgid "Foreign Currency" msgstr "" +#. module: account_financial_report +#: model:account.financial.report.column,name:account_financial_report.general_ledger_report_wizard_column_foreign_currency +#: model:account.financial.report.column,name:account_financial_report.journal_ledger_report_wizard_column_foreign_currency +#: model:account.financial.report.column,name:account_financial_report.open_items_report_wizard_column_foreign_currency +msgid "Foreign currency" +msgstr "" + #. 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 @@ -957,6 +1036,7 @@ msgstr "" #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_age_report_configuration__id #: model:ir.model.fields,field_description:account_financial_report.field_account_age_report_configuration_line__id +#: model:ir.model.fields,field_description:account_financial_report.field_account_financial_report_column__id #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__id #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__id @@ -1020,6 +1100,8 @@ msgstr "" #: 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 +#: model:account.financial.report.column,name:account_financial_report.general_ledger_report_wizard_column_journal +#: model:account.financial.report.column,name:account_financial_report.open_items_report_wizard_column_journal #: 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 @@ -1080,9 +1162,15 @@ msgstr "" msgid "Journals" msgstr "" +#. module: account_financial_report +#: model:account.financial.report.column,name:account_financial_report.journal_ledger_report_wizard_column_ref_label +msgid "Label" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_age_report_configuration____last_update #: model:ir.model.fields,field_description:account_financial_report.field_account_age_report_configuration_line____last_update +#: model:ir.model.fields,field_description:account_financial_report.field_account_financial_report_column____last_update #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard____last_update #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard____last_update #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard____last_update @@ -1095,6 +1183,7 @@ msgstr "" #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_age_report_configuration__write_uid #: model:ir.model.fields,field_description:account_financial_report.field_account_age_report_configuration_line__write_uid +#: model:ir.model.fields,field_description:account_financial_report.field_account_financial_report_column__write_uid #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__write_uid #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__write_uid #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__write_uid @@ -1107,6 +1196,7 @@ msgstr "" #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_account_age_report_configuration__write_date #: model:ir.model.fields,field_description:account_financial_report.field_account_age_report_configuration_line__write_date +#: model:ir.model.fields,field_description:account_financial_report.field_account_financial_report_column__write_date #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_report_wizard__write_date #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__write_date #: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard__write_date @@ -1128,6 +1218,11 @@ msgstr "" msgid "Level %s" msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_account_financial_report_column__limit +msgid "Limit" +msgstr "" + #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:0 #: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard__limit_hierarchy_level @@ -1141,6 +1236,16 @@ msgstr "" msgid "Line" msgstr "" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_account_financial_report_column +msgid "Manage column options in financial reports" +msgstr "" + +#. module: account_financial_report +#: model:account.financial.report.column,name:account_financial_report.general_ledger_report_wizard_column_matching_number +msgid "Matching number" +msgstr "" + #. module: account_financial_report #: code:addons/account_financial_report/report/general_ledger.py:0 #: code:addons/account_financial_report/report/general_ledger.py:0 @@ -1190,6 +1295,7 @@ msgstr "" #: code:addons/account_financial_report/report/vat_report_xlsx.py:0 #: model:ir.model.fields,field_description:account_financial_report.field_account_age_report_configuration__name #: model:ir.model.fields,field_description:account_financial_report.field_account_age_report_configuration_line__name +#: model:ir.model.fields,field_description:account_financial_report.field_account_financial_report_column__name #: 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 @@ -1333,6 +1439,7 @@ msgstr "" #. module: account_financial_report #: code:addons/account_financial_report/report/open_items_xlsx.py:0 +#: model:account.financial.report.column,name:account_financial_report.open_items_report_wizard_column_original #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_lines_header #, python-format msgid "Original" @@ -1345,6 +1452,9 @@ msgstr "" #: 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:account.financial.report.column,name:account_financial_report.general_ledger_report_wizard_column_partner +#: model:account.financial.report.column,name:account_financial_report.journal_ledger_report_wizard_column_partner +#: model:account.financial.report.column,name:account_financial_report.open_items_report_wizard_column_partner #: 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 @@ -1439,6 +1549,11 @@ msgstr "" msgid "Print" msgstr "" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_res_config_settings +msgid "Procurement purchase grouping settings" +msgstr "" + #. module: account_financial_report #: code:addons/account_financial_report/report/general_ledger_xlsx.py:0 #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines @@ -1474,6 +1589,8 @@ msgstr "" #: 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:account.financial.report.column,name:account_financial_report.general_ledger_report_wizard_column_ref_label +#: model:account.financial.report.column,name:account_financial_report.open_items_report_wizard_column_ref_label #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header #, python-format msgid "Ref - Label" @@ -1484,10 +1601,16 @@ msgstr "" msgid "Report Action" msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_account_financial_report_column__res_model +msgid "Res Model" +msgstr "" + #. 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:0 #: code:addons/account_financial_report/report/open_items_xlsx.py:0 +#: model:account.financial.report.column,name:account_financial_report.open_items_report_wizard_column_residual #: 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_header @@ -1497,6 +1620,8 @@ msgstr "" #. module: account_financial_report #: code:addons/account_financial_report/report/journal_ledger_xlsx.py:0 +#: model:account.financial.report.column,name:account_financial_report.journal_ledger_report_wizard_column_sequence +#: model:ir.model.fields,field_description:account_financial_report.field_account_financial_report_column__sequence #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header #, python-format msgid "Sequence" @@ -1506,6 +1631,7 @@ msgstr "" #: 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,field_description:account_financial_report.field_account_financial_report_column__is_visible #: 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 @@ -1687,6 +1813,7 @@ msgstr "" #. 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 +#: model:account.financial.report.column,name:account_financial_report.general_ledger_report_wizard_column_taxes #: model:ir.model.fields.selection,name:account_financial_report.selection__general_ledger_report_wizard__grouped_by__taxes #: 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 diff --git a/account_financial_report/models/account_financial_report_column.py b/account_financial_report/models/account_financial_report_column.py index 05939177..780d3af9 100644 --- a/account_financial_report/models/account_financial_report_column.py +++ b/account_financial_report/models/account_financial_report_column.py @@ -1,4 +1,4 @@ -# Copyright 2021 Tecnativa - Carlos Dauden +# Copyright 2025 Tecnativa - Carlos Dauden # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from odoo import fields, models @@ -10,7 +10,8 @@ class AccountFinancialReportColumn(models.Model): res_model = fields.Char() sequence = fields.Integer() - name = fields.Char(required=True) + name = fields.Char(required=True, translate=True) expression_label = fields.Char(required=True) - is_visible = fields.Boolean(default=True) - # user_id = fields.Many2one(comodel_name="res.users") + is_visible = fields.Boolean(string="Show", default=True) + field_type = fields.Char() + limit = fields.Integer() diff --git a/account_financial_report/readme/CONTRIBUTORS.rst b/account_financial_report/readme/CONTRIBUTORS.rst index f8373c58..722eee80 100644 --- a/account_financial_report/readme/CONTRIBUTORS.rst +++ b/account_financial_report/readme/CONTRIBUTORS.rst @@ -25,6 +25,7 @@ * Alexandre D. Díaz * Víctor Martínez * Carolina Fernandez + * Carlos Dauden * `Sygel `__: diff --git a/account_financial_report/readme/DESCRIPTION.rst b/account_financial_report/readme/DESCRIPTION.rst index 353fa34e..04e865e6 100644 --- a/account_financial_report/readme/DESCRIPTION.rst +++ b/account_financial_report/readme/DESCRIPTION.rst @@ -8,6 +8,9 @@ Invoicing / Reporting / OCA accounting reports. - VAT Report - Journal Ledger +It is possible to select the columns to show and limit the size of some of them from the +columns page. + 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. diff --git a/account_financial_report/readme/HISTORY.rst b/account_financial_report/readme/HISTORY.rst index 1d53d794..0c9bccd5 100644 --- a/account_financial_report/readme/HISTORY.rst +++ b/account_financial_report/readme/HISTORY.rst @@ -1,3 +1,8 @@ +15.0.3.2.3 (2025-02-17) +~~~~~~~~~~~~~~~~~~~~~~~ + +* Added the option to select columns to display and the ability to limit the width of the text + 11.0.2.5.0 (2019-04-26) ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/account_financial_report/readme/ROADMAP.rst b/account_financial_report/readme/ROADMAP.rst index 46ff6c43..b7ae9bb6 100644 --- a/account_financial_report/readme/ROADMAP.rst +++ b/account_financial_report/readme/ROADMAP.rst @@ -5,3 +5,6 @@ * It would be nice to have in reports a column indicating the state of the entries when the option "All Entries" is selected in "Target Moves" field in a wizard +* Adapt reports so that the order of the columns displayed is dynamic +* Remove duplicated options to show columns (it has not been made in a stable version so + as not to generate confusion in users) diff --git a/account_financial_report/report/abstract_report.py b/account_financial_report/report/abstract_report.py index 16c11045..e06d7869 100644 --- a/account_financial_report/report/abstract_report.py +++ b/account_financial_report/report/abstract_report.py @@ -1,4 +1,5 @@ # Copyright 2020 ForgeFlow S.L. (https://www.forgeflow.com) +# Copyright 2025 Tecnativa - Carlos Dauden # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import api, models @@ -164,5 +165,13 @@ class AgedPartnerBalanceReport(models.AbstractModel): def _get_report_values(self, docids, data): wizard = self.env[data["wizard_name"]].browse(data["wizard_id"]) res = {f"{c.expression_label}_visible": c.is_visible for c in wizard.column_ids} + res.update( + { + f"{c.expression_label}_limit": c.limit + for c in wizard.column_ids + if c.field_type == "string" + } + ) + # Pass function to be called in report res["limit_text"] = wizard._limit_text return res diff --git a/account_financial_report/report/templates/general_ledger.xml b/account_financial_report/report/templates/general_ledger.xml index f19a73b5..61d73fa1 100644 --- a/account_financial_report/report/templates/general_ledger.xml +++ b/account_financial_report/report/templates/general_ledger.xml @@ -514,14 +514,14 @@ view-type="form" > diff --git a/account_financial_report/report/templates/journal_ledger.xml b/account_financial_report/report/templates/journal_ledger.xml index 9a446a54..0ff14469 100644 --- a/account_financial_report/report/templates/journal_ledger.xml +++ b/account_financial_report/report/templates/journal_ledger.xml @@ -119,7 +119,7 @@
- +
Entry
-
Date
Date
+
Account
-
+
Partner
-
+
Ref - Label
-
Taxes
-
Debit
-
+
Taxes
+
Debit
+
Credit
- +
Cur.
@@ -172,16 +204,20 @@