Merge lp:~akretion-team/openerp-french-localization/70-fec-AN-order into lp:openerp-french-localization/7.0

[Alexis de Lattre]

Some fixes to the module l10n_fr_fec about the order of the lines :
1) opening entries should come first
2) account move lines of the same account move should be grouped together

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

It's work perfectly Merged

=== modified file 'l10n_fr_fec/wizard/fec.py'
--- l10n_fr_fec/wizard/fec.py	2014-03-25 17:10:43 +0000
+++ l10n_fr_fec/wizard/fec.py	2014-07-15 08:01:17 +0000
@@ -22,7 +22,6 @@
 
 from openerp.osv import orm, fields
 from openerp.tools.translate import _
-#from tempfile import TemporaryFile
 import base64
 import unicodecsv
 import StringIO
@@ -122,12 +121,13 @@
             am.period_id IN %s
             AND am.state = 'posted'
             AND am.company_id = %s
-        ORDER BY am.date
+        ORDER BY
+            am.date,
+            CASE aj.type WHEN 'situation' THEN 1 ELSE 2 END,
+            aml.id
         '''
         cr.execute(sql_query, (tuple(period_ids), company_id))
 
-#        f = TemporaryFile(prefix='openerp')
-#        f = open('/tmp/test2.csv', 'w')
         fecfile = StringIO.StringIO()
         w = unicodecsv.writer(fecfile, encoding='utf-8', delimiter='|')
         w.writerow(header)
@@ -180,7 +180,6 @@
         action = {
             'name': 'FEC',
             'type': 'ir.actions.act_window',
-            'view_type': 'form',
             'view_mode': 'form',
             'res_model': self._name,
             'res_id': ids[0],