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] Scope unscoped SQL References

pull/1106/head
Jordi Ballester 2019-03-13 22:28:43 +13:00 committed by Miquel Raïch
parent 4f30e7d0a0
commit a630440545
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
partner_statement/report/activity_statement.py
View File

@ -86,9 +86,10 @@ class ActivityStatement(models.AbstractModel):
def _display_lines_sql_q2(self, company_id): def _display_lines_sql_q2(self, company_id):
return str(self._cr.mogrify(""" return str(self._cr.mogrify("""
SELECT Q1.partner_id, move_id, date, date_maturity, Q1.name, ref, SELECT Q1.partner_id, Q1.move_id, Q1.date, Q1.date_maturity,
debit, credit, debit-credit as amount, blocked, Q1.name, Q1.ref, Q1.debit, Q1.credit,
COALESCE(Q1.currency_id, c.currency_id) AS currency_id Q1.debit-Q1.credit as amount, Q1.blocked,
COALESCE(Q1.currency_id, c.currency_id) AS currency_id
FROM Q1 FROM Q1
JOIN res_company c ON (c.id = Q1.company_id) JOIN res_company c ON (c.id = Q1.company_id)
WHERE c.id = %(company_id)s WHERE c.id = %(company_id)s

19
partner_statement/report/outstanding_statement.py
View File

@ -94,11 +94,12 @@ class OutstandingStatement(models.AbstractModel):
def _display_lines_sql_q2(self): def _display_lines_sql_q2(self):
return str( return str(
self._cr.mogrify(""" self._cr.mogrify("""
SELECT partner_id, currency_id, move_id, date, date_maturity, SELECT Q1.partner_id, Q1.currency_id, Q1.move_id,
debit, credit, name, ref, blocked, company_id, Q1.date, Q1.date_maturity, Q1.debit, Q1.credit,
CASE WHEN currency_id is not null Q1.name, Q1.ref, Q1.blocked, Q1.company_id,
THEN open_amount_currency CASE WHEN Q1.currency_id is not null
ELSE open_amount THEN open_amount_currency
ELSE open_amount
END as open_amount END as open_amount
FROM Q1 FROM Q1
""", locals() """, locals()
@ -108,9 +109,11 @@ class OutstandingStatement(models.AbstractModel):
def _display_lines_sql_q3(self, company_id): def _display_lines_sql_q3(self, company_id):
return str(self._cr.mogrify(""" return str(self._cr.mogrify("""
SELECT Q2.partner_id, move_id, date, date_maturity, Q2.name, ref, SELECT Q2.partner_id, Q2.move_id, Q2.date, Q2.date_maturity,
debit, credit, debit-credit AS amount, blocked, Q2.name, Q2.ref, Q2.debit, Q2.credit,
COALESCE(Q2.currency_id, c.currency_id) AS currency_id, open_amount Q2.debit-Q2.credit AS amount, blocked,
COALESCE(Q2.currency_id, c.currency_id) AS currency_id,
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 WHERE c.id = %(company_id)s