From 461b4c17579b764c2228ca5fde70e81cfe546e2a Mon Sep 17 00:00:00 2001
From: Florian da Costa <florian.dacosta@akretion.com>
Date: Thu, 9 Feb 2017 00:34:57 +0100
Subject: [PATCH] Fix unaffected account balance and add test

---
 .../report/general_ledger.py                  | 10 ++-
 .../tests/test_general_ledger.py              | 71 ++++++++++++++++++-
 2 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/account_financial_report_qweb/report/general_ledger.py b/account_financial_report_qweb/report/general_ledger.py
index 4ddcf455..8bd8fc25 100644
--- a/account_financial_report_qweb/report/general_ledger.py
+++ b/account_financial_report_qweb/report/general_ledger.py
@@ -1227,9 +1227,17 @@ WHERE id = %s
     ):
         """ Return subquery used to compute sum amounts on
         unaffected earnings accounts """
-        sub_subquery_sum_amounts = """
+        if not include_initial_balance:
+            sub_subquery_sum_amounts = """
+        SELECT
+            -SUM(ml.balance) AS balance
+            """
+        else:
+            sub_subquery_sum_amounts = """
         SELECT
             SUM(ml.balance) AS balance
+            """
+        sub_subquery_sum_amounts += """
         FROM
             account_account a
         INNER JOIN
diff --git a/account_financial_report_qweb/tests/test_general_ledger.py b/account_financial_report_qweb/tests/test_general_ledger.py
index e43ef25e..392c00bf 100644
--- a/account_financial_report_qweb/tests/test_general_ledger.py
+++ b/account_financial_report_qweb/tests/test_general_ledger.py
@@ -57,7 +57,8 @@ class TestGeneralLedgerReport(TransactionCase):
 
     def setUp(self):
         super(TestGeneralLedgerReport, self).setUp()
-
+        self.before_previous_fy_year = '2014-05-05'
+        self.previous_fy_date_start = '2015-01-01'
         self.previous_fy_date_end = '2015-12-31'
         self.fy_date_start = '2016-01-01'
         self.fy_date_end = '2016-12-31'
@@ -395,3 +396,71 @@ class TestGeneralLedgerReport(TransactionCase):
         self.assertEqual(lines['unaffected'].final_debit, 1000)
         self.assertEqual(lines['unaffected'].final_credit, 3000)
         self.assertEqual(lines['unaffected'].final_balance, -3000)
+
+    def test_04_unaffected_account_balance_2_years(self):
+        # Generate the general ledger line
+        lines = self._get_report_lines()
+        self.assertEqual(len(lines['unaffected']), 1)
+
+        # Check the initial and final balance
+        self.assertEqual(lines['unaffected'].initial_debit, 0)
+        self.assertEqual(lines['unaffected'].initial_credit, 0)
+        self.assertEqual(lines['unaffected'].initial_balance, 0)
+        self.assertEqual(lines['unaffected'].final_debit, 0)
+        self.assertEqual(lines['unaffected'].final_credit, 0)
+        self.assertEqual(lines['unaffected'].final_balance, 0)
+
+        # Add a move at any date 2 years before the balance
+        # (to create an historic)
+        self._add_move(
+            date=self.before_previous_fy_year,
+            receivable_debit=0,
+            receivable_credit=1000,
+            income_debit=1000,
+            income_credit=0
+        )
+
+        # Re Generate the general ledger line
+        lines = self._get_report_lines()
+        self.assertEqual(len(lines['unaffected']), 1)
+
+        # Check the initial and final balance
+        self.assertEqual(lines['unaffected'].initial_debit, 0)
+        self.assertEqual(lines['unaffected'].initial_credit, 0)
+        self.assertEqual(lines['unaffected'].initial_balance, 1000)
+        self.assertEqual(lines['unaffected'].final_debit, 0)
+        self.assertEqual(lines['unaffected'].final_credit, 0)
+        self.assertEqual(lines['unaffected'].final_balance, 1000)
+
+        # Affect the company's result last year
+        self._add_move(
+            date=self.previous_fy_date_start,
+            receivable_debit=1000,
+            receivable_credit=0,
+            income_debit=0,
+            income_credit=0,
+            unaffected_debit=0,
+            unaffected_credit=1000
+        )
+
+        # Add another move last year to test the initial balance this year
+        self._add_move(
+            date=self.previous_fy_date_start,
+            receivable_debit=0,
+            receivable_credit=500,
+            income_debit=500,
+            income_credit=0,
+            unaffected_debit=0,
+            unaffected_credit=0
+        )
+        # Re Generate the general ledger line
+        lines = self._get_report_lines()
+        self.assertEqual(len(lines['unaffected']), 1)
+
+        # Check the initial and final balance
+        self.assertEqual(lines['unaffected'].initial_debit, 0)
+        self.assertEqual(lines['unaffected'].initial_credit, 0)
+        self.assertEqual(lines['unaffected'].initial_balance, 500)
+        self.assertEqual(lines['unaffected'].final_debit, 0)
+        self.assertEqual(lines['unaffected'].final_credit, 0)
+        self.assertEqual(lines['unaffected'].final_balance, 500)