-
-
Notifications
You must be signed in to change notification settings - Fork 617
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[16.0][ADD] partner_statement, add report current statement #1163
base: 16.0
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,159 @@ | ||||||
# Copyright 2018 ForgeFlow, S.L. (https://www.forgeflow.com) | ||||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). | ||||||
|
||||||
from odoo import api, models | ||||||
|
||||||
|
||||||
class CurrentStatement(models.AbstractModel): | ||||||
"""Model of Current Statement""" | ||||||
|
||||||
_inherit = "statement.common" | ||||||
_name = "report.partner_statement.current_statement" | ||||||
_description = "Partner Current Statement" | ||||||
|
||||||
def _display_lines_sql_q1(self, partners, date_end, account_type): | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
same for the other methods |
||||||
partners = tuple(partners) | ||||||
return str( | ||||||
self._cr.mogrify( | ||||||
""" | ||||||
SELECT l.id, m.name AS move_id, l.partner_id, l.date, l.name, | ||||||
l.blocked, l.currency_id, l.company_id, | ||||||
CASE WHEN l.ref IS NOT NULL | ||||||
THEN l.ref | ||||||
ELSE m.ref | ||||||
END as ref, | ||||||
CASE WHEN (l.currency_id is not null AND l.amount_currency > 0.0) | ||||||
THEN avg(l.amount_currency) | ||||||
ELSE avg(l.debit) | ||||||
END as debit, | ||||||
CASE WHEN (l.currency_id is not null AND l.amount_currency < 0.0) | ||||||
THEN avg(l.amount_currency * (-1)) | ||||||
ELSE avg(l.credit) | ||||||
END as credit, | ||||||
CASE WHEN l.balance > 0.0 | ||||||
THEN round(l.balance - sum(coalesce(pd.amount, 0.0)),2) | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why apply round? if you have a good reason, then apply it to other reports too, but my opinion is not to apply it in the queries, as maybe you have a different rounding instead of 2. I think it should be applied somewhere in the python part of the code. |
||||||
ELSE round(l.balance + sum(coalesce(pc.amount, 0.0)),2) | ||||||
END AS open_amount, | ||||||
CASE WHEN l.balance > 0.0 | ||||||
THEN round(l.amount_currency - sum(coalesce(pd.debit_amount_currency, 0.0)),2) | ||||||
ELSE round(l.amount_currency + sum(coalesce(pc.credit_amount_currency, 0.0)),2) | ||||||
END AS open_amount_currency, | ||||||
CASE WHEN l.date_maturity is null | ||||||
THEN l.date | ||||||
ELSE l.date_maturity | ||||||
END as date_maturity, | ||||||
CASE WHEN | ||||||
coalesce(l.date_maturity,l.date)::date | ||||||
< date_trunc('month', date %(date_end)s)::date | ||||||
THEN 0 | ||||||
ELSE 1 | ||||||
END current_month | ||||||
FROM account_move_line l | ||||||
JOIN account_account aa ON (aa.id = l.account_id) | ||||||
JOIN account_move m ON (l.move_id = m.id) | ||||||
LEFT JOIN (SELECT pr.* | ||||||
FROM account_partial_reconcile pr | ||||||
INNER JOIN account_move_line l2 | ||||||
ON pr.credit_move_id = l2.id | ||||||
WHERE l2.date <= %(date_end)s | ||||||
) as pd ON pd.debit_move_id = l.id | ||||||
LEFT JOIN (SELECT pr.* | ||||||
FROM account_partial_reconcile pr | ||||||
INNER JOIN account_move_line l2 | ||||||
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 aa.account_type = %(account_type)s | ||||||
AND ( | ||||||
(pd.id IS NOT NULL AND | ||||||
pd.max_date <= %(date_end)s) OR | ||||||
(pc.id IS NOT NULL AND | ||||||
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') | ||||||
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 | ||||||
ELSE m.ref | ||||||
END, | ||||||
l.blocked, l.currency_id, l.balance, l.amount_currency, l.company_id | ||||||
""", | ||||||
locals(), | ||||||
), | ||||||
"utf-8", | ||||||
) | ||||||
|
||||||
def _display_lines_sql_q2(self): | ||||||
return str( | ||||||
self._cr.mogrify( | ||||||
""" | ||||||
SELECT Q1.partner_id, Q1.currency_id, Q1.move_id, | ||||||
Q1.date, Q1.date_maturity, Q1.debit, Q1.credit, | ||||||
Q1.name, Q1.ref, Q1.blocked, Q1.company_id, | ||||||
Q1.current_month, | ||||||
CASE WHEN Q1.currency_id is not null | ||||||
THEN Q1.open_amount_currency | ||||||
ELSE Q1.open_amount | ||||||
END as open_amount | ||||||
FROM Q1 | ||||||
""", | ||||||
locals(), | ||||||
), | ||||||
"utf-8", | ||||||
) | ||||||
|
||||||
def _display_lines_sql_q3(self, company_id): | ||||||
return str( | ||||||
self._cr.mogrify( | ||||||
""" | ||||||
SELECT Q2.partner_id, Q2.move_id, Q2.date, Q2.date_maturity, | ||||||
Q2.name, Q2.ref, Q2.debit, Q2.credit, | ||||||
Q2.debit-Q2.credit AS amount, blocked, | ||||||
COALESCE(Q2.currency_id, c.currency_id) AS currency_id, | ||||||
Q2.open_amount | ||||||
FROM Q2 | ||||||
JOIN res_company c ON (c.id = Q2.company_id) | ||||||
WHERE c.id = %(company_id)s AND (Q2.open_amount != 0.0 | ||||||
or Q2.current_month = 1) | ||||||
""", | ||||||
locals(), | ||||||
), | ||||||
"utf-8", | ||||||
) | ||||||
|
||||||
def _get_account_display_lines( | ||||||
self, company_id, partner_ids, date_start, date_end, account_type | ||||||
): | ||||||
res = dict(map(lambda x: (x, []), partner_ids)) | ||||||
partners = tuple(partner_ids) | ||||||
# pylint: disable=E8103 | ||||||
self.env.cr.execute( | ||||||
""" | ||||||
WITH Q1 as (%s), | ||||||
Q2 AS (%s), | ||||||
Q3 AS (%s) | ||||||
SELECT partner_id, currency_id, move_id, date, date_maturity, debit, | ||||||
credit, amount, open_amount, name, ref, blocked | ||||||
FROM Q3 | ||||||
ORDER BY date, date_maturity, move_id""" | ||||||
% ( | ||||||
self._display_lines_sql_q1(partners, date_end, account_type), | ||||||
self._display_lines_sql_q2(), | ||||||
self._display_lines_sql_q3(company_id), | ||||||
) | ||||||
) | ||||||
for row in self.env.cr.dictfetchall(): | ||||||
res[row.pop("partner_id")].append(row) | ||||||
return res | ||||||
|
||||||
@api.model | ||||||
def _get_report_values(self, docids, data=None): | ||||||
if not data: | ||||||
data = {} | ||||||
if "company_id" not in data: | ||||||
wiz = self.env["current.statement.wizard"].with_context( | ||||||
active_ids=docids, model="res.partner" | ||||||
) | ||||||
data.update(wiz.create({})._prepare_statement()) | ||||||
data["amount_field"] = "open_amount" | ||||||
return super()._get_report_values(docids, data) | ||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there too much difference between current_statement and outstanding_statement? If not, perhaps it's better to make current_statement be an inherit of outstanding_statement, the same way detailed_activity_statement inherits activity_statement. Surely it would reduce code.
Or maybe it should just get merged into the outstanding_statement by adding an extra boolean parameter.