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

Display only posted entries (#648) 

* Add files via upload

Display only posted entries

* Update activity_statement.py

* Update report_statement_common.py
pull/654/head
LGodoo 2020-02-04 14:28:25 +02:00 committed by mreficent
parent 0987ea970d
commit c27e2ef61b
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
partner_statement/report/activity_statement.py
View File

@ -28,6 +28,7 @@ class ActivityStatement(models.AbstractModel):
JOIN account_move m ON (l.move_id = m.id)
WHERE l.partner_id IN %(partners)s AND at.type = %(account_type)s
AND l.date < %(date_start)s AND not l.blocked
AND m.state IN ('posted')
GROUP BY l.partner_id, l.currency_id, l.amount_currency,
l.company_id
""", locals()), "utf-8")
@ -90,6 +91,7 @@ class ActivityStatement(models.AbstractModel):
AND at.type = %(account_type)s
AND %(date_start)s <= l.date
AND l.date <= %(date_end)s
AND m.state IN ('posted')
GROUP BY l.partner_id, m.name, l.date, l.date_maturity,
CASE WHEN (aj.type IN ('sale', 'purchase'))
THEN l.name

2
partner_statement/report/outstanding_statement.py
View File

@ -58,7 +58,7 @@ class OutstandingStatement(models.AbstractModel):
(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 l.date <= %(date_end)s AND m.state IN ('posted')
GROUP BY l.partner_id, m.name, l.date, l.date_maturity, l.name,
l.ref, l.blocked, l.currency_id,
l.balance, l.amount_currency, l.company_id

1
partner_statement/report/report_statement_common.py
View File

@ -72,6 +72,7 @@ class ReportStatementCommon(models.AbstractModel):
pc.max_date <= %(date_end)s) OR
(pd.id IS NULL AND pc.id IS NULL)
) AND l.date <= %(date_end)s AND not l.blocked
AND m.state IN ('posted')
GROUP BY l.partner_id, l.currency_id, l.date, l.date_maturity,
l.amount_currency, l.balance, l.move_id,
l.company_id, l.id