[16.0] [MIG] partner_statement: Migration to 16.0

2023-10-24 15:14:08 +13:00 · 2023-10-24 15:14:08 +13:00 · 9e404ca728
parent d881fb3eb7
commit 9e404ca728
15 changed files with 39 additions and 28 deletions
--- a/partner_statement/README.rst
+++ b/partner_statement/README.rst
@ -7,7 +7,7 @@ Partner Statement
   !! This file is generated by oca-gen-addon-readme !!
   !! changes will be overwritten.                   !!
   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:8cf120e9937aebc251e3576682aab2450761d8bec81e8da495719a58fe19203e
+   !! source digest: sha256:111be40283ea7184da0dd0b1038cb08b801ce102e0a2f714ac74f3d92861dc93
   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@ -17,13 +17,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/15.0/partner_statement
+    :target: https://github.com/OCA/account-financial-reporting/tree/16.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-15-0/account-financial-reporting-15-0-partner_statement
+    :target: https://translation.odoo-community.org/projects/account-financial-reporting-16-0/account-financial-reporting-16-0-partner_statement
    :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/account-financial-reporting&target_branch=15.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/account-financial-reporting&target_branch=16.0
    :alt: Try me on Runboat

 |badge1| |badge2| |badge3| |badge4| |badge5|
@ -107,7 +107,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 to smash it by providing a detailed and welcomed
-`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**>`_.
+`feedback <https://github.com/OCA/account-financial-reporting/issues/new?body=module:%20partner_statement%0Aversion:%2016.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.

@ -125,6 +125,8 @@ Contributors
 * Miquel Raïch <miquel.raich@forgeflow.com>
 * Graeme Gellatly <graeme@o4sb.com>
 * Lois Rilo <lois.rilo@forgeflow.com>
+* Dhara Solanki <dhara.solanki@initos.com>
+* Danny Adair <danny@o4sb.com>

 Maintainers
 ~~~~~~~~~~~
@ -147,6 +149,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:

 |maintainer-MiquelRForgeFlow| 

-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.
+This module is part of the `OCA/account-financial-reporting <https://github.com/OCA/account-financial-reporting/tree/16.0/partner_statement>`_ project on GitHub.

 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
--- a/partner_statement/manifest.py
+++ b/partner_statement/manifest.py
@ -3,7 +3,7 @@

 {
    "name": "Partner Statement",
-    "version": "15.0.1.1.1",
+    "version": "16.0.1.0.0",
    "category": "Accounting & Finance",
    "summary": "OCA Financial Reports",
    "author": "ForgeFlow, Odoo Community Association (OCA)",
--- a/partner_statement/readme/CONTRIBUTORS.rst
+++ b/partner_statement/readme/CONTRIBUTORS.rst
@ -1,3 +1,5 @@
 * Miquel Raïch <miquel.raich@forgeflow.com>
 * Graeme Gellatly <graeme@o4sb.com>
 * Lois Rilo <lois.rilo@forgeflow.com>
+* Dhara Solanki <dhara.solanki@initos.com>
+* Danny Adair <danny@o4sb.com>
--- a/partner_statement/report/activity_statement.py
+++ b/partner_statement/report/activity_statement.py
@ -30,7 +30,6 @@ class ActivityStatement(models.AbstractModel):
                END AS open_amount_currency
            FROM account_move_line l
            JOIN account_account aa ON (aa.id = l.account_id)
-            JOIN account_account_type at ON (at.id = aa.user_type_id)
            JOIN account_move m ON (l.move_id = m.id)
            LEFT JOIN (SELECT pr.*
                FROM account_partial_reconcile pr
@ -45,9 +44,9 @@ class ActivityStatement(models.AbstractModel):
                WHERE l2.date < %(date_start)s
            ) as pc ON pc.credit_move_id = l.id
            WHERE l.partner_id IN %(partners)s
-                AND at.type = %(account_type)s
                AND l.date < %(date_start)s AND not l.blocked
                AND m.state IN ('posted')
+                AND aa.account_type = %(account_type)s
                AND (
                    (pd.id IS NOT NULL AND
                        pd.max_date < %(date_start)s) OR
@ -150,14 +149,13 @@ class ActivityStatement(models.AbstractModel):
                END as date_maturity
            FROM account_move_line l
            JOIN account_account aa ON (aa.id = l.account_id)
-            JOIN account_account_type at ON (at.id = aa.user_type_id)
            JOIN account_move m ON (l.move_id = m.id)
            JOIN account_journal aj ON (l.journal_id = aj.id)
            WHERE l.partner_id IN %(partners)s
-                AND at.type = %(account_type)s
                AND %(date_start)s <= l.date
                AND l.date <= %(date_end)s
                AND m.state IN ('posted')
+                AND aa.account_type = %(account_type)s
            GROUP BY l.partner_id, m.name, l.date, l.date_maturity,
                CASE WHEN (aj.type IN ('sale', 'purchase'))
                    THEN l.name
--- a/partner_statement/report/activity_statement_xlsx.py
+++ b/partner_statement/report/activity_statement_xlsx.py
@ -41,7 +41,7 @@ class ActivityStatementXslx(models.AbstractModel):
        statement_header = _(
            "%(payable)sStatement between %(start)s and %(end)s in %(currency)s"
        ) % {
-            "payable": account_type == "payable" and _("Supplier ") or "",
+            "payable": account_type == "liability_payable" and _("Supplier ") or "",
            "start": partner_data.get("start"),
            "end": partner_data.get("end"),
            "currency": currency.display_name,
--- a/partner_statement/report/detailed_activity_statement_xlsx.py
+++ b/partner_statement/report/detailed_activity_statement_xlsx.py
@ -41,7 +41,7 @@ class DetailedActivityStatementXslx(models.AbstractModel):
        statement_header = _(
            "Detailed %(payable)sStatement between %(start)s and %(end)s in %(currency)s"
        ) % {
-            "payable": account_type == "payable" and _("Supplier ") or "",
+            "payable": account_type == "liability_payable" and _("Supplier ") or "",
            "start": partner_data.get("start"),
            "end": partner_data.get("end"),
            "currency": currency.display_name,
--- a/partner_statement/report/outstanding_statement.py
+++ b/partner_statement/report/outstanding_statement.py
@ -45,7 +45,6 @@ class OutstandingStatement(models.AbstractModel):
            END as date_maturity
            FROM account_move_line l
            JOIN account_account aa ON (aa.id = l.account_id)
-            JOIN account_account_type at ON (at.id = aa.user_type_id)
            JOIN account_move m ON (l.move_id = m.id)
            LEFT JOIN (SELECT pr.*
                FROM account_partial_reconcile pr
@ -59,7 +58,7 @@ class OutstandingStatement(models.AbstractModel):
                ON pr.debit_move_id = l2.id
                WHERE l2.date <= %(date_end)s
            ) as pc ON pc.credit_move_id = l.id
-            WHERE l.partner_id IN %(partners)s AND at.type = %(account_type)s
+            WHERE l.partner_id IN %(partners)s
                AND (
                    (pd.id IS NOT NULL AND
                        pd.max_date <= %(date_end)s) OR
@ -67,6 +66,7 @@ class OutstandingStatement(models.AbstractModel):
                        pc.max_date <= %(date_end)s) OR
                    (pd.id IS NULL AND pc.id IS NULL)
                ) AND l.date <= %(date_end)s AND m.state IN ('posted')
+                AND aa.account_type = %(account_type)s
            GROUP BY l.id, l.partner_id, m.name, l.date, l.date_maturity, l.name,
                CASE WHEN l.ref IS NOT NULL
                    THEN l.ref
--- a/partner_statement/report/outstanting_statement_xlsx.py
+++ b/partner_statement/report/outstanting_statement_xlsx.py
@ -39,7 +39,7 @@ class OutstandingStatementXslx(models.AbstractModel):
        account_type = data.get("account_type", False)
        row_pos += 2
        statement_header = _("%(payable)sStatement up to %(end)s in %(currency)s") % {
-            "payable": account_type == "payable" and _("Supplier ") or "",
+            "payable": account_type == "liability_payable" and _("Supplier ") or "",
            "end": partner_data.get("end"),
            "currency": currency.display_name,
        }
--- a/partner_statement/report/report_statement_common.py
+++ b/partner_statement/report/report_statement_common.py
@ -69,7 +69,6 @@ class ReportStatementCommon(models.AbstractModel):
            FROM account_move_line l
            JOIN account_move m ON (l.move_id = m.id)
            JOIN account_account aa ON (aa.id = l.account_id)
-            JOIN account_account_type at ON (at.id = aa.user_type_id)
            LEFT JOIN (SELECT pr.*
                FROM account_partial_reconcile pr
                INNER JOIN account_move_line l2
@ -82,7 +81,7 @@ class ReportStatementCommon(models.AbstractModel):
                ON pr.debit_move_id = l2.id
                WHERE l2.date <= %(date_end)s
            ) as pc ON pc.credit_move_id = l.id
-            WHERE l.partner_id IN %(partners)s AND at.type = %(account_type)s
+            WHERE l.partner_id IN %(partners)s
                                AND (
                                  (pd.id IS NOT NULL AND
                                      pd.max_date <= %(date_end)s) OR
@ -91,6 +90,7 @@ class ReportStatementCommon(models.AbstractModel):
                                  (pd.id IS NULL AND pc.id IS NULL)
                                ) AND l.date <= %(date_end)s AND not l.blocked
                                  AND m.state IN ('posted')
+                                AND aa.account_type = %(account_type)s
            GROUP BY l.partner_id, l.currency_id, l.date, l.date_maturity,
                                l.amount_currency, l.balance, l.move_id,
                                l.company_id, l.id
--- a/partner_statement/static/description/index.html
+++ b/partner_statement/static/description/index.html
@ -367,9 +367,9 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:8cf120e9937aebc251e3576682aab2450761d8bec81e8da495719a58fe19203e
+!! source digest: sha256:111be40283ea7184da0dd0b1038cb08b801ce102e0a2f714ac74f3d92861dc93
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" 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 image-reference" 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 image-reference" 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 image-reference" 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 image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/account-financial-reporting&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" 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 image-reference" 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 image-reference" href="https://github.com/OCA/account-financial-reporting/tree/16.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 image-reference" href="https://translation.odoo-community.org/projects/account-financial-reporting-16-0/account-financial-reporting-16-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 image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/account-financial-reporting&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-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 three types of statements: Activity, Detailed 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>
@ -460,7 +460,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 to smash 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:%2015.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:%2016.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">
@ -477,6 +477,8 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 <li>Miquel Raïch &lt;<a class="reference external" href="mailto:miquel.raich&#64;forgeflow.com">miquel.raich&#64;forgeflow.com</a>&gt;</li>
 <li>Graeme Gellatly &lt;<a class="reference external" href="mailto:graeme&#64;o4sb.com">graeme&#64;o4sb.com</a>&gt;</li>
 <li>Lois Rilo &lt;<a class="reference external" href="mailto:lois.rilo&#64;forgeflow.com">lois.rilo&#64;forgeflow.com</a>&gt;</li>
+<li>Dhara Solanki &lt;<a class="reference external" href="mailto:dhara.solanki&#64;initos.com">dhara.solanki&#64;initos.com</a>&gt;</li>
+<li>Danny Adair &lt;<a class="reference external" href="mailto:danny&#64;o4sb.com">danny&#64;o4sb.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@ -488,7 +490,7 @@ mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external image-reference" href="https://github.com/MiquelRForgeFlow"><img alt="MiquelRForgeFlow" src="https://github.com/MiquelRForgeFlow.png?size=40px" /></a></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>This module is part of the <a class="reference external" href="https://github.com/OCA/account-financial-reporting/tree/16.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>
--- a/partner_statement/views/activity_statement.xml
+++ b/partner_statement/views/activity_statement.xml
@ -6,7 +6,7 @@
        <p>
            <span t-if="is_detailed">Detailed </span>
            <span
-                t-if="account_type == 'payable'"
+                t-if="account_type == 'liability_payable'"
            >Supplier </span>Statement between <span t-esc="d['start']" /> and <span
                t-esc="d['end']"
            /> in <span t-esc="display_currency.name" />
--- a/partner_statement/views/outstanding_statement.xml
+++ b/partner_statement/views/outstanding_statement.xml
@ -4,9 +4,9 @@
 <odoo>
    <template id="outstanding_balance">
        <p>
-            <span t-esc="'' if  account_type == 'receivable' else 'Supplier '" /><span
-                t-esc="title_name"
-            /> up to <span t-esc="ending_date" /> in <span
+            <span
+                t-esc="'' if  account_type == 'asset_receivable' else 'Supplier '"
+            /><span t-esc="title_name" /> up to <span t-esc="ending_date" /> in <span
                t-esc="display_currency.name"
            />
        </p>
--- a/partner_statement/wizard/statement_common.py
+++ b/partner_statement/wizard/statement_common.py
@ -36,8 +36,8 @@ class StatementCommon(models.AbstractModel):
    )

    account_type = fields.Selection(
-        [("receivable", "Receivable"), ("payable", "Payable")],
-        default="receivable",
+        [("asset_receivable", "Receivable"), ("liability_payable", "Payable")],
+        default="asset_receivable",
    )

    @api.onchange("aging_type")
--- a/setup/partner_statement/odoo/addons/partner_statement
+++ b/setup/partner_statement/odoo/addons/partner_statement
@ -0,0 +1 @@
+../../../../partner_statement
--- a/setup/partner_statement/setup.py
+++ b/setup/partner_statement/setup.py
@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)