tocmo0nlord/Odoo-18.0-20251222
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: Blocked lines did not have a balance

Browse Source 
Balance does not change in a blocked line but still needs to be set
This commit is contained in:
Danny W. Adair
2023-12-19 09:06:00 +13:00
committed by Miquel Raïch
parent 2e0cda6adc
commit 5d85cc1512
2 changed files with 54 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
partner_statement/i18n/partner_statement.pot
View File

@@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 15.0\n"
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -14,12 +14,14 @@ msgstr ""
"Plural-Forms: \n"
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#, python-format
msgid "%(payable)sStatement between %(start)s and %(end)s in %(currency)s"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/outstanting_statement_xlsx.py:0
#, python-format
@@ -27,60 +29,70 @@ msgid "%(payable)sStatement up to %(end)s in %(currency)s"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#, python-format
msgid "%(payable)sStatement up to %(prior_day)s in %(currency)s"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/report_statement_common.py:0
#, python-format
msgid "1 - 30 Days"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/report_statement_common.py:0
#, python-format
msgid "1 Month"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/report_statement_common.py:0
#, python-format
msgid "121 Days +"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/report_statement_common.py:0
#, python-format
msgid "2 Months"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/report_statement_common.py:0
#, python-format
msgid "3 Months"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/report_statement_common.py:0
#, python-format
msgid "31 - 60 Days"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/report_statement_common.py:0
#, python-format
msgid "4 Months"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/report_statement_common.py:0
#, python-format
msgid "61 - 90 Days"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/report_statement_common.py:0
#, python-format
msgid "91 - 120 Days"
@@ -166,6 +178,7 @@ msgid "Account Type"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#: model:ir.actions.report,name:partner_statement.action_print_activity_statement
@@ -227,6 +240,7 @@ msgid "Aging Report at"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/outstanting_statement_xlsx.py:0
#, python-format
@@ -234,6 +248,7 @@ msgid "Aging Report at %(end)s in %(currency)s"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: model_terms:ir.ui.view,arch_db:partner_statement.activity_balance
@@ -242,6 +257,7 @@ msgid "Applied Amount"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/outstanting_statement_xlsx.py:0
@@ -251,6 +267,7 @@ msgid "Balance"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#: model_terms:ir.ui.view,arch_db:partner_statement.activity_balance
#, python-format
@@ -290,6 +307,7 @@ msgid "Created on"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/report_statement_common.py:0
#: code:addons/partner_statement/report/report_statement_common.py:0
#, python-format
@@ -297,6 +315,7 @@ msgid "Current"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
@@ -323,6 +342,7 @@ msgid "Date Start"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/outstanting_statement_xlsx.py:0
@@ -331,6 +351,7 @@ msgid "Date:"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
@@ -348,6 +369,7 @@ msgid "Detailed"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#, python-format
msgid ""
@@ -355,6 +377,7 @@ msgid ""
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: model:ir.actions.report,name:partner_statement.action_print_detailed_activity_statement
@@ -394,6 +417,7 @@ msgid "Don't show partners with no due entries"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/outstanting_statement_xlsx.py:0
@@ -413,6 +437,7 @@ msgid "Enable OCA Outstanding Statements"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
@@ -456,6 +481,7 @@ msgid "ID"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: model_terms:ir.ui.view,arch_db:partner_statement.activity_balance
#, python-format
@@ -500,12 +526,14 @@ msgid "Number Partner"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/report_statement_common.py:0
#, python-format
msgid "Older"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
@@ -518,6 +546,7 @@ msgid "Open Amount"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/outstanting_statement_xlsx.py:0
@@ -527,6 +556,7 @@ msgid "Original"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: model_terms:ir.ui.view,arch_db:partner_statement.activity_balance
@@ -535,6 +565,7 @@ msgid "Original Amount"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/outstanting_statement_xlsx.py:0
#: code:addons/partner_statement/report/outstanting_statement_xlsx.py:0
#: model:ir.actions.report,name:partner_statement.action_print_outstanding_statement
@@ -587,14 +618,15 @@ msgid "Partner Statements"
msgstr ""
#. module: partner_statement
#: model:ir.model.fields.selection,name:partner_statement.selection__activity_statement_wizard__account_type__payable
#: model:ir.model.fields.selection,name:partner_statement.selection__detailed_activity_statement_wizard__account_type__payable
#: model:ir.model.fields.selection,name:partner_statement.selection__outstanding_statement_wizard__account_type__payable
#: model:ir.model.fields.selection,name:partner_statement.selection__statement_common_wizard__account_type__payable
#: model:ir.model.fields.selection,name:partner_statement.selection__activity_statement_wizard__account_type__liability_payable
#: model:ir.model.fields.selection,name:partner_statement.selection__detailed_activity_statement_wizard__account_type__liability_payable
#: model:ir.model.fields.selection,name:partner_statement.selection__outstanding_statement_wizard__account_type__liability_payable
#: model:ir.model.fields.selection,name:partner_statement.selection__statement_common_wizard__account_type__liability_payable
msgid "Payable"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/activity_statement.py:0
#, python-format
msgid "Payment"
@@ -606,14 +638,15 @@ msgid "Please set defaults under Activity Statements."
msgstr ""
#. module: partner_statement
#: model:ir.model.fields.selection,name:partner_statement.selection__activity_statement_wizard__account_type__receivable
#: model:ir.model.fields.selection,name:partner_statement.selection__detailed_activity_statement_wizard__account_type__receivable
#: model:ir.model.fields.selection,name:partner_statement.selection__outstanding_statement_wizard__account_type__receivable
#: model:ir.model.fields.selection,name:partner_statement.selection__statement_common_wizard__account_type__receivable
#: model:ir.model.fields.selection,name:partner_statement.selection__activity_statement_wizard__account_type__asset_receivable
#: model:ir.model.fields.selection,name:partner_statement.selection__detailed_activity_statement_wizard__account_type__asset_receivable
#: model:ir.model.fields.selection,name:partner_statement.selection__outstanding_statement_wizard__account_type__asset_receivable
#: model:ir.model.fields.selection,name:partner_statement.selection__statement_common_wizard__account_type__asset_receivable
msgid "Receivable"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
@@ -659,6 +692,7 @@ msgid "Statement between"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/outstanting_statement_xlsx.py:0
@@ -674,6 +708,7 @@ msgid "Statement of Account"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/outstanting_statement_xlsx.py:0
@@ -682,6 +717,7 @@ msgid "Statement of Account from %s"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/outstanting_statement_xlsx.py:0
@@ -695,6 +731,7 @@ msgid "Supplier"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0
@@ -705,6 +742,7 @@ msgid "Supplier "
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/report_statement_common.py:0
#: code:addons/partner_statement/report/report_statement_common.py:0
#, python-format
@@ -722,6 +760,7 @@ msgid "Use outstanding statements"
msgstr ""
#. module: partner_statement
#. odoo-python
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/detailed_activity_statement_xlsx.py:0

11
partner_statement/report/report_statement_common.py
View File

@@ -468,13 +468,14 @@ class ReportStatementCommon(models.AbstractModel):
line["currency_id"], currencies, 0.0, 0.0
)
line_currency = currency_dict[line["currency_id"]]
if not line["blocked"]:
if not is_activity:
if not is_activity:
if not line["blocked"]:
line_currency["amount_due"] += line[amount_field]
line["balance"] = line_currency["amount_due"]
else:
line["balance"] = line_currency["amount_due"]
else:
if not line["blocked"]:
line_currency["ending_balance"] += line[amount_field]
line["balance"] = line_currency["ending_balance"]
line["balance"] = line_currency["ending_balance"]
line["date"] = format_date(
line["date"], date_formats.get(partner_id, default_fmt)
)