From cf61a691a7c71c1d1c7456b140e46eb04a52a040 Mon Sep 17 00:00:00 2001 From: Carlos Dauden Date: Fri, 31 Jul 2020 01:43:41 +0200 Subject: [PATCH] [12.0][IMP] account_financial_report: Add new option to don't show move lines grouped by partner regardless account type TT24992 --- .../i18n/account_financial_report.pot | 187 +++++++++++++- account_financial_report/i18n/es.po | 235 ++++++++++++++---- .../report/general_ledger.py | 13 + .../wizard/general_ledger_wizard.py | 5 + .../wizard/general_ledger_wizard_view.xml | 5 + 5 files changed, 396 insertions(+), 49 deletions(-) diff --git a/account_financial_report/i18n/account_financial_report.pot b/account_financial_report/i18n/account_financial_report.pot index 46dd39c3..91327033 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 12.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-30 23:14+0000\n" +"PO-Revision-Date: 2020-07-30 23:14+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -257,6 +259,16 @@ msgstr "" msgid "Aged Partner Balance XLSX" msgstr "" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_aged_open_invoices_webkit +msgid "Aged open invoices" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_account_aged_trial_balance_webkit +msgid "Aged partner balanced" +msgstr "" + #. module: account_financial_report #: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:64 #, python-format @@ -424,7 +436,7 @@ msgid "Centralized" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger.py:1438 +#: code:addons/account_financial_report/report/general_ledger.py:1451 #, python-format msgid "Centralized Entries" msgstr "" @@ -461,6 +473,11 @@ msgstr "" msgid "Code" msgstr "" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_account_common_balance_report +msgid "Common Balance Report" +msgstr "" + #. module: account_financial_report #: code:addons/account_financial_report/report/journal_ledger_xlsx.py:165 #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_wizard__company_id @@ -1169,6 +1186,11 @@ msgstr "" msgid "General Ledger -" msgstr "" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_general_ledger_webkit +msgid "General Ledger Report" +msgstr "" + #. module: account_financial_report #: model:ir.model,name:account_financial_report.model_general_ledger_report_wizard msgid "General Ledger Report Wizard" @@ -1289,6 +1311,12 @@ msgstr "" msgid "If flagged, no details will be displayed in the General Ledger report (the webkit one only), only centralized amounts per period." msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,help:account_financial_report.field_general_ledger_report_wizard__partner_ungrouped +#: model:ir.model.fields,help:account_financial_report.field_report_general_ledger__partner_ungrouped +msgid "If set moves are not grouped by partner in any case" +msgstr "" + #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_lines_header msgid "Initial\n" @@ -1401,6 +1429,11 @@ msgstr "" msgid "Journals" msgstr "" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_print_journal_webkit +msgid "Journals Report" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line__label #: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line__label @@ -1645,8 +1678,8 @@ msgid "No limit" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger.py:763 -#: code:addons/account_financial_report/report/general_ledger.py:1142 +#: code:addons/account_financial_report/report/general_ledger.py:776 +#: code:addons/account_financial_report/report/general_ledger.py:1155 #: code:addons/account_financial_report/report/open_items.py:307 #: code:addons/account_financial_report/report/open_items.py:556 #, python-format @@ -1693,6 +1726,11 @@ msgstr "" msgid "Only Posted Moves" msgstr "" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_open_invoices_webkit +msgid "Open Invoices Report" +msgstr "" + #. module: account_financial_report #: code:addons/account_financial_report/report/open_items_xlsx.py:13 #: model:ir.actions.act_window,name:account_financial_report.action_open_items_wizard @@ -1783,6 +1821,11 @@ msgid "Partner\n" " cumul aged balance" msgstr "" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_partner_balance_webkit +msgid "Partner Balance Report" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_report_journal_ledger_move_line__partner_id msgid "Partner ID" @@ -1794,6 +1837,11 @@ msgstr "" msgid "Partner Initial balance" msgstr "" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_partners_ledger_webkit +msgid "Partner Ledger Report" +msgstr "" + #. module: account_financial_report #: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:225 #, python-format @@ -1809,6 +1857,12 @@ msgstr "" msgid "Partner ending balance" msgstr "" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__partner_ungrouped +#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger__partner_ungrouped +msgid "Partner ungrouped" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_wizard__payable_accounts_only #: model:ir.model.fields,field_description:account_financial_report.field_open_items_report_wizard__payable_accounts_only @@ -2205,7 +2259,7 @@ msgid "Taxtags" msgstr "" #. module: account_financial_report -#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:183 +#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:187 #, python-format msgid "The Company in the General Ledger Report Wizard and in Date Range must be the same." msgstr "" @@ -2258,6 +2312,11 @@ msgstr "" msgid "Trial Balance -" msgstr "" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_trial_balance_webkit +msgid "Trial Balance Report" +msgstr "" + #. module: account_financial_report #: model:ir.model,name:account_financial_report.model_trial_balance_report_wizard msgid "Trial Balance Report Wizard" @@ -2347,6 +2406,11 @@ msgstr "" msgid "Yes" msgstr "" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_journal_report_wizard +msgid "journal.report.wizard" +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 @@ -2417,6 +2481,31 @@ msgstr "" msgid "report_aged_partner_balance_partner" msgstr "" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_aged_partner_balance_qweb +msgid "report_aged_partner_balance_qweb" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_aged_partner_balance_qweb_account +msgid "report_aged_partner_balance_qweb_account" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_aged_partner_balance_qweb_line +msgid "report_aged_partner_balance_qweb_line" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_aged_partner_balance_qweb_move_line +msgid "report_aged_partner_balance_qweb_move_line" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_aged_partner_balance_qweb_partner +msgid "report_aged_partner_balance_qweb_partner" +msgstr "" + #. module: account_financial_report #: model:ir.model,name:account_financial_report.model_report_general_ledger msgid "report_general_ledger" @@ -2437,6 +2526,26 @@ msgstr "" msgid "report_general_ledger_partner" msgstr "" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_general_ledger_qweb +msgid "report_general_ledger_qweb" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_general_ledger_qweb_account +msgid "report_general_ledger_qweb_account" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_general_ledger_qweb_move_line +msgid "report_general_ledger_qweb_move_line" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_general_ledger_qweb_partner +msgid "report_general_ledger_qweb_partner" +msgstr "" + #. module: account_financial_report #: model:ir.model,name:account_financial_report.model_report_journal_ledger msgid "report_journal_ledger" @@ -2467,6 +2576,36 @@ msgstr "" msgid "report_journal_ledger_report_tax_line" msgstr "" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_journal_qweb +msgid "report_journal_qweb" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_journal_qweb_journal +msgid "report_journal_qweb_journal" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_journal_qweb_journal_tax_line +msgid "report_journal_qweb_journal_tax_line" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_journal_qweb_move +msgid "report_journal_qweb_move" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_journal_qweb_move_line +msgid "report_journal_qweb_move_line" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_journal_qweb_report_tax_line +msgid "report_journal_qweb_report_tax_line" +msgstr "" + #. module: account_financial_report #: model:ir.model,name:account_financial_report.model_report_open_items msgid "report_open_items" @@ -2487,6 +2626,31 @@ msgstr "" msgid "report_open_items_partner" msgstr "" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_open_items_qweb +msgid "report_open_items_qweb" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_open_items_qweb_account +msgid "report_open_items_qweb_account" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_open_items_qweb_move_line +msgid "report_open_items_qweb_move_line" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_open_items_qweb_partner +msgid "report_open_items_qweb_partner" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_qweb_abstract +msgid "report_qweb_abstract" +msgstr "" + #. module: account_financial_report #: model:ir.model,name:account_financial_report.model_report_trial_balance msgid "report_trial_balance" @@ -2502,6 +2666,21 @@ msgstr "" msgid "report_trial_balance_partner" msgstr "" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_trial_balance_qweb +msgid "report_trial_balance_qweb" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_trial_balance_qweb_account +msgid "report_trial_balance_qweb_account" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_trial_balance_qweb_partner +msgid "report_trial_balance_qweb_partner" +msgstr "" + #. module: account_financial_report #: model:ir.model,name:account_financial_report.model_report_vat_report msgid "report_vat_report" diff --git a/account_financial_report/i18n/es.po b/account_financial_report/i18n/es.po index 9f5845c3..f53176e8 100644 --- a/account_financial_report/i18n/es.po +++ b/account_financial_report/i18n/es.po @@ -10,16 +10,16 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-18 22:19+0000\n" -"PO-Revision-Date: 2020-05-18 07:19+0000\n" -"Last-Translator: Enric Tobella \n" +"POT-Creation-Date: 2020-07-30 23:14+0000\n" +"PO-Revision-Date: 2020-07-31 01:30+0200\n" +"Last-Translator: Carlos Dauden \n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.10\n" +"X-Generator: Poedit 2.3\n" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_lines_header @@ -134,10 +134,8 @@ msgstr "Tipo de Cuenta" #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__account_type_ids -#, fuzzy -#| msgid "Account Type" msgid "Account Types" -msgstr "Tipo de Cuenta" +msgstr "Tipos de cuenta" #. module: account_financial_report #: code:addons/account_financial_report/report/trial_balance_xlsx.py:109 @@ -271,6 +269,16 @@ msgstr "Asistente Calidad de la deuda de las empresas" msgid "Aged Partner Balance XLSX" msgstr "Saldos de empresa por antigüedad XLSX" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_aged_open_invoices_webkit +msgid "Aged open invoices" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_account_aged_trial_balance_webkit +msgid "Aged partner balanced" +msgstr "" + #. module: account_financial_report #: code:addons/account_financial_report/wizard/journal_ledger_wizard.py:64 #, python-format @@ -438,7 +446,7 @@ msgid "Centralized" msgstr "Centralizado" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger.py:1438 +#: code:addons/account_financial_report/report/general_ledger.py:1451 #, python-format msgid "Centralized Entries" msgstr "Centralizar las entradas" @@ -475,6 +483,11 @@ msgstr "Cuentas Hijas" msgid "Code" msgstr "Código" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_account_common_balance_report +msgid "Common Balance Report" +msgstr "" + #. module: account_financial_report #: code:addons/account_financial_report/report/journal_ledger_xlsx.py:165 #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_wizard__company_id @@ -1206,6 +1219,11 @@ msgstr "Libro mayor" msgid "General Ledger -" msgstr "Libro mayor" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_general_ledger_webkit +msgid "General Ledger Report" +msgstr "" + #. module: account_financial_report #: model:ir.model,name:account_financial_report.model_general_ledger_report_wizard msgid "General Ledger Report Wizard" @@ -1334,6 +1352,14 @@ 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:ir.model.fields,help:account_financial_report.field_general_ledger_report_wizard__partner_ungrouped +#: model:ir.model.fields,help:account_financial_report.field_report_general_ledger__partner_ungrouped +msgid "If set moves are not grouped by partner in any case" +msgstr "" +"Si esta establecido los movimientos aparecerán agrupados por empresa en " +"ningún caso" + #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.report_trial_balance_lines_header msgid "" @@ -1449,6 +1475,11 @@ msgstr "Libro diario XLSX" msgid "Journals" msgstr "Diarios" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_print_journal_webkit +msgid "Journals Report" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line__label #: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line__label @@ -1693,8 +1724,8 @@ msgid "No limit" msgstr "Sin límite" #. module: account_financial_report -#: code:addons/account_financial_report/report/general_ledger.py:763 -#: code:addons/account_financial_report/report/general_ledger.py:1142 +#: code:addons/account_financial_report/report/general_ledger.py:776 +#: code:addons/account_financial_report/report/general_ledger.py:1155 #: code:addons/account_financial_report/report/open_items.py:307 #: code:addons/account_financial_report/report/open_items.py:556 #, python-format @@ -1741,6 +1772,11 @@ msgstr "Mayor" msgid "Only Posted Moves" msgstr "Solo Asientos Posteados" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_open_invoices_webkit +msgid "Open Invoices Report" +msgstr "" + #. module: account_financial_report #: code:addons/account_financial_report/report/open_items_xlsx.py:13 #: model:ir.actions.act_window,name:account_financial_report.action_open_items_wizard @@ -1787,10 +1823,8 @@ msgstr "Inicial" #. module: account_financial_report #: model_terms:ir.ui.view,arch_db:account_financial_report.general_ledger_wizard -#, fuzzy -#| msgid "Options" msgid "Other options" -msgstr "Opciones" +msgstr "Otras opciones" #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_report_trial_balance_account__parent_id @@ -1834,6 +1868,11 @@ msgid "" " cumul aged balance" msgstr "Saldo Acumulado de Empresa" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_partner_balance_webkit +msgid "Partner Balance Report" +msgstr "" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_report_journal_ledger_move_line__partner_id msgid "Partner ID" @@ -1845,6 +1884,11 @@ msgstr "Cliente" msgid "Partner Initial balance" msgstr "Saldo Inicial de empresa" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_partners_ledger_webkit +msgid "Partner Ledger Report" +msgstr "" + #. module: account_financial_report #: code:addons/account_financial_report/report/aged_partner_balance_xlsx.py:225 #, python-format @@ -1860,6 +1904,12 @@ msgstr "Saldo Acumulado de Empresa" msgid "Partner ending balance" msgstr "Saldo final de empresa" +#. module: account_financial_report +#: model:ir.model.fields,field_description:account_financial_report.field_general_ledger_report_wizard__partner_ungrouped +#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger__partner_ungrouped +msgid "Partner ungrouped" +msgstr "No agrupar por empresa" + #. module: account_financial_report #: model:ir.model.fields,field_description:account_financial_report.field_aged_partner_balance_wizard__payable_accounts_only #: model:ir.model.fields,field_description:account_financial_report.field_open_items_report_wizard__payable_accounts_only @@ -2257,7 +2307,7 @@ msgid "Taxtags" msgstr "Etiquetas de impuestos" #. module: account_financial_report -#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:183 +#: code:addons/account_financial_report/wizard/general_ledger_wizard.py:187 #, python-format msgid "" "The Company in the General Ledger Report Wizard and in Date Range must be " @@ -2321,6 +2371,11 @@ msgstr "Balance de Sumas y Saldos" msgid "Trial Balance -" msgstr "Balance de Sumas y Saldos -" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_trial_balance_webkit +msgid "Trial Balance Report" +msgstr "" + #. module: account_financial_report #: model:ir.model,name:account_financial_report.model_trial_balance_report_wizard msgid "Trial Balance Report Wizard" @@ -2424,6 +2479,11 @@ msgstr "Cuenta con Nombre" msgid "Yes" msgstr "Si" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_journal_report_wizard +msgid "journal.report.wizard" +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 @@ -2494,6 +2554,31 @@ msgstr "informe_linea_de_asiento_saldos_empresa_por_antigüedad" msgid "report_aged_partner_balance_partner" msgstr "informe_saldo_empresa_por_antigüedad" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_aged_partner_balance_qweb +msgid "report_aged_partner_balance_qweb" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_aged_partner_balance_qweb_account +msgid "report_aged_partner_balance_qweb_account" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_aged_partner_balance_qweb_line +msgid "report_aged_partner_balance_qweb_line" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_aged_partner_balance_qweb_move_line +msgid "report_aged_partner_balance_qweb_move_line" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_aged_partner_balance_qweb_partner +msgid "report_aged_partner_balance_qweb_partner" +msgstr "" + #. module: account_financial_report #: model:ir.model,name:account_financial_report.model_report_general_ledger msgid "report_general_ledger" @@ -2514,6 +2599,26 @@ msgstr "informe_linea_asiento_libro_mayor" msgid "report_general_ledger_partner" msgstr "informe_libro_mayor_empresa" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_general_ledger_qweb +msgid "report_general_ledger_qweb" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_general_ledger_qweb_account +msgid "report_general_ledger_qweb_account" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_general_ledger_qweb_move_line +msgid "report_general_ledger_qweb_move_line" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_general_ledger_qweb_partner +msgid "report_general_ledger_qweb_partner" +msgstr "" + #. module: account_financial_report #: model:ir.model,name:account_financial_report.model_report_journal_ledger msgid "report_journal_ledger" @@ -2544,6 +2649,36 @@ msgstr "informe_linea_asiento_libro_diario" msgid "report_journal_ledger_report_tax_line" msgstr "informe_linea_impuesto_libro_diario" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_journal_qweb +msgid "report_journal_qweb" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_journal_qweb_journal +msgid "report_journal_qweb_journal" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_journal_qweb_journal_tax_line +msgid "report_journal_qweb_journal_tax_line" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_journal_qweb_move +msgid "report_journal_qweb_move" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_journal_qweb_move_line +msgid "report_journal_qweb_move_line" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_journal_qweb_report_tax_line +msgid "report_journal_qweb_report_tax_line" +msgstr "" + #. module: account_financial_report #: model:ir.model,name:account_financial_report.model_report_open_items msgid "report_open_items" @@ -2564,6 +2699,31 @@ msgstr "informe_linea_asiento_elementos_abiertos" msgid "report_open_items_partner" msgstr "informe_elementos_abiertos_empresa" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_open_items_qweb +msgid "report_open_items_qweb" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_open_items_qweb_account +msgid "report_open_items_qweb_account" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_open_items_qweb_move_line +msgid "report_open_items_qweb_move_line" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_open_items_qweb_partner +msgid "report_open_items_qweb_partner" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_qweb_abstract +msgid "report_qweb_abstract" +msgstr "" + #. module: account_financial_report #: model:ir.model,name:account_financial_report.model_report_trial_balance msgid "report_trial_balance" @@ -2579,6 +2739,21 @@ msgstr "informe_cuenta_balance_sumas_y_saldos" msgid "report_trial_balance_partner" msgstr "informe_balance_sumas_y_saldos_empresa" +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_trial_balance_qweb +msgid "report_trial_balance_qweb" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_trial_balance_qweb_account +msgid "report_trial_balance_qweb_account" +msgstr "" + +#. module: account_financial_report +#: model:ir.model,name:account_financial_report.model_report_trial_balance_qweb_partner +msgid "report_trial_balance_qweb_partner" +msgstr "" + #. module: account_financial_report #: model:ir.model,name:account_financial_report.model_report_vat_report msgid "report_vat_report" @@ -2618,33 +2793,3 @@ msgstr "ancho: 38.92%;" #: model_terms:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header msgid "width: 8.11%;" msgstr "ancho: 8.11%;" - -#~ 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" diff --git a/account_financial_report/report/general_ledger.py b/account_financial_report/report/general_ledger.py index b1b3ed47..5beb736d 100644 --- a/account_financial_report/report/general_ledger.py +++ b/account_financial_report/report/general_ledger.py @@ -52,6 +52,10 @@ class GeneralLedgerReport(models.TransientModel): 'analytic.group_analytic_accounting' ) ) + partner_ungrouped = fields.Boolean( + string='Partner ungrouped', + help='If set moves are not grouped by partner in any case' + ) # Data fields, used to browse report data account_ids = fields.One2many( @@ -404,8 +408,17 @@ WITH a.id, a.code, a.name, + """ + if self.partner_ungrouped: + query_inject_account += """ + FALSE AS is_partner_account, + """ + else: + query_inject_account += """ a.internal_type IN ('payable', 'receivable') AS is_partner_account, + """ + query_inject_account += """ a.user_type_id, a.currency_id FROM diff --git a/account_financial_report/wizard/general_ledger_wizard.py b/account_financial_report/wizard/general_ledger_wizard.py index 83f416f8..b700e4b0 100644 --- a/account_financial_report/wizard/general_ledger_wizard.py +++ b/account_financial_report/wizard/general_ledger_wizard.py @@ -91,6 +91,10 @@ class GeneralLedgerReportWizard(models.TransientModel): 'will display initial and final balance in that currency.', default=lambda self: self._default_foreign_currency(), ) + partner_ungrouped = fields.Boolean( + string='Partner ungrouped', + help='If set moves are not grouped by partner in any case' + ) def _init_date_from(self): """set start date to begin of current year if fiscal year running""" @@ -249,6 +253,7 @@ class GeneralLedgerReportWizard(models.TransientModel): 'filter_journal_ids': [(6, 0, self.account_journal_ids.ids)], 'centralize': self.centralize, 'fy_start_date': self.fy_start_date, + 'partner_ungrouped': self.partner_ungrouped, } def _export(self, report_type): diff --git a/account_financial_report/wizard/general_ledger_wizard_view.xml b/account_financial_report/wizard/general_ledger_wizard_view.xml index eb67d759..d7569e28 100644 --- a/account_financial_report/wizard/general_ledger_wizard_view.xml +++ b/account_financial_report/wizard/general_ledger_wizard_view.xml @@ -40,6 +40,11 @@