[IMP] partner_statement: add Detailed Activity report
This commit is contained in:
@@ -12,13 +12,13 @@ class OutstandingStatement(models.AbstractModel):
|
||||
_name = "report.partner_statement.outstanding_statement"
|
||||
_description = "Partner Outstanding Statement"
|
||||
|
||||
def _display_lines_sql_q1(self, partners, date_end, account_type):
|
||||
def _display_outstanding_lines_sql_q1(self, partners, date_end, account_type):
|
||||
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,
|
||||
l.blocked, l.currency_id, l.company_id,
|
||||
CASE WHEN l.ref IS NOT NULL
|
||||
THEN l.ref
|
||||
ELSE m.ref
|
||||
@@ -60,13 +60,13 @@ class OutstandingStatement(models.AbstractModel):
|
||||
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
|
||||
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')
|
||||
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
|
||||
@@ -79,36 +79,36 @@ class OutstandingStatement(models.AbstractModel):
|
||||
"utf-8",
|
||||
)
|
||||
|
||||
def _display_lines_sql_q2(self):
|
||||
def _display_outstanding_lines_sql_q2(self, sub):
|
||||
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,
|
||||
CASE WHEN Q1.currency_id is not null
|
||||
THEN Q1.open_amount_currency
|
||||
ELSE Q1.open_amount
|
||||
END as open_amount
|
||||
FROM Q1
|
||||
f"""
|
||||
SELECT {sub}.partner_id, {sub}.currency_id, {sub}.move_id,
|
||||
{sub}.date, {sub}.date_maturity, {sub}.debit, {sub}.credit,
|
||||
{sub}.name, {sub}.ref, {sub}.blocked, {sub}.company_id,
|
||||
CASE WHEN {sub}.currency_id is not null
|
||||
THEN {sub}.open_amount_currency
|
||||
ELSE {sub}.open_amount
|
||||
END as open_amount, {sub}.id
|
||||
FROM {sub}
|
||||
""",
|
||||
locals(),
|
||||
),
|
||||
"utf-8",
|
||||
)
|
||||
|
||||
def _display_lines_sql_q3(self, company_id):
|
||||
def _display_outstanding_lines_sql_q3(self, sub, 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
|
||||
f"""
|
||||
SELECT {sub}.partner_id, {sub}.move_id, {sub}.date,
|
||||
{sub}.date_maturity, {sub}.name, {sub}.ref, {sub}.debit,
|
||||
{sub}.credit, {sub}.debit-{sub}.credit AS amount,
|
||||
COALESCE({sub}.currency_id, c.currency_id) AS currency_id,
|
||||
{sub}.open_amount, {sub}.blocked, {sub}.id
|
||||
FROM {sub}
|
||||
JOIN res_company c ON (c.id = {sub}.company_id)
|
||||
WHERE c.id = %(company_id)s AND {sub}.open_amount != 0.0
|
||||
""",
|
||||
locals(),
|
||||
),
|
||||
@@ -127,13 +127,16 @@ class OutstandingStatement(models.AbstractModel):
|
||||
Q2 AS (%s),
|
||||
Q3 AS (%s)
|
||||
SELECT partner_id, currency_id, move_id, date, date_maturity, debit,
|
||||
credit, amount, open_amount, name, ref, blocked
|
||||
credit, amount, open_amount, COALESCE(name, '') as name,
|
||||
COALESCE(ref, '') as ref, blocked, id
|
||||
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),
|
||||
self._display_outstanding_lines_sql_q1(
|
||||
partners, date_end, account_type
|
||||
),
|
||||
self._display_outstanding_lines_sql_q2("Q1"),
|
||||
self._display_outstanding_lines_sql_q3("Q2", company_id),
|
||||
)
|
||||
)
|
||||
for row in self.env.cr.dictfetchall():
|
||||
|
||||
Reference in New Issue
Block a user