[account_financial_report] adds the following features to Trial Balance:
- Adds 'Period balance' column - Renames the option 'Hide accounts at 0'. Means no initial, no debit, credit or ending balance for the period. - Fixes logic to remove lines with 0 activity for the period. - improve the calculation in the Trial Balance of undistributed profits/losses account, and provide a footer note to the user explaining why will the ending balances will not be zero, but the period's total profit and loss. - add an extra line for P&L application so that the trial balance zeroes in the balance, and total debits = total credits - refactoring of the unaffected earnings reporting in the general ledger and trial balance.
This commit is contained in:
Jordi Ballester Alomar
committed by
chaule97
chaule97
parent
9afe86cb7e
commit
c90bafbb61
@@ -109,10 +109,15 @@ msgstr ""
|
||||
msgid "Account Type"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_financial_report
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:108
|
||||
#, 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/open_items_xlsx.py:61
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:100
|
||||
#: 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
|
||||
@@ -257,7 +262,7 @@ msgstr ""
|
||||
#: 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/open_items_xlsx.py:59
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:98
|
||||
#: 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
|
||||
#: 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
|
||||
@@ -270,7 +275,7 @@ msgstr ""
|
||||
#: 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/open_items_xlsx.py:59
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:98
|
||||
#: 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
|
||||
#: 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
|
||||
@@ -462,6 +467,18 @@ msgstr ""
|
||||
msgid "Computed Accounts"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_financial_report
|
||||
#: model:ir.model.fields,help:account_financial_report.field_report_trial_balance_hierarchy_on
|
||||
#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard_hierarchy_on
|
||||
msgid "Computed Accounts: Use when the account group have codes\n"
|
||||
" that represent prefixes of the actual accounts.\n"
|
||||
"\n"
|
||||
" Child Accounts: Use when your account groups are hierarchical.\n"
|
||||
"\n"
|
||||
" No hierarchy: Use to display just the accounts, without any grouping.\n"
|
||||
" "
|
||||
msgstr ""
|
||||
|
||||
#. module: account_financial_report
|
||||
#: model:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
|
||||
msgid "Cost\n"
|
||||
@@ -553,7 +570,7 @@ msgstr ""
|
||||
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:38
|
||||
#: 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:66
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:70
|
||||
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_credit
|
||||
#: model:ir.model.fields,field_description:account_financial_report.field_report_journal_ledger_journal_credit
|
||||
#: model:ir.model.fields,field_description:account_financial_report.field_report_journal_ledger_move_line_credit
|
||||
@@ -618,8 +635,8 @@ msgstr ""
|
||||
#. module: account_financial_report
|
||||
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:53
|
||||
#: code:addons/account_financial_report/report/open_items_xlsx.py:36
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:40
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:77
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:44
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:85
|
||||
#: model:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
|
||||
#: model:ir.ui.view,arch_db:account_financial_report.report_journal_ledger_journal_table_header
|
||||
#: model:ir.ui.view,arch_db:account_financial_report.report_open_items_lines
|
||||
@@ -753,7 +770,7 @@ msgstr ""
|
||||
#. module: account_financial_report
|
||||
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:71
|
||||
#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:168
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:95
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:103
|
||||
#: 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
|
||||
#, python-format
|
||||
@@ -770,7 +787,7 @@ msgstr ""
|
||||
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:32
|
||||
#: 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:62
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:66
|
||||
#: model:ir.model.fields,field_description:account_financial_report.field_report_general_ledger_move_line_debit
|
||||
#: model:ir.model.fields,field_description:account_financial_report.field_report_journal_ledger_journal_debit
|
||||
#: model:ir.model.fields,field_description:account_financial_report.field_report_journal_ledger_move_line_debit
|
||||
@@ -881,10 +898,10 @@ msgstr ""
|
||||
#. module: account_financial_report
|
||||
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:162
|
||||
#: code:addons/account_financial_report/report/open_items_xlsx.py:117
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:33
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:48
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:70
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:85
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:37
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:52
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:78
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:93
|
||||
#: model:ir.ui.view,arch_db:account_financial_report.report_general_ledger_ending_cumul
|
||||
#: model:ir.ui.view,arch_db:account_financial_report.report_trial_balance_lines_header
|
||||
#, python-format
|
||||
@@ -1068,7 +1085,7 @@ msgstr ""
|
||||
#. module: account_financial_report
|
||||
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:72
|
||||
#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:169
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:96
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:104
|
||||
#, python-format
|
||||
msgid "From: %s To: %s"
|
||||
msgstr ""
|
||||
@@ -1122,7 +1139,7 @@ msgstr ""
|
||||
#. module: account_financial_report
|
||||
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:77
|
||||
#: code:addons/account_financial_report/report/open_items_xlsx.py:62
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:101
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:109
|
||||
#: 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
|
||||
@@ -1130,20 +1147,28 @@ msgstr ""
|
||||
msgid "Hide"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_financial_report
|
||||
#: 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
|
||||
#: model:ir.model.fields,field_description:account_financial_report.field_report_trial_balance_hide_account_balance_at_0
|
||||
msgid "Hide Account Balance At 0"
|
||||
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_trial_balance_report_wizard_hide_account_balance_at_0
|
||||
msgid "Hide account ending balance at 0"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_financial_report
|
||||
#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard_hide_account_at_0
|
||||
msgid "Hide accounts at 0"
|
||||
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
|
||||
@@ -1235,9 +1260,9 @@ msgstr ""
|
||||
#. module: account_financial_report
|
||||
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:150
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:21
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:44
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:58
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:81
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:48
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:62
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:89
|
||||
#: model:ir.ui.view,arch_db:account_financial_report.report_general_ledger_lines
|
||||
#, python-format
|
||||
msgid "Initial balance"
|
||||
@@ -1501,7 +1526,7 @@ msgstr ""
|
||||
#: 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/open_items_xlsx.py:64
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:103
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:111
|
||||
#: model:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
|
||||
#, python-format
|
||||
msgid "No"
|
||||
@@ -1513,6 +1538,12 @@ msgstr ""
|
||||
msgid "No group"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_financial_report
|
||||
#: selection:report_trial_balance,hierarchy_on:0
|
||||
#: selection:trial.balance.report.wizard,hierarchy_on:0
|
||||
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
|
||||
@@ -1608,7 +1639,7 @@ msgstr ""
|
||||
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:26
|
||||
#: code:addons/account_financial_report/report/journal_ledger_xlsx.py:44
|
||||
#: code:addons/account_financial_report/report/open_items_xlsx.py:21
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:57
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:61
|
||||
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_account_partner_ids
|
||||
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_line_partner
|
||||
#: model:ir.model.fields,field_description:account_financial_report.field_report_aged_partner_balance_move_line_partner
|
||||
@@ -1706,6 +1737,20 @@ msgstr ""
|
||||
msgid "Percents"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_financial_report
|
||||
#: model:ir.model.fields,field_description:account_financial_report.field_report_trial_balance_account_period_balance
|
||||
#: model:ir.model.fields,field_description:account_financial_report.field_report_trial_balance_partner_period_balance
|
||||
msgid "Period Balance"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_financial_report
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:33
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:74
|
||||
#: model:ir.ui.view,arch_db:account_financial_report.report_trial_balance_lines_header
|
||||
#, python-format
|
||||
msgid "Period balance"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_financial_report
|
||||
#: model:ir.ui.view,arch_db:account_financial_report.journal_ledger_wizard
|
||||
msgid "Periods"
|
||||
@@ -1837,7 +1882,7 @@ msgstr ""
|
||||
#. module: account_financial_report
|
||||
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:77
|
||||
#: code:addons/account_financial_report/report/open_items_xlsx.py:62
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:101
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:109
|
||||
#: 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
|
||||
@@ -1865,7 +1910,7 @@ msgstr ""
|
||||
#. module: account_financial_report
|
||||
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:80
|
||||
#: code:addons/account_financial_report/report/open_items_xlsx.py:63
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:102
|
||||
#: 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
|
||||
#: model:ir.model.fields,field_description:account_financial_report.field_open_items_report_wizard_foreign_currency
|
||||
#: model:ir.model.fields,field_description:account_financial_report.field_trial_balance_report_wizard_foreign_currency
|
||||
@@ -1906,7 +1951,7 @@ msgstr ""
|
||||
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:73
|
||||
#: 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:97
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:105
|
||||
#: model:ir.ui.view,arch_db:account_financial_report.report_aged_partner_balance_filters
|
||||
#: 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
|
||||
@@ -2067,7 +2112,6 @@ 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_trial_balance_report_wizard_hide_account_balance_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 ""
|
||||
|
||||
@@ -2103,6 +2147,11 @@ msgstr ""
|
||||
msgid "View"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_financial_report
|
||||
#: model:ir.model.fields,help:account_financial_report.field_trial_balance_report_wizard_hide_account_at_0
|
||||
msgid "When this option is enabled, the trial balance will not display accounts that have initial balance = debit = credit = end balance = 0"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_financial_report
|
||||
#: model:ir.model.fields,field_description:account_financial_report.field_journal_ledger_report_wizard_with_account_name
|
||||
#: model:ir.model.fields,field_description:account_financial_report.field_report_journal_ledger_with_account_name
|
||||
@@ -2113,7 +2162,7 @@ msgstr ""
|
||||
#: 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/open_items_xlsx.py:64
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:103
|
||||
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:111
|
||||
#: model:ir.ui.view,arch_db:account_financial_report.report_general_ledger_filters
|
||||
#, python-format
|
||||
msgid "Yes"
|
||||
|
||||
Reference in New Issue
Block a user