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

[16.0] [MIG] partner_statement: Migration to 16.0

Browse Source
This commit is contained in:
Danny W. Adair
2023-10-24 15:14:08 +13:00
committed by Miquel Raïch
parent 5b7e7d4842
commit bf2d7c6dd1
13 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
partner_statement/report/activity_statement.py
View File

@@ -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

2
partner_statement/report/activity_statement_xlsx.py
View File

@@ -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,

2
partner_statement/report/detailed_activity_statement_xlsx.py
View File

@@ -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,

4
partner_statement/report/outstanding_statement.py
View File

@@ -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

2
partner_statement/report/outstanting_statement_xlsx.py
View File

@@ -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,
}

4
partner_statement/report/report_statement_common.py
View File

@@ -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