From 2c1a5990a02c1c98ecede03ae77f796c00564f2f Mon Sep 17 00:00:00 2001 From: mreficent Date: Mon, 26 Feb 2018 17:14:06 +0100 Subject: [PATCH] [FIX] Consider reconciled_date and fix aging report --- customer_activity_statement/__manifest__.py | 2 +- .../report/customer_activity_statement.py | 79 +++++++++++++------ .../views/statement.xml | 9 ++- .../customer_activity_statement_wizard.py | 4 +- 4 files changed, 65 insertions(+), 29 deletions(-) diff --git a/customer_activity_statement/__manifest__.py b/customer_activity_statement/__manifest__.py index 493fac65..41daefad 100644 --- a/customer_activity_statement/__manifest__.py +++ b/customer_activity_statement/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Customer Activity Statement', - 'version': '10.0.1.0.0', + 'version': '10.0.1.1.0', 'category': 'Accounting & Finance', 'summary': 'OCA Financial Reports', 'author': "Eficent, Odoo Community Association (OCA)", diff --git a/customer_activity_statement/report/customer_activity_statement.py b/customer_activity_statement/report/customer_activity_statement.py index 0bbcc577..2f478fc4 100644 --- a/customer_activity_statement/report/customer_activity_statement.py +++ b/customer_activity_statement/report/customer_activity_statement.py @@ -34,7 +34,7 @@ class CustomerActivityStatement(models.AbstractModel): JOIN account_account_type at ON (at.id = l.user_type_id) JOIN account_move m ON (l.move_id = m.id) WHERE l.partner_id IN (%s) AND at.type = 'receivable' - AND l.date <= '%s' AND not l.blocked + AND l.date < '%s' AND not l.blocked GROUP BY l.partner_id, l.currency_id, l.amount_currency, l.company_id """ % (partners, date_start) @@ -54,6 +54,7 @@ class CustomerActivityStatement(models.AbstractModel): partners = ', '.join([str(i) for i in partner_ids]) date_start = datetime.strptime( date_start, DEFAULT_SERVER_DATE_FORMAT).date() + # pylint: disable=E8103 self.env.cr.execute("""WITH Q1 AS (%s), Q2 AS (%s) SELECT partner_id, currency_id, balance FROM Q2""" % (self._initial_balance_sql_q1(partners, date_start), @@ -82,7 +83,7 @@ class CustomerActivityStatement(models.AbstractModel): JOIN account_account_type at ON (at.id = l.user_type_id) JOIN account_move m ON (l.move_id = m.id) WHERE l.partner_id IN (%s) AND at.type = 'receivable' - AND '%s' < l.date AND l.date <= '%s' + AND '%s' <= l.date AND l.date <= '%s' GROUP BY l.partner_id, m.name, l.date, l.date_maturity, l.name, l.ref, l.blocked, l.currency_id, l.amount_currency, l.company_id @@ -117,6 +118,31 @@ class CustomerActivityStatement(models.AbstractModel): res[row.pop('partner_id')].append(row) return res + def _show_buckets_sql_q0(self, date_end): + return """ + SELECT l1.id, + CASE WHEN l1.reconciled = TRUE and l1.balance > 0.0 + THEN max(pd.max_date) + WHEN l1.reconciled = TRUE and l1.balance < 0.0 + THEN max(pc.max_date) + ELSE null + END as reconciled_date + FROM account_move_line l1 + LEFT JOIN (SELECT pr.* + FROM account_partial_reconcile pr + INNER JOIN account_move_line l2 + ON pr.credit_move_id = l2.id + WHERE l2.date <= '%s' + ) as pd ON pd.debit_move_id = l1.id + LEFT JOIN (SELECT pr.* + FROM account_partial_reconcile pr + INNER JOIN account_move_line l2 + ON pr.debit_move_id = l2.id + WHERE l2.date <= '%s' + ) as pc ON pc.credit_move_id = l1.id + GROUP BY l1.id + """ % (date_end, date_end) + def _show_buckets_sql_q1(self, partners, date_end): return """ SELECT l.partner_id, l.currency_id, l.company_id, l.move_id, @@ -135,6 +161,7 @@ class CustomerActivityStatement(models.AbstractModel): FROM account_move_line l JOIN account_account_type at ON (at.id = l.user_type_id) JOIN account_move m ON (l.move_id = m.id) + LEFT JOIN Q0 ON Q0.id = l.id LEFT JOIN (SELECT pr.* FROM account_partial_reconcile pr INNER JOIN account_move_line l2 @@ -148,13 +175,15 @@ class CustomerActivityStatement(models.AbstractModel): WHERE l2.date <= '%s' ) as pc ON pc.credit_move_id = l.id WHERE l.partner_id IN (%s) AND at.type = 'receivable' - AND not l.reconciled AND not l.blocked + AND (Q0.reconciled_date is null or + Q0.reconciled_date > '%s') + AND l.date <= '%s' AND not l.blocked GROUP BY l.partner_id, l.currency_id, l.date, l.date_maturity, l.amount_currency, l.balance, l.move_id, l.company_id - """ % (date_end, date_end, partners) + """ % (date_end, date_end, partners, date_end, date_end) - def _show_buckets_sql_q2(self, today, minus_30, minus_60, minus_90, + def _show_buckets_sql_q2(self, date_end, minus_30, minus_60, minus_90, minus_120): return """ SELECT partner_id, currency_id, date_maturity, open_due, @@ -208,10 +237,10 @@ class CustomerActivityStatement(models.AbstractModel): FROM Q1 GROUP BY partner_id, currency_id, date_maturity, open_due, open_due_currency, move_id, company_id - """ % (today, today, minus_30, today, minus_30, today, minus_60, - minus_30, minus_60, minus_30, minus_90, minus_60, minus_90, - minus_60, minus_120, minus_90, minus_120, minus_90, minus_120, - minus_120) + """ % (date_end, date_end, minus_30, date_end, minus_30, date_end, + minus_60, minus_30, minus_60, minus_30, minus_90, minus_60, + minus_90, minus_60, minus_120, minus_90, minus_120, minus_90, + minus_120, minus_120) def _show_buckets_sql_q3(self, company_id): return """ @@ -235,21 +264,24 @@ class CustomerActivityStatement(models.AbstractModel): GROUP BY partner_id, currency_id """ - _bucket_dates = { - 'today': fields.date.today(), - 'minus_30': fields.date.today() - timedelta(days=30), - 'minus_60': fields.date.today() - timedelta(days=60), - 'minus_90': fields.date.today() - timedelta(days=90), - 'minus_120': fields.date.today() - timedelta(days=120), - } + def _get_bucket_dates(self, date_end): + return { + 'date_end': date_end, + 'minus_30': date_end - timedelta(days=30), + 'minus_60': date_end - timedelta(days=60), + 'minus_90': date_end - timedelta(days=90), + 'minus_120': date_end - timedelta(days=120), + } def _get_account_show_buckets(self, company_id, partner_ids, date_end): res = dict(map(lambda x: (x, []), partner_ids)) partners = ', '.join([str(i) for i in partner_ids]) date_end = datetime.strptime( date_end, DEFAULT_SERVER_DATE_FORMAT).date() - self.env.cr.execute("""WITH Q1 AS (%s), Q2 AS (%s), - Q3 AS (%s), Q4 AS (%s) + full_dates = self._get_bucket_dates(date_end) + # pylint: disable=E8103 + self.env.cr.execute(""" + WITH Q0 AS (%s), Q1 AS (%s), Q2 AS (%s), Q3 AS (%s), Q4 AS (%s) SELECT partner_id, currency_id, current, b_1_30, b_30_60, b_60_90, b_90_120, b_over_120, current+b_1_30+b_30_60+b_60_90+b_90_120+b_over_120 @@ -257,13 +289,14 @@ class CustomerActivityStatement(models.AbstractModel): FROM Q4 GROUP BY partner_id, currency_id, current, b_1_30, b_30_60, b_60_90, b_90_120, b_over_120""" % ( + self._show_buckets_sql_q0(date_end), self._show_buckets_sql_q1(partners, date_end), self._show_buckets_sql_q2( - self._bucket_dates['today'], - self._bucket_dates['minus_30'], - self._bucket_dates['minus_60'], - self._bucket_dates['minus_90'], - self._bucket_dates['minus_120']), + full_dates['date_end'], + full_dates['minus_30'], + full_dates['minus_60'], + full_dates['minus_90'], + full_dates['minus_120']), self._show_buckets_sql_q3(company_id), self._show_buckets_sql_q4())) for row in self.env.cr.dictfetchall(): diff --git a/customer_activity_statement/views/statement.xml b/customer_activity_statement/views/statement.xml index e03e0b7c..9172975c 100644 --- a/customer_activity_statement/views/statement.xml +++ b/customer_activity_statement/views/statement.xml @@ -9,11 +9,11 @@ -

+

Activity Statement

- Date:
+ Date:
Partner ref:

@@ -22,7 +22,7 @@

- Activity Statement in : + Activity Statement between and in :

@@ -114,6 +114,9 @@
+

+ Aging Report at in : +

diff --git a/customer_activity_statement/wizard/customer_activity_statement_wizard.py b/customer_activity_statement/wizard/customer_activity_statement_wizard.py index e6e4f6d3..3fb116e4 100644 --- a/customer_activity_statement/wizard/customer_activity_statement_wizard.py +++ b/customer_activity_statement/wizard/customer_activity_statement_wizard.py @@ -3,7 +3,7 @@ # (http://www.eficent.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from datetime import date, timedelta +from datetime import date from odoo import api, fields, models @@ -21,7 +21,7 @@ class CustomerActivityStatementWizard(models.TransientModel): date_start = fields.Date(required=True, default=fields.Date.to_string( - date.today()-timedelta(days=120))) + date(date.today().year, 1, 1))) date_end = fields.Date(required=True, default=fields.Date.to_string(date.today())) show_aging_buckets = fields.Boolean(string='Include Aging Buckets',