Display only posted entries (OCA#648)

* Add files via upload Display only posted entries * Update activity_statement.py * Update report_statement_common.py
ForgeFlow · Feb 4, 2020 · d2906a6 · d2906a6
1 parent 9aa3531
commit d2906a6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/partner_statement/report/activity_statement.py b/partner_statement/report/activity_statement.py
@@ -28,6 +28,7 @@ def _initial_balance_sql_q1(self, partners, date_start, account_type):
             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 @@ def _display_lines_sql_q1(self, partners, date_start, date_end,
                 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
@@ -58,7 +58,7 @@ def _display_lines_sql_q1(self, partners, date_end, account_type):
                                   (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
@@ -72,6 +72,7 @@ def _show_buckets_sql_q1(self, partners, date_end, account_type):
                                       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