Browse Source

[12.0][FIX] - Hide ending balance if general ledger is filtered by partner

pull/744/head
sbejaoui 6 years ago
committed by Tom Blauwendraat
parent
commit
be01f5b8d3
  1. 8
      account_financial_report/i18n/account_financial_report.pot
  2. 1
      account_financial_report/report/general_ledger_xlsx.py
  3. 2
      account_financial_report/report/templates/general_ledger.xml

8
account_financial_report/i18n/account_financial_report.pot

@ -930,7 +930,7 @@ msgid "Ending\n"
msgstr "" msgstr ""
#. module: account_financial_report #. module: account_financial_report
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:180
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:181
#: code:addons/account_financial_report/report/open_items_xlsx.py:118 #: code:addons/account_financial_report/report/open_items_xlsx.py:118
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:38 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:38
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:53 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:53
@ -1319,7 +1319,7 @@ msgid "Initial Debit"
msgstr "" msgstr ""
#. module: account_financial_report #. module: account_financial_report
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:168
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:169
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:22 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:22
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:49 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:49
#: code:addons/account_financial_report/report/trial_balance_xlsx.py:63 #: code:addons/account_financial_report/report/trial_balance_xlsx.py:63
@ -1779,7 +1779,7 @@ msgid "Partner ID"
msgstr "" msgstr ""
#. module: account_financial_report #. module: account_financial_report
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:165
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:166
#, python-format #, python-format
msgid "Partner Initial balance" msgid "Partner Initial balance"
msgstr "" msgstr ""
@ -1791,7 +1791,7 @@ msgid "Partner cumul aged balance"
msgstr "" msgstr ""
#. module: account_financial_report #. module: account_financial_report
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:177
#: code:addons/account_financial_report/report/general_ledger_xlsx.py:178
#: code:addons/account_financial_report/report/open_items_xlsx.py:114 #: code:addons/account_financial_report/report/open_items_xlsx.py:114
#: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_ending_cumul #: model_terms:ir.ui.view,arch_db:account_financial_report.report_general_ledger_ending_cumul
#: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_ending_cumul #: model_terms:ir.ui.view,arch_db:account_financial_report.report_open_items_ending_cumul

1
account_financial_report/report/general_ledger_xlsx.py

@ -154,6 +154,7 @@ class GeneralLedgerXslx(models.AbstractModel):
self.row_pos += 1 self.row_pos += 1
# Display ending balance line for account # Display ending balance line for account
if not report.filter_partner_ids:
self.write_ending_balance(account) self.write_ending_balance(account)
# 2 lines break # 2 lines break

2
account_financial_report/report/templates/general_ledger.xml

@ -67,7 +67,7 @@
</t> </t>
<!-- Display account footer --> <!-- Display account footer -->
<t t-call="account_financial_report.report_general_ledger_ending_cumul">
<t t-if="not o.filter_partner_ids" t-call="account_financial_report.report_general_ledger_ending_cumul">
<t t-set="account_or_partner_object" t-value="account"/> <t t-set="account_or_partner_object" t-value="account"/>
<t t-set="type" t-value='"account_type"'/> <t t-set="type" t-value='"account_type"'/>
</t> </t>

Loading…
Cancel
Save