From 7c28504e7da5279905e7fa0a4c438b40b016c2b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 23 Feb 2018 18:01:03 +0100 Subject: [PATCH] Allow to export FEC on draft fiscal year The filename is generated only on locked fiscal year as it is the only official export. issue5306 review43091003 --- CHANGELOG | 2 ++ account.py | 17 +++++++++-------- tests/scenario_fec.rst | 3 +-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8c956c6a00..38ee97d3ea 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +* Allow to export FEC on draft fiscalyear + Version 4.6.0 - 2017-10-30 * Bug fixes (see mercurial logs for details) diff --git a/account.py b/account.py index 9bcf193bc9..cbed0aa319 100644 --- a/account.py +++ b/account.py @@ -127,10 +127,13 @@ class AccountFrFEC(Wizard): file_ = self.result.file self.result.file = None # No need to store it in session format_date = self.get_format_date() - filename = '%sFEC%s.csv' % ( - self.start.fiscalyear.company.party.siren or '', - format_date(self.start.fiscalyear.end_date), - ) + if self.start.fiscalyear.state == 'locked': + filename = '%sFEC%s.csv' % ( + self.start.fiscalyear.company.party.siren or '', + format_date(self.start.fiscalyear.end_date), + ) + else: + filename = None return { 'file': file_, 'filename': filename, @@ -294,10 +297,8 @@ class AccountFrFECStart(ModelView): 'Generate FEC' __name__ = 'account.fr.fec.start' - fiscalyear = fields.Many2One('account.fiscalyear', 'Fiscal Year', - required=True, domain=[ - ('state', '=', 'close'), - ]) + fiscalyear = fields.Many2One( + 'account.fiscalyear', 'Fiscal Year', required=True) type = fields.Selection([ ('is-bic', 'IS-BIC'), ], 'Type', required=True) diff --git a/tests/scenario_fec.rst b/tests/scenario_fec.rst index 6ca6966d4e..8098c0fb16 100644 --- a/tests/scenario_fec.rst +++ b/tests/scenario_fec.rst @@ -79,7 +79,6 @@ Generate FEC:: >>> FEC.form.fiscalyear = fiscalyear >>> FEC.form.deferral_journal = deferral_journal >>> FEC.execute('generate') - >>> bool(FEC.form.filename) - True + >>> FEC.form.filename >>> bool(FEC.form.file) True