Merge a394a6b into 5e4a100

account_financial_report/report/general_ledger.py

@@ -1557,7 +1557,8 @@ def _compute_analytic_tags(self):
         }
         self.env.cr.execute(query_update_analytic_tags, params)
 
-    def _inject_unaffected_earnings_account_values(self):
+    def _inject_unaffected_earnings_account_values(self,
+                                                   query_select_previous_unaffected_earnings=None):
         """Inject the report values of the unaffected earnings account
         for report_general_ledger_account."""
         # Fetch the profit and loss accounts
@@ -1572,17 +1573,13 @@ def _inject_unaffected_earnings_account_values(self):
         pl_account_ids = [r[0] for r in self.env.cr.fetchall()]
         unaffected_earnings_account_ids = \
             pl_account_ids + [self.unaffected_earnings_account.id]
-        # Fetch the current fiscal year start date
-        date = fields.Datetime.from_string(self.date_from)
-        res = self.company_id.compute_fiscalyear_dates(date)
-        fy_start_date = res['date_from']
-        query_select_previous_fy_unaffected_earnings_params = {
-            'date_to': fy_start_date,
+        query_select_previous_unaffected_earnings_params = {
+            'date_to': self.date_from,
             'company_id': self.company_id.id,
             'account_ids': tuple(unaffected_earnings_account_ids),
             'analytic_tag_ids': tuple(self.filter_analytic_tag_ids.ids),
         }
-        query_select_previous_fy_unaffected_earnings = ''
+        query_select_previous_unaffected_earnings = ''
         q_analytic_tags = ''
         if self.filter_analytic_tag_ids:
             q_analytic_tags = """
@@ -1606,9 +1603,9 @@ def _inject_unaffected_earnings_account_values(self):
             aat.id IN %(analytic_tag_ids)s
     )
 """
-            query_select_previous_fy_unaffected_earnings += q_analytic_tags
+            query_select_previous_unaffected_earnings += q_analytic_tags
 
-        query_select_previous_fy_unaffected_earnings += """
+        query_select_previous_unaffected_earnings += """
             SELECT  sum(ml.balance) as balance
             FROM account_move_line as ml
             INNER JOIN account_move as am
@@ -1617,36 +1614,36 @@ def _inject_unaffected_earnings_account_values(self):
             ON am.journal_id = j.id
         """
         if self.filter_cost_center_ids:
-            query_select_previous_fy_unaffected_earnings += """
+            query_select_previous_unaffected_earnings += """
                 INNER JOIN account_analytic_account aa
                 ON ml.analytic_account_id = aa.id
                 AND aa.id IN %(cost_center_ids)s
             """
-            query_select_previous_fy_unaffected_earnings_params[
+            query_select_previous_unaffected_earnings_params[
                 'cost_center_ids'] = tuple(self.filter_cost_center_ids.ids)
         if self.filter_analytic_tag_ids:
-            query_select_previous_fy_unaffected_earnings += """
+            query_select_previous_unaffected_earnings += """
                 INNER JOIN move_lines_on_tags ON ml.id =
                 move_lines_on_tags.ml_id
             """
-        query_select_previous_fy_unaffected_earnings += """
+        query_select_previous_unaffected_earnings += """
             WHERE ml.date < %(date_to)s
             AND ml.company_id = %(company_id)s
             AND ml.account_id IN %(account_ids)s
         """
         if self.filter_journal_ids:
-            query_select_previous_fy_unaffected_earnings += """
+            query_select_previous_unaffected_earnings += """
                 AND j.id IN %(journal_ids)s
             """
-            query_select_previous_fy_unaffected_earnings_params[
+            query_select_previous_unaffected_earnings_params[
                 'journal_ids'] = tuple(self.filter_journal_ids.ids)
         if self.only_posted_moves:
-            query_select_previous_fy_unaffected_earnings += """
+            query_select_previous_unaffected_earnings += """
                 AND am.state = 'posted'
             """
         self.env.cr.execute(
-            query_select_previous_fy_unaffected_earnings,
-            query_select_previous_fy_unaffected_earnings_params)
+            query_select_previous_unaffected_earnings,
+            query_select_previous_unaffected_earnings_params)
         res = self.env.cr.fetchone()
         unaffected_earnings_initial_balance = res[0] or 0.0
         # Now select the current period unaffected earnings,