From ba4ea84fe40595eae7cf799a5b240cff89e50e40 Mon Sep 17 00:00:00 2001 From: Jordi Ballester Date: Wed, 13 Mar 2019 22:28:43 +1300 Subject: [PATCH] [FIX] Scope unscoped SQL References --- .../report/activity_statement.py | 7 ++++--- .../report/outstanding_statement.py | 19 +++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/partner_statement/report/activity_statement.py b/partner_statement/report/activity_statement.py index 7c627ef0..53f920a9 100644 --- a/partner_statement/report/activity_statement.py +++ b/partner_statement/report/activity_statement.py @@ -86,9 +86,10 @@ class ActivityStatement(models.AbstractModel): def _display_lines_sql_q2(self, company_id): return str(self._cr.mogrify(""" - SELECT Q1.partner_id, move_id, date, date_maturity, Q1.name, ref, - debit, credit, debit-credit as amount, blocked, - COALESCE(Q1.currency_id, c.currency_id) AS currency_id + SELECT Q1.partner_id, Q1.move_id, Q1.date, Q1.date_maturity, + Q1.name, Q1.ref, Q1.debit, Q1.credit, + Q1.debit-Q1.credit as amount, Q1.blocked, + COALESCE(Q1.currency_id, c.currency_id) AS currency_id FROM Q1 JOIN res_company c ON (c.id = Q1.company_id) WHERE c.id = %(company_id)s diff --git a/partner_statement/report/outstanding_statement.py b/partner_statement/report/outstanding_statement.py index 9c6fab6d..f36e3c1d 100644 --- a/partner_statement/report/outstanding_statement.py +++ b/partner_statement/report/outstanding_statement.py @@ -94,11 +94,12 @@ class OutstandingStatement(models.AbstractModel): def _display_lines_sql_q2(self): return str( self._cr.mogrify(""" - SELECT partner_id, currency_id, move_id, date, date_maturity, - debit, credit, name, ref, blocked, company_id, - CASE WHEN currency_id is not null - THEN open_amount_currency - ELSE open_amount + 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 FROM Q1 """, locals() @@ -108,9 +109,11 @@ class OutstandingStatement(models.AbstractModel): def _display_lines_sql_q3(self, company_id): return str(self._cr.mogrify(""" - 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 = %(company_id)s