Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[FIX] partner_statement: consider a multicurrency case 

Detected cases where account_partial_reconcile has null currency_id, thus giving falsy amount_currency, and thus making some reconciled invoices appearing in the outstanding. Used _amount_residual of account move lines as reference to fix it.

partner_statement 13.0.1.2.1
pull/1106/head
mreficent 2021-06-17 01:12:35 +02:00 committed by Miquel Raïch
parent 2785c5662d
commit 0fac66f490
4 changed files with 135 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
partner_statement/__manifest__.py
View File

@ -3,7 +3,7 @@
{ {
"name": "Partner Statement", "name": "Partner Statement",
"version": "13.0.1.2.0", "version": "13.0.1.2.1",
"category": "Accounting & Finance", "category": "Accounting & Finance",
"summary": "OCA Financial Reports", "summary": "OCA Financial Reports",
"author": "ForgeFlow, Odoo Community Association (OCA)", "author": "ForgeFlow, Odoo Community Association (OCA)",

11
partner_statement/report/activity_statement.py
View File

@ -23,17 +23,16 @@ class ActivityStatement(models.AbstractModel):
ELSE sum(l.debit) ELSE sum(l.debit)
END as debit, END as debit,
CASE WHEN l.currency_id is not null AND l.amount_currency < 0.0 CASE WHEN l.currency_id is not null AND l.amount_currency < 0.0
THEN sum(l.amount_currency * (-1)) THEN sum(-l.amount_currency)
ELSE sum(l.credit) ELSE sum(l.credit)
END as credit END as credit
FROM account_move_line l FROM account_move_line l
JOIN account_move m ON (l.move_id = m.id) JOIN account_move m ON (l.move_id = m.id)
WHERE l.partner_id IN %(partners)s WHERE l.partner_id IN %(partners)s
AND l.account_internal_type = %(account_type)s AND l.account_internal_type = %(account_type)s
AND l.date < %(date_start)s AND not l.blocked AND l.date < %(date_start)s AND not l.blocked
AND m.state IN ('posted') AND m.state IN ('posted')
GROUP BY l.partner_id, l.currency_id, l.amount_currency, GROUP BY l.partner_id, l.currency_id, l.amount_currency, l.company_id
l.company_id
""", """,
locals(), locals(),
), ),

105
partner_statement/report/outstanding_statement.py
View File

@ -16,61 +16,76 @@ class OutstandingStatement(models.AbstractModel):
return str( return str(
self._cr.mogrify( self._cr.mogrify(
""" """
SELECT m.name AS move_id, l.partner_id, l.date, l.name, SELECT m.name AS move_id, l.partner_id, l.date, l.name,
l.blocked, l.currency_id, l.company_id, l.blocked, l.currency_id, l.company_id,
CASE WHEN l.ref IS NOT NULL CASE WHEN l.ref IS NOT NULL THEN l.ref ELSE m.ref END as ref,
THEN l.ref
ELSE m.ref
END as ref,
CASE WHEN (l.currency_id is not null AND l.amount_currency > 0.0) CASE WHEN (l.currency_id is not null AND l.amount_currency > 0.0)
THEN avg(l.amount_currency) THEN avg(l.amount_currency)
ELSE avg(l.debit) ELSE avg(l.debit)
END as debit, END as debit,
CASE WHEN (l.currency_id is not null AND l.amount_currency < 0.0) CASE WHEN (l.currency_id is not null AND l.amount_currency < 0.0)
THEN avg(l.amount_currency * (-1)) THEN avg(-l.amount_currency)
ELSE avg(l.credit) ELSE avg(l.credit)
END as credit, END as credit,
CASE WHEN l.balance > 0.0 (abs(COALESCE(l.balance, 0.0)) + sum(
THEN l.balance - sum(coalesce(pd.amount, 0.0)) coalesce(pr.pr_sign, 0.0) * coalesce(pr.amount, 0.0))
ELSE l.balance + sum(coalesce(pc.amount, 0.0)) ) * sign(COALESCE(l.balance, 0.0)) AS open_amount,
END AS open_amount, (abs(COALESCE(l.amount_currency, 0.0)) + sum(
CASE WHEN l.balance > 0.0 coalesce(pr.pr_sign, 0.0) * CASE
THEN l.amount_currency - sum(coalesce(pd.amount_currency, 0.0)) WHEN pr.currency_id IS NOT NULL AND pr.currency_id = l.currency_id
ELSE l.amount_currency + sum(coalesce(pc.amount_currency, 0.0)) THEN coalesce(pr.amount_currency, 0.0)
END AS open_amount_currency, WHEN cur.id IS NOT NULL AND ROUND(
abs(COALESCE(l.balance, 0.0)), cur.decimal_places) > 0.0
THEN ROUND(coalesce(pr.amount, 0.0) *
COALESCE(l.amount_currency, 0.0) / NULLIF(l.balance, 0.0),
cur.decimal_places)
ELSE ROUND(coalesce(pr.amount, 0.0) *
COALESCE((
SELECT r.rate FROM res_currency_rate r
JOIN account_move_line aml
ON pr.credit_move_id = aml.id
WHERE r.currency_id = l.currency_id
AND r.name <= aml.date
AND (r.company_id IS NULL
OR r.company_id = l.company_id)
ORDER BY r.company_id, r.name DESC LIMIT 1), 1.0),
cur.decimal_places)
END)
) * sign(COALESCE(l.amount_currency, 0.0)) AS open_amount_currency,
CASE WHEN l.date_maturity is null CASE WHEN l.date_maturity is null
THEN l.date THEN l.date
ELSE l.date_maturity ELSE l.date_maturity
END as date_maturity END as date_maturity
FROM (
SELECT l.*, CASE
WHEN l.debit = 0.0 AND l.credit = 0.0 AND l.currency_id IS NOT NULL
AND ROUND(COALESCE(l.amount_currency, 0.0),
cur.decimal_places) > 0.0 THEN 1
WHEN l.debit = 0.0 AND l.credit = 0.0 AND l.currency_id IS NOT NULL
AND ROUND(COALESCE(l.amount_currency, 0.0),
cur.decimal_places) < 0.0 THEN -1
WHEN l.balance > 0.0 THEN 1 ELSE -1 END as sign
FROM account_move_line l FROM account_move_line l
JOIN account_move m ON (l.move_id = m.id) LEFT JOIN res_currency cur ON cur.id = l.currency_id
LEFT JOIN (SELECT pr.* ) l
FROM account_partial_reconcile pr JOIN account_move m ON l.move_id = m.id
INNER JOIN account_move_line l2 LEFT JOIN res_currency cur ON cur.id = l.currency_id
ON pr.credit_move_id = l2.id LEFT JOIN LATERAL (SELECT pr.*,
WHERE l2.date <= %(date_end)s CASE WHEN pr.credit_move_id = l.id THEN l.sign
) as pd ON pd.debit_move_id = l.id ELSE -l.sign END AS pr_sign
LEFT JOIN (SELECT pr.* FROM account_partial_reconcile pr
FROM account_partial_reconcile pr WHERE pr.max_date <= %(date_end)s AND (
INNER JOIN account_move_line l2 (pr.debit_move_id = l.id) OR (pr.credit_move_id = l.id))
ON pr.debit_move_id = l2.id ) as pr ON TRUE
WHERE l2.date <= %(date_end)s WHERE l.partner_id IN %(partners)s
) as pc ON pc.credit_move_id = l.id AND l.account_internal_type = %(account_type)s
WHERE l.partner_id IN %(partners)s AND (
AND l.account_internal_type = %(account_type)s (pr.id IS NOT NULL AND pr.max_date <= %(date_end)s) OR
AND ( (pr.id IS NULL)
(pd.id IS NOT NULL AND ) AND l.date <= %(date_end)s AND m.state IN ('posted')
pd.max_date <= %(date_end)s) OR GROUP BY l.partner_id, m.name, l.date, l.date_maturity, l.name,
(pc.id IS NOT NULL AND CASE WHEN l.ref IS NOT NULL THEN l.ref ELSE m.ref END,
pc.max_date <= %(date_end)s) OR l.blocked, l.currency_id, l.balance, l.amount_currency, l.company_id
(pd.id IS NULL AND pc.id IS NULL)
) AND l.date <= %(date_end)s AND m.state IN ('posted')
GROUP BY l.partner_id, m.name, l.date, l.date_maturity, l.name,
CASE WHEN l.ref IS NOT NULL
THEN l.ref
ELSE m.ref
END,
l.blocked, l.currency_id, l.balance, l.amount_currency, l.company_id
""", """,
locals(), locals(),
), ),
@ -106,7 +121,9 @@ class OutstandingStatement(models.AbstractModel):
Q2.open_amount Q2.open_amount
FROM Q2 FROM Q2
JOIN res_company c ON (c.id = Q2.company_id) JOIN res_company c ON (c.id = Q2.company_id)
WHERE c.id = %(company_id)s AND Q2.open_amount != 0.0 JOIN res_currency cur ON cur.id = COALESCE(Q2.currency_id, c.currency_id)
WHERE c.id = %(company_id)s AND
round(Q2.open_amount, cur.decimal_places) != 0.0
""", """,
locals(), locals(),
), ),

117
partner_statement/report/report_statement_common.py
View File

@ -38,46 +38,66 @@ class ReportStatementCommon(models.AbstractModel):
return str( return str(
self._cr.mogrify( self._cr.mogrify(
""" """
SELECT l.partner_id, l.currency_id, l.company_id, l.move_id, SELECT l.partner_id, l.currency_id, l.company_id, l.move_id,
CASE WHEN l.balance > 0.0 (abs(COALESCE(l.balance, 0.0)) + sum(
THEN l.balance - sum(coalesce(pd.amount, 0.0)) coalesce(pr.pr_sign, 0.0) * coalesce(pr.amount, 0.0))
ELSE l.balance + sum(coalesce(pc.amount, 0.0)) ) * sign(COALESCE(l.balance, 0.0)) AS open_due,
END AS open_due, (abs(COALESCE(l.amount_currency, 0.0)) + sum(
CASE WHEN l.balance > 0.0 coalesce(pr.pr_sign, 0.0) * CASE
THEN l.amount_currency - sum(coalesce(pd.amount_currency, 0.0)) WHEN pr.currency_id IS NOT NULL AND pr.currency_id = l.currency_id
ELSE l.amount_currency + sum(coalesce(pc.amount_currency, 0.0)) THEN coalesce(pr.amount_currency, 0.0)
END AS open_due_currency, WHEN cur.id IS NOT NULL AND ROUND(
abs(COALESCE(l.balance, 0.0)), cur.decimal_places) > 0.0
THEN ROUND(coalesce(pr.amount, 0.0) *
COALESCE(l.amount_currency, 0.0) / NULLIF(l.balance, 0.0),
cur.decimal_places)
ELSE ROUND(coalesce(pr.amount, 0.0) *
COALESCE((
SELECT r.rate FROM res_currency_rate r
JOIN account_move_line aml
ON pr.credit_move_id = aml.id
WHERE r.currency_id = l.currency_id
AND r.name <= aml.date
AND (r.company_id IS NULL
OR r.company_id = l.company_id)
ORDER BY r.company_id, r.name DESC LIMIT 1), 1.0),
cur.decimal_places)
END)
) * sign(COALESCE(l.amount_currency, 0.0)) AS open_due_currency,
CASE WHEN l.date_maturity is null CASE WHEN l.date_maturity is null
THEN l.date THEN l.date
ELSE l.date_maturity ELSE l.date_maturity
END as date_maturity END as date_maturity
FROM (
SELECT l.*, CASE
WHEN l.debit = 0.0 AND l.credit = 0.0 AND l.currency_id IS NOT NULL
AND ROUND(COALESCE(l.amount_currency, 0.0),
cur.decimal_places) > 0.0 THEN 1
WHEN l.debit = 0.0 AND l.credit = 0.0 AND l.currency_id IS NOT NULL
AND ROUND(COALESCE(l.amount_currency, 0.0),
cur.decimal_places) < 0.0 THEN -1
WHEN l.balance > 0.0 THEN 1 ELSE -1 END as sign
FROM account_move_line l FROM account_move_line l
JOIN account_move m ON (l.move_id = m.id) LEFT JOIN res_currency cur ON cur.id = l.currency_id
LEFT JOIN (SELECT pr.* ) l
FROM account_partial_reconcile pr JOIN account_move m ON l.move_id = m.id
INNER JOIN account_move_line l2 LEFT JOIN res_currency cur ON cur.id = l.currency_id
ON pr.credit_move_id = l2.id LEFT JOIN LATERAL (SELECT pr.*,
WHERE l2.date <= %(date_end)s CASE WHEN pr.credit_move_id = l.id THEN l.sign
) as pd ON pd.debit_move_id = l.id ELSE -l.sign END AS pr_sign
LEFT JOIN (SELECT pr.* FROM account_partial_reconcile pr
FROM account_partial_reconcile pr WHERE pr.max_date <= %(date_end)s AND (
INNER JOIN account_move_line l2 (pr.debit_move_id = l.id) OR (pr.credit_move_id = l.id))
ON pr.debit_move_id = l2.id ) as pr ON TRUE
WHERE l2.date <= %(date_end)s WHERE l.partner_id IN %(partners)s
) as pc ON pc.credit_move_id = l.id AND l.account_internal_type = %(account_type)s
WHERE l.partner_id IN %(partners)s AND (
AND l.account_internal_type = %(account_type)s (pr.id IS NOT NULL AND pr.max_date <= %(date_end)s) OR
AND ( (pr.id IS NULL)
(pd.id IS NOT NULL AND ) AND l.date <= %(date_end)s AND not l.blocked
pd.max_date <= %(date_end)s) OR AND m.state IN ('posted')
(pc.id IS NOT NULL AND GROUP BY l.partner_id, l.currency_id, l.date, l.date_maturity,
pc.max_date <= %(date_end)s) OR l.amount_currency, l.balance, l.move_id, l.company_id, l.id
(pd.id IS NULL AND pc.id IS NULL)
) AND l.date <= %(date_end)s AND not l.blocked
AND m.state IN ('posted')
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
""", """,
locals(), locals(),
), ),
@ -89,12 +109,12 @@ class ReportStatementCommon(models.AbstractModel):
self._cr.mogrify( self._cr.mogrify(
""" """
SELECT partner_id, currency_id, date_maturity, open_due, SELECT partner_id, currency_id, date_maturity, open_due,
open_due_currency, move_id, company_id, open_due_currency, move_id, company_id,
CASE CASE
WHEN %(date_end)s <= date_maturity AND currency_id is null WHEN %(date_end)s <= date_maturity AND currency_id is null
THEN open_due THEN open_due
WHEN %(date_end)s <= date_maturity AND currency_id is not null WHEN %(date_end)s <= date_maturity AND currency_id is not null
THEN open_due_currency THEN open_due_currency
ELSE 0.0 ELSE 0.0
END as current, END as current,
CASE CASE
@ -152,7 +172,7 @@ class ReportStatementCommon(models.AbstractModel):
END as b_over_120 END as b_over_120
FROM Q1 FROM Q1
GROUP BY partner_id, currency_id, date_maturity, open_due, GROUP BY partner_id, currency_id, date_maturity, open_due,
open_due_currency, move_id, company_id open_due_currency, move_id, company_id
""", """,
locals(), locals(),
), ),
@ -178,11 +198,9 @@ class ReportStatementCommon(models.AbstractModel):
def _show_buckets_sql_q4(self): def _show_buckets_sql_q4(self):
return """ return """
SELECT partner_id, currency_id, sum(current) as current, SELECT partner_id, currency_id, sum(current) as current,
sum(b_1_30) as b_1_30, sum(b_1_30) as b_1_30, sum(b_30_60) as b_30_60,
sum(b_30_60) as b_30_60, sum(b_60_90) as b_60_90, sum(b_90_120) as b_90_120,
sum(b_60_90) as b_60_90, sum(b_over_120) as b_over_120
sum(b_90_120) as b_90_120,
sum(b_over_120) as b_over_120
FROM Q3 FROM Q3
GROUP BY partner_id, currency_id GROUP BY partner_id, currency_id
""" """
@ -224,9 +242,9 @@ class ReportStatementCommon(models.AbstractModel):
Q3 AS (%s), Q3 AS (%s),
Q4 AS (%s) Q4 AS (%s)
SELECT partner_id, currency_id, current, b_1_30, b_30_60, b_60_90, SELECT partner_id, currency_id, current, b_1_30, b_30_60, b_60_90,
b_90_120, b_over_120, b_90_120, b_over_120,
current+b_1_30+b_30_60+b_60_90+b_90_120+b_over_120 current+b_1_30+b_30_60+b_60_90+b_90_120+b_over_120
AS balance AS balance
FROM Q4 FROM Q4
GROUP BY partner_id, currency_id, current, b_1_30, b_30_60, GROUP BY partner_id, currency_id, current, b_1_30, b_30_60,
b_60_90, b_90_120, b_over_120""" b_60_90, b_90_120, b_over_120"""
@ -288,7 +306,8 @@ class ReportStatementCommon(models.AbstractModel):
currencies, currencies,
) )
@api.model # noqa: C901 @api.model
# flake8: noqa: C901
def _get_report_values(self, docids, data=None): def _get_report_values(self, docids, data=None):
""" """
@return: returns a dict of parameters to pass to qweb report. @return: returns a dict of parameters to pass to qweb report.