From 6bd9df0d15dbabfb4741c1dc887f13276ddb96a0 Mon Sep 17 00:00:00 2001
From: "Adrien Peiffer (ACSONE)" <adrien.peiffer@acsone.eu>
Date: Thu, 22 Feb 2018 14:10:19 +0100
Subject: [PATCH] [10.0] AFR Aged partner balance : columns and datas
 consistency. (#383)

---
 account_financial_report/__manifest__.py      |  2 +-
 .../report/aged_partner_balance.py            | 54 +++++++++----------
 .../report/templates/aged_partner_balance.xml | 12 ++---
 3 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/account_financial_report/__manifest__.py b/account_financial_report/__manifest__.py
index b01409d6..59bc2c64 100644
--- a/account_financial_report/__manifest__.py
+++ b/account_financial_report/__manifest__.py
@@ -5,7 +5,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     'name': 'Account Financial Reports',
-    'version': '11.0.1.1.0',
+    'version': '11.0.1.2.0',
     'category': 'Reporting',
     'summary': 'OCA Financial Reports',
     'author': 'Camptocamp SA,'
diff --git a/account_financial_report/report/aged_partner_balance.py b/account_financial_report/report/aged_partner_balance.py
index c7a979ec..0e145362 100644
--- a/account_financial_report/report/aged_partner_balance.py
+++ b/account_financial_report/report/aged_partner_balance.py
@@ -318,12 +318,11 @@ WITH
     date_range AS
         (
             SELECT
-                %s AS date_current,
+                DATE %s AS date_current,
                 DATE %s - INTEGER '30' AS date_less_30_days,
                 DATE %s - INTEGER '60' AS date_less_60_days,
                 DATE %s - INTEGER '90' AS date_less_90_days,
-                DATE %s - INTEGER '120' AS date_less_120_days,
-                DATE %s - INTEGER '150' AS date_older
+                DATE %s - INTEGER '120' AS date_less_120_days
         )
 INSERT INTO
     report_aged_partner_balance_line
@@ -348,45 +347,45 @@ SELECT
     SUM(rlo.amount_residual) AS amount_residual,
     SUM(
         CASE
-            WHEN rlo.date_due > date_range.date_less_30_days
+            WHEN rlo.date_due >= date_range.date_current
             THEN rlo.amount_residual
         END
     ) AS current,
     SUM(
         CASE
             WHEN
-                rlo.date_due > date_range.date_less_60_days
-                AND rlo.date_due <= date_range.date_less_30_days
+                rlo.date_due >= date_range.date_less_30_days
+                AND rlo.date_due < date_range.date_current
             THEN rlo.amount_residual
         END
     ) AS age_30_days,
     SUM(
         CASE
             WHEN
-                rlo.date_due > date_range.date_less_90_days
-                AND rlo.date_due <= date_range.date_less_60_days
+                rlo.date_due >= date_range.date_less_60_days
+                AND rlo.date_due < date_range.date_less_30_days
             THEN rlo.amount_residual
         END
     ) AS age_60_days,
     SUM(
         CASE
             WHEN
-                rlo.date_due > date_range.date_less_120_days
-                AND rlo.date_due <= date_range.date_less_90_days
+                rlo.date_due >= date_range.date_less_90_days
+                AND rlo.date_due < date_range.date_less_60_days
             THEN rlo.amount_residual
         END
     ) AS age_90_days,
     SUM(
         CASE
             WHEN
-                rlo.date_due > date_range.date_older
-                AND rlo.date_due <= date_range.date_less_120_days
+                rlo.date_due >= date_range.date_less_120_days
+                AND rlo.date_due < date_range.date_less_90_days
             THEN rlo.amount_residual
         END
     ) AS age_120_days,
     SUM(
         CASE
-            WHEN rlo.date_due <= date_range.date_older
+            WHEN rlo.date_due < date_range.date_less_120_days
             THEN rlo.amount_residual
         END
     ) AS older
@@ -420,7 +419,7 @@ AND ra.report_id = %s
 GROUP BY
     rp.id
         """
-        query_inject_line_params = (self.date_at,) * 6
+        query_inject_line_params = (self.date_at,) * 5
         query_inject_line_params += (
             self.env.uid,
             self.open_items_id.id,
@@ -439,12 +438,11 @@ WITH
     date_range AS
         (
             SELECT
-                %s AS date_current,
+                DATE %s AS date_current,
                 DATE %s - INTEGER '30' AS date_less_30_days,
                 DATE %s - INTEGER '60' AS date_less_60_days,
                 DATE %s - INTEGER '90' AS date_less_90_days,
-                DATE %s - INTEGER '120' AS date_less_120_days,
-                DATE %s - INTEGER '150' AS date_older
+                DATE %s - INTEGER '120' AS date_less_120_days
         )
 INSERT INTO
     report_aged_partner_balance_move_line
@@ -480,35 +478,35 @@ SELECT
     rlo.label,
     rlo.amount_residual AS amount_residual,
     CASE
-        WHEN rlo.date_due > date_range.date_less_30_days
+        WHEN rlo.date_due >= date_range.date_current
         THEN rlo.amount_residual
     END AS current,
     CASE
         WHEN
-            rlo.date_due > date_range.date_less_60_days
-            AND rlo.date_due <= date_range.date_less_30_days
+            rlo.date_due >= date_range.date_less_30_days
+            AND rlo.date_due < date_range.date_current
         THEN rlo.amount_residual
     END AS age_30_days,
     CASE
         WHEN
-            rlo.date_due > date_range.date_less_90_days
-            AND rlo.date_due <= date_range.date_less_60_days
+            rlo.date_due >= date_range.date_less_60_days
+            AND rlo.date_due < date_range.date_less_30_days
         THEN rlo.amount_residual
     END AS age_60_days,
     CASE
         WHEN
-            rlo.date_due > date_range.date_less_120_days
-            AND rlo.date_due <= date_range.date_less_90_days
+            rlo.date_due >= date_range.date_less_90_days
+            AND rlo.date_due < date_range.date_less_60_days
         THEN rlo.amount_residual
     END AS age_90_days,
     CASE
         WHEN
-            rlo.date_due > date_range.date_older
-            AND rlo.date_due <= date_range.date_less_120_days
+            rlo.date_due >= date_range.date_less_120_days
+            AND rlo.date_due < date_range.date_less_90_days
         THEN rlo.amount_residual
     END AS age_120_days,
     CASE
-        WHEN rlo.date_due <= date_range.date_older
+        WHEN rlo.date_due < date_range.date_less_120_days
         THEN rlo.amount_residual
     END AS older
 FROM
@@ -539,7 +537,7 @@ WHERE
     rao.report_id = %s
 AND ra.report_id = %s
         """
-        query_inject_move_line_params = (self.date_at,) * 6
+        query_inject_move_line_params = (self.date_at,) * 5
         query_inject_move_line_params += (
             self.env.uid,
             self.open_items_id.id,
diff --git a/account_financial_report/report/templates/aged_partner_balance.xml b/account_financial_report/report/templates/aged_partner_balance.xml
index feeb73b8..d5822bdb 100644
--- a/account_financial_report/report/templates/aged_partner_balance.xml
+++ b/account_financial_report/report/templates/aged_partner_balance.xml
@@ -106,17 +106,17 @@
                 <!--## amount_residual-->
                 <div class="act_as_cell" style="width: 110px;">Residual</div>
                 <!--## current-->
-                <div class="act_as_cell" style="width: 110px;">Current</div>
+                <div class="act_as_cell" style="width: 110px;">Not due</div>
                 <!--## age_30_days-->
-                <div class="act_as_cell" style="width: 110px;">Age ≤ 30 d.</div>
+                <div class="act_as_cell" style="width: 110px;">1 - 30 d.</div>
                 <!--## age_60_days-->
-                <div class="act_as_cell" style="width: 110px;">Age ≤ 60 d.</div>
+                <div class="act_as_cell" style="width: 110px;">31 - 60 d.</div>
                 <!--## age_90_days-->
-                <div class="act_as_cell" style="width: 110px;">Age ≤ 90 d.</div>
+                <div class="act_as_cell" style="width: 110px;">61 - 90 d.</div>
                 <!--## age_120_days-->
-                <div class="act_as_cell" style="width: 110px;">Age ≤ 120 d.</div>
+                <div class="act_as_cell" style="width: 110px;">91 - 120 d.</div>
                 <!--## older-->
-                <div class="act_as_cell" style="width: 110px;">Older</div>
+                <div class="act_as_cell" style="width: 110px;"> > 120 d.</div>
             </div>
         </div>
     </template>