Merge lp:~camptocamp/openerp-french-localization/6.1-add-nonofficial-export-mdh into lp:openerp-french-localization/6.1

[Matthieu Dietrich @ camptocamp]

[ADD] non-official version of the export, with unposted entries

This PR is to add a new option to the FEC wizard, "non-official", which creates a similar FEC file but with unposted entries. The goal is to allow exporting to other financial software which can use the FEC format.

The file is also renamed to mark that it is not the official report.

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

lgtm / :+1:

can you

review: Approve (code review, no test)

Unmerged revisions

6. By Matthieu Dietrich @ camptocamp on 2015-03-24

[ADD] non-official version of the export, with unposted entries

=== modified file 'l10n_fr_fec/i18n/fr.po'
--- l10n_fr_fec/i18n/fr.po	2014-03-25 17:10:43 +0000
+++ l10n_fr_fec/i18n/fr.po	2015-03-24 10:50:39 +0000
@@ -110,3 +110,17 @@
 msgid "FEC is for French companies only !"
 msgstr "Le FEC est uniquement pour les sociétés françaises !"
 
+#. module: l10n_fr_fec
+#: selection:account.fr.fec,export_type:0
+msgid "Official FEC report (posted entries only)"
+msgstr "Rapport FEC officiel (entrées postées uniquement)"
+
+#. module: l10n_fr_fec
+#: selection:account.fr.fec,export_type:0
+msgid "Non-official FEC report (posted and unposted entries)"
+msgstr "Rapport FEC non-officiel (entrées postées et non-postées)"
+
+#. module: l10n_fr_fec
+#: field:account.fr.fec,export_type:0
+msgid "Export Type"
+msgstr "Type d'export"
 
=== modified file 'l10n_fr_fec/i18n/l10n_fr_fec.pot'
--- l10n_fr_fec/i18n/l10n_fr_fec.pot	2014-03-25 17:10:43 +0000
+++ l10n_fr_fec/i18n/l10n_fr_fec.pot	2015-03-24 10:50:39 +0000
@@ -110,3 +110,17 @@
 msgid "FEC is for French companies only !"
 msgstr ""
 
+#. module: l10n_fr_fec
+#: selection:account.fr.fec,export_type:0
+msgid "Official FEC report (posted entries only)"
+msgstr ""
+
+#. module: l10n_fr_fec
+#: selection:account.fr.fec,export_type:0
+msgid "Non-official FEC report (posted and unposted entries)"
+msgstr ""
+
+#. module: l10n_fr_fec
+#: field:account.fr.fec,export_type:0
+msgid "Export Type"
+msgstr ""
 
=== modified file 'l10n_fr_fec/wizard/fec.py'
--- l10n_fr_fec/wizard/fec.py	2014-11-28 15:36:24 +0000
+++ l10n_fr_fec/wizard/fec.py	2015-03-24 10:50:39 +0000
@@ -43,11 +43,16 @@
             ('draft', 'Draft'),
             ('done', 'Done'),
             ], 'State'),
+        'export_type': fields.selection([
+            ('official', 'Official FEC report (posted entries only)'),
+            ('nonofficial', 'Non-official FEC report (posted and unposted entries)'),
+            ], 'Export Type', required=True),
     }
 
     _defaults = {
         'state': 'draft',
         'type': 'is_ir_bic',
+        'export_type': 'official',
     }
 
     def generate_fec(self, cr, uid, ids, context=None):
@@ -119,9 +124,17 @@
             LEFT JOIN res_currency rc ON rc.id = aml.currency_id
         WHERE
             am.period_id IN %s
-            AND am.state = 'posted'
             AND am.company_id = %s
             AND NOT (aml.credit = 0.0 AND aml.debit = 0.0)
+        '''
+
+        # For official report: only use posted entries
+        if cur_wiz.export_type == "official":
+            sql_query += '''
+            AND am.state = 'posted'
+            '''
+
+        sql_query += '''
         ORDER BY
             am.date,
             CASE aj.type WHEN 'situation' THEN 1 ELSE 2 END,
@@ -169,6 +182,9 @@
                 _("FEC is for French companies only !"))
         siren = company.vat.replace(' ','')[4:13]
         fy_end_date = cur_wiz.fiscalyear_id.date_stop.replace('-', '')
+        # Append "-NONOFFICIAL" to the file name
+        if cur_wiz.export_type == "nonofficial":
+            fy_end_date += "-NONOFFICIAL"
         fecvalue = fecfile.getvalue()
         self.write(cr, uid, ids, {
             'state': 'done',
 
=== modified file 'l10n_fr_fec/wizard/fec_view.xml'
--- l10n_fr_fec/wizard/fec_view.xml	2014-03-26 15:00:07 +0000
+++ l10n_fr_fec/wizard/fec_view.xml	2015-03-24 10:50:39 +0000
@@ -16,6 +16,7 @@
             <group states="draft" col="2">
                 <field name="fiscalyear_id" />
                 <field name="type"/>
+                <field name="export_type"/>
             </group>
             <newline/>
             <group states="done" col="2">