diff --git a/account_financial_report_qweb/README.rst b/account_financial_report_qweb/README.rst
index 4420f648..7836ebbb 100644
--- a/account_financial_report_qweb/README.rst
+++ b/account_financial_report_qweb/README.rst
@@ -37,7 +37,7 @@ Images
 Contributors
 ------------
 
-* Jordi Ballestrer <jordi.ballestrer@eficient.com>
+* Jordi Ballester <jordi.ballester@eficient.com>
 * Yannick Vaucher <yannick.vaucher@camptocamp.com>
 * Simone Orsi <simone.orsi@abstract.com>
 * Leonardo Pistone <leonardo.pistone@camptocamp.com>
@@ -51,6 +51,7 @@ Contributors
 * Lorenzo Battistini <lorenzo.battistini@agilebg.com>
 * Julien Coux <julien.coux@camptocamp.com>
 * Akim Juillerat <akim.juillerat@camptocamp.com>
+* Alexis de Lattre <alexis@via.ecp.fr>
 
 Much of the work in this module was done at a sprint in Sorrento, Italy in
 April 2016.
diff --git a/account_financial_report_qweb/__manifest__.py b/account_financial_report_qweb/__manifest__.py
index 25e2b2fd..4acd9248 100644
--- a/account_financial_report_qweb/__manifest__.py
+++ b/account_financial_report_qweb/__manifest__.py
@@ -5,7 +5,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     'name': 'QWeb Financial Reports',
-    'version': '10.0.1.1.0',
+    'version': '10.0.1.1.1',
     'category': 'Reporting',
     'summary': 'OCA Financial Reports',
     'author': 'Camptocamp SA,'
diff --git a/account_financial_report_qweb/wizard/general_ledger_wizard.py b/account_financial_report_qweb/wizard/general_ledger_wizard.py
index 95796593..fe0c75b6 100644
--- a/account_financial_report_qweb/wizard/general_ledger_wizard.py
+++ b/account_financial_report_qweb/wizard/general_ledger_wizard.py
@@ -2,6 +2,7 @@
 # Author: Damien Crier
 # Author: Julien Coux
 # Copyright 2016 Camptocamp SA
+# Copyright 2017 Akretion - Alexis de Lattre
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo import models, fields, api
@@ -24,7 +25,7 @@ class GeneralLedgerReportWizard(models.TransientModel):
     )
     date_from = fields.Date(required=True)
     date_to = fields.Date(required=True)
-    fy_start_date = fields.Date(required=True)
+    fy_start_date = fields.Date(compute='_compute_fy_start_date')
     target_move = fields.Selection([('posted', 'All Posted Entries'),
                                     ('all', 'All Entries')],
                                    string='Target Moves',
@@ -59,6 +60,13 @@ class GeneralLedgerReportWizard(models.TransientModel):
         string='Not only one unaffected earnings account'
     )
 
+    @api.depends('date_from')
+    def _compute_fy_start_date(self):
+        for wiz in self.filtered('date_from'):
+            date = fields.Datetime.from_string(wiz.date_from)
+            res = self.company_id.compute_fiscalyear_dates(date)
+            wiz.fy_start_date = res['date_from']
+
     @api.onchange('company_id')
     def onchange_company_id(self):
         """Handle company change."""
@@ -75,10 +83,6 @@ class GeneralLedgerReportWizard(models.TransientModel):
         """Handle date range change."""
         self.date_from = self.date_range_id.date_start
         self.date_to = self.date_range_id.date_end
-        if self.date_from:
-            self.fy_start_date = self.env.user.company_id.find_daterange_fy(
-                fields.Date.from_string(self.date_range_id.date_start)
-            ).date_start
 
     @api.onchange('receivable_accounts_only', 'payable_accounts_only')
     def onchange_type_accounts_only(self):
diff --git a/account_financial_report_qweb/wizard/trial_balance_wizard.py b/account_financial_report_qweb/wizard/trial_balance_wizard.py
index 0b815a57..526858c8 100644
--- a/account_financial_report_qweb/wizard/trial_balance_wizard.py
+++ b/account_financial_report_qweb/wizard/trial_balance_wizard.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Author: Julien Coux
 # Copyright 2016 Camptocamp SA
+# Copyright 2017 Akretion - Alexis de Lattre
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo import models, fields, api
@@ -23,7 +24,7 @@ class TrialBalanceReportWizard(models.TransientModel):
     )
     date_from = fields.Date(required=True)
     date_to = fields.Date(required=True)
-    fy_start_date = fields.Date(required=True)
+    fy_start_date = fields.Date(compute='_compute_fy_start_date')
     target_move = fields.Selection([('posted', 'All Posted Entries'),
                                     ('all', 'All Entries')],
                                    string='Target Moves',
@@ -53,6 +54,13 @@ class TrialBalanceReportWizard(models.TransientModel):
         string='Not only one unaffected earnings account'
     )
 
+    @api.depends('date_from')
+    def _compute_fy_start_date(self):
+        for wiz in self.filtered('date_from'):
+            date = fields.Datetime.from_string(wiz.date_from)
+            res = self.company_id.compute_fiscalyear_dates(date)
+            wiz.fy_start_date = res['date_from']
+
     @api.onchange('company_id')
     def onchange_company_id(self):
         """Handle company change."""
@@ -69,10 +77,6 @@ class TrialBalanceReportWizard(models.TransientModel):
         """Handle date range change."""
         self.date_from = self.date_range_id.date_start
         self.date_to = self.date_range_id.date_end
-        if self.date_from:
-            self.fy_start_date = self.env.user.company_id.find_daterange_fy(
-                fields.Date.from_string(self.date_range_id.date_start)
-            ).date_start
 
     @api.onchange('receivable_accounts_only', 'payable_accounts_only')
     def onchange_type_accounts_only(self):