diff --git a/customer_outstanding_statement/report/customer_outstanding_statement.py b/customer_outstanding_statement/report/customer_outstanding_statement.py index 6343a6ac..f20c45c6 100644 --- a/customer_outstanding_statement/report/customer_outstanding_statement.py +++ b/customer_outstanding_statement/report/customer_outstanding_statement.py @@ -98,9 +98,10 @@ class CustomerOutstandingStatement(models.AbstractModel): def _display_lines_sql_q2(self): return """ - SELECT partner_id, currency_id, move_id, date, date_maturity, - debit, credit, name, ref, blocked, company_id, - CASE WHEN currency_id is not null + 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 open_amount_currency ELSE open_amount END as open_amount @@ -109,9 +110,11 @@ class CustomerOutstandingStatement(models.AbstractModel): def _display_lines_sql_q3(self, company_id): return """ - SELECT Q2.partner_id, move_id, date, date_maturity, Q2.name, ref, - debit, credit, debit-credit AS amount, blocked, - COALESCE(Q2.currency_id, c.currency_id) AS currency_id, open_amount + 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 = %s diff --git a/customer_outstanding_statement/views/statement.xml b/customer_outstanding_statement/views/statement.xml index 940e0e3b..4f5d2dcb 100644 --- a/customer_outstanding_statement/views/statement.xml +++ b/customer_outstanding_statement/views/statement.xml @@ -108,7 +108,7 @@ -

+

Aging Report at in :