From c27e2ef61b3c2176354995432c744220d9ebafc5 Mon Sep 17 00:00:00 2001
From: LGodoo <50438663+LGodoo@users.noreply.github.com>
Date: Tue, 4 Feb 2020 14:28:25 +0200
Subject: [PATCH] Display only posted entries (#648)

* Add files via upload

Display only posted entries

* Update activity_statement.py

* Update report_statement_common.py
---
 partner_statement/report/activity_statement.py      | 2 ++
 partner_statement/report/outstanding_statement.py   | 2 +-
 partner_statement/report/report_statement_common.py | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/partner_statement/report/activity_statement.py b/partner_statement/report/activity_statement.py
index a86e3ac0..29512803 100644
--- a/partner_statement/report/activity_statement.py
+++ b/partner_statement/report/activity_statement.py
@@ -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
diff --git a/partner_statement/report/outstanding_statement.py b/partner_statement/report/outstanding_statement.py
index 90c0c482..7388b17e 100644
--- a/partner_statement/report/outstanding_statement.py
+++ b/partner_statement/report/outstanding_statement.py
@@ -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
diff --git a/partner_statement/report/report_statement_common.py b/partner_statement/report/report_statement_common.py
index e65a9b52..60b0e004 100644
--- a/partner_statement/report/report_statement_common.py
+++ b/partner_statement/report/report_statement_common.py
@@ -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