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

Fix partner_statement: NULL Error in report

Browse Source
This commit is contained in:
Graeme Gellatly
2022-03-04 10:01:58 +13:00
committed by Miquel Raïch
parent bfa55e80ff
commit c6d04b7572
4 changed files with 31 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
partner_statement/README.rst
View File

@@ -14,13 +14,13 @@ Partner Statement
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--financial--reporting-lightgray.png?logo=github
:target: https://github.com/OCA/account-financial-reporting/tree/14.0/partner_statement
:target: https://github.com/OCA/account-financial-reporting/tree/15.0/partner_statement
:alt: OCA/account-financial-reporting
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/account-financial-reporting-14-0/account-financial-reporting-14-0-partner_statement
:target: https://translation.odoo-community.org/projects/account-financial-reporting-15-0/account-financial-reporting-15-0-partner_statement
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
:target: https://runbot.odoo-community.org/runbot/91/14.0
:target: https://runbot.odoo-community.org/runbot/91/15.0
:alt: Try me on Runbot
|badge1| |badge2| |badge3| |badge4| |badge5|
@@ -55,8 +55,8 @@ Users willing to access to this report should have proper Accounting & Finance r
To configure this module, you need to:
#. Go to *Configuration / Settings*
#. Under the *Followup Section* of *Accounting* option select either or both of OCA Activity or Outstanding Statement
#. Go to *Invoicing / Configuration / Settings*
#. Under the *Partner Statements* of *Accounting* option select either or both of OCA Activity or Outstanding Statement
#. Once selected, you may set default options for the reports.
#. Click *Save*
@@ -96,7 +96,7 @@ Bug Tracker
Bugs are tracked on `GitHub Issues <https://github.com/OCA/account-financial-reporting/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
`feedback <https://github.com/OCA/account-financial-reporting/issues/new?body=module:%20partner_statement%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/OCA/account-financial-reporting/issues/new?body=module:%20partner_statement%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
Do not contact contributors directly about support or help with technical issues.
@@ -128,6 +128,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.
This module is part of the `OCA/account-financial-reporting <https://github.com/OCA/account-financial-reporting/tree/14.0/partner_statement>`_ project on GitHub.
This module is part of the `OCA/account-financial-reporting <https://github.com/OCA/account-financial-reporting/tree/15.0/partner_statement>`_ project on GitHub.
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

43
partner_statement/i18n/partner_statement.pot
View File

@@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Project-Id-Version: Odoo Server 15.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -16,13 +16,13 @@ msgstr ""
#. module: partner_statement
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#, python-format
msgid "%sStatement between %s and %s in %s"
msgid "%(payable)sStatement between %(start)s and %(end)s in %(currency)s"
msgstr ""
#. module: partner_statement
#: code:addons/partner_statement/report/outstanting_statement_xlsx.py:0
#, python-format
msgid "%sStatement up to %s in %s"
msgid "%(payable)sStatement up to %(end)s in %(currency)s"
msgstr ""
#. module: partner_statement
@@ -140,7 +140,7 @@ msgstr ""
#: model:ir.model.fields,field_description:partner_statement.field_activity_statement_wizard__account_type
#: model:ir.model.fields,field_description:partner_statement.field_outstanding_statement_wizard__account_type
#: model:ir.model.fields,field_description:partner_statement.field_statement_common_wizard__account_type
msgid "Account type"
msgid "Account Type"
msgstr ""
#. module: partner_statement
@@ -205,7 +205,7 @@ msgstr ""
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/outstanting_statement_xlsx.py:0
#, python-format
msgid "Aging Report at %s in %s"
msgid "Aging Report at %(end)s in %(currency)s"
msgstr ""
#. module: partner_statement
@@ -305,13 +305,6 @@ msgstr ""
#. module: partner_statement
#: model:ir.model.fields,field_description:partner_statement.field_activity_statement_wizard__display_name
#: model:ir.model.fields,field_description:partner_statement.field_outstanding_statement_wizard__display_name
#: model:ir.model.fields,field_description:partner_statement.field_report_p_s_report_activity_statement_xlsx__display_name
#: model:ir.model.fields,field_description:partner_statement.field_report_p_s_report_outstanding_statement_xlsx__display_name
#: model:ir.model.fields,field_description:partner_statement.field_report_partner_statement_activity_statement__display_name
#: model:ir.model.fields,field_description:partner_statement.field_report_partner_statement_outstanding_statement__display_name
#: model:ir.model.fields,field_description:partner_statement.field_res_config_settings__display_name
#: model:ir.model.fields,field_description:partner_statement.field_statement_common__display_name
#: model:ir.model.fields,field_description:partner_statement.field_statement_common_wizard__display_name
msgid "Display Name"
msgstr ""
@@ -374,26 +367,12 @@ msgstr ""
#. module: partner_statement
#: model:ir.model.fields,field_description:partner_statement.field_activity_statement_wizard__id
#: model:ir.model.fields,field_description:partner_statement.field_outstanding_statement_wizard__id
#: model:ir.model.fields,field_description:partner_statement.field_report_p_s_report_activity_statement_xlsx__id
#: model:ir.model.fields,field_description:partner_statement.field_report_p_s_report_outstanding_statement_xlsx__id
#: model:ir.model.fields,field_description:partner_statement.field_report_partner_statement_activity_statement__id
#: model:ir.model.fields,field_description:partner_statement.field_report_partner_statement_outstanding_statement__id
#: model:ir.model.fields,field_description:partner_statement.field_res_config_settings__id
#: model:ir.model.fields,field_description:partner_statement.field_statement_common__id
#: model:ir.model.fields,field_description:partner_statement.field_statement_common_wizard__id
msgid "ID"
msgstr ""
#. module: partner_statement
#: model:ir.model.fields,field_description:partner_statement.field_activity_statement_wizard____last_update
#: model:ir.model.fields,field_description:partner_statement.field_outstanding_statement_wizard____last_update
#: model:ir.model.fields,field_description:partner_statement.field_report_p_s_report_activity_statement_xlsx____last_update
#: model:ir.model.fields,field_description:partner_statement.field_report_p_s_report_outstanding_statement_xlsx____last_update
#: model:ir.model.fields,field_description:partner_statement.field_report_partner_statement_activity_statement____last_update
#: model:ir.model.fields,field_description:partner_statement.field_report_partner_statement_outstanding_statement____last_update
#: model:ir.model.fields,field_description:partner_statement.field_res_config_settings____last_update
#: model:ir.model.fields,field_description:partner_statement.field_statement_common____last_update
#: model:ir.model.fields,field_description:partner_statement.field_statement_common_wizard____last_update
msgid "Last Modified on"
msgstr ""
@@ -485,6 +464,11 @@ msgstr ""
msgid "Partner Outstanding Statement"
msgstr ""
#. module: partner_statement
#: model_terms:ir.ui.view,arch_db:partner_statement.res_config_settings_view_form
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__outstanding_statement_wizard__account_type__payable
@@ -577,6 +561,13 @@ msgstr ""
msgid "Supplier"
msgstr ""
#. module: partner_statement
#: code:addons/partner_statement/report/activity_statement_xlsx.py:0
#: code:addons/partner_statement/report/outstanting_statement_xlsx.py:0
#, python-format
msgid "Supplier "
msgstr ""
#. module: partner_statement
#: code:addons/partner_statement/report/report_statement_common.py:0
#: code:addons/partner_statement/report/report_statement_common.py:0

4
partner_statement/report/outstanting_statement_xlsx.py
View File

@@ -58,11 +58,11 @@ class OutstandingStatementXslx(models.AbstractModel):
if not line.get("ref", ""):
name_to_show = line.get("name", "")
else:
if (line.get("name", "") in line.get("ref", "")) or (
if (line.get("ref", "") in line.get("name", "")) or (
line.get("name", "") == line.get("ref", "")
):
name_to_show = line.get("name", "")
elif line.get("ref", "") not in line.get("name", ""):
else:
name_to_show = line.get("ref", "")
sheet.write(
row_pos, 0, line.get("move_id", ""), FORMATS["format_tcell_left"]

10
partner_statement/static/description/index.html
View File

@@ -367,7 +367,7 @@ ul.auto-toc {
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/account-financial-reporting/tree/14.0/partner_statement"><img alt="OCA/account-financial-reporting" src="https://img.shields.io/badge/github-OCA%2Faccount--financial--reporting-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/account-financial-reporting-14-0/account-financial-reporting-14-0-partner_statement"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/91/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/account-financial-reporting/tree/15.0/partner_statement"><img alt="OCA/account-financial-reporting" src="https://img.shields.io/badge/github-OCA%2Faccount--financial--reporting-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/account-financial-reporting-15-0/account-financial-reporting-15-0-partner_statement"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/91/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p>This module extends the functionality of Invoicing to support the printing of customer and vendor statements.
There are two types of statements, Activity and Outstanding. Aging details can be shown in the reports, expressed in aging buckets,
so the customer or vendor can review how much is open, due or overdue.</p>
@@ -407,8 +407,8 @@ outstanding payments. The list is displayed in chronological order and is split
</ol>
<p>To configure this module, you need to:</p>
<ol class="arabic simple">
<li>Go to <em>Configuration / Settings</em></li>
<li>Under the <em>Followup Section</em> of <em>Accounting</em> option select either or both of OCA Activity or Outstanding Statement</li>
<li>Go to <em>Invoicing / Configuration / Settings</em></li>
<li>Under the <em>Partner Statements</em> of <em>Accounting</em> option select either or both of OCA Activity or Outstanding Statement</li>
<li>Once selected, you may set default options for the reports.</li>
<li>Click <em>Save</em></li>
</ol>
@@ -449,7 +449,7 @@ outstanding payments. The list is displayed in chronological order and is split
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/account-financial-reporting/issues">GitHub Issues</a>.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/account-financial-reporting/issues/new?body=module:%20partner_statement%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<a class="reference external" href="https://github.com/OCA/account-financial-reporting/issues/new?body=module:%20partner_statement%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
@@ -475,7 +475,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-financial-reporting/tree/14.0/partner_statement">OCA/account-financial-reporting</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-financial-reporting/tree/15.0/partner_statement">OCA/account-financial-reporting</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div>
</div>