From 58961ee700c676dbc101490f02d3fe3019d739ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 30 Nov 2014 11:20:11 +0100 Subject: [PATCH 1/6] [MIG] account_export_csv: move out of unported --- .../account_export_csv => account_export_csv}/__init__.py | 0 .../account_export_csv => account_export_csv}/__openerp__.py | 0 .../i18n/account_export_csv.po | 0 .../account_export_csv => account_export_csv}/i18n/fr.po | 0 .../account_export_csv => account_export_csv}/i18n/nl.po | 0 {__unported__/account_export_csv => account_export_csv}/menu.xml | 0 .../account_export_csv => account_export_csv}/wizard/__init__.py | 0 .../wizard/account_export_csv.py | 0 .../wizard/account_export_csv_view.xml | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename {__unported__/account_export_csv => account_export_csv}/__init__.py (100%) rename {__unported__/account_export_csv => account_export_csv}/__openerp__.py (100%) rename {__unported__/account_export_csv => account_export_csv}/i18n/account_export_csv.po (100%) rename {__unported__/account_export_csv => account_export_csv}/i18n/fr.po (100%) rename {__unported__/account_export_csv => account_export_csv}/i18n/nl.po (100%) rename {__unported__/account_export_csv => account_export_csv}/menu.xml (100%) rename {__unported__/account_export_csv => account_export_csv}/wizard/__init__.py (100%) rename {__unported__/account_export_csv => account_export_csv}/wizard/account_export_csv.py (100%) rename {__unported__/account_export_csv => account_export_csv}/wizard/account_export_csv_view.xml (100%) diff --git a/__unported__/account_export_csv/__init__.py b/account_export_csv/__init__.py similarity index 100% rename from __unported__/account_export_csv/__init__.py rename to account_export_csv/__init__.py diff --git a/__unported__/account_export_csv/__openerp__.py b/account_export_csv/__openerp__.py similarity index 100% rename from __unported__/account_export_csv/__openerp__.py rename to account_export_csv/__openerp__.py diff --git a/__unported__/account_export_csv/i18n/account_export_csv.po b/account_export_csv/i18n/account_export_csv.po similarity index 100% rename from __unported__/account_export_csv/i18n/account_export_csv.po rename to account_export_csv/i18n/account_export_csv.po diff --git a/__unported__/account_export_csv/i18n/fr.po b/account_export_csv/i18n/fr.po similarity index 100% rename from __unported__/account_export_csv/i18n/fr.po rename to account_export_csv/i18n/fr.po diff --git a/__unported__/account_export_csv/i18n/nl.po b/account_export_csv/i18n/nl.po similarity index 100% rename from __unported__/account_export_csv/i18n/nl.po rename to account_export_csv/i18n/nl.po diff --git a/__unported__/account_export_csv/menu.xml b/account_export_csv/menu.xml similarity index 100% rename from __unported__/account_export_csv/menu.xml rename to account_export_csv/menu.xml diff --git a/__unported__/account_export_csv/wizard/__init__.py b/account_export_csv/wizard/__init__.py similarity index 100% rename from __unported__/account_export_csv/wizard/__init__.py rename to account_export_csv/wizard/__init__.py diff --git a/__unported__/account_export_csv/wizard/account_export_csv.py b/account_export_csv/wizard/account_export_csv.py similarity index 100% rename from __unported__/account_export_csv/wizard/account_export_csv.py rename to account_export_csv/wizard/account_export_csv.py diff --git a/__unported__/account_export_csv/wizard/account_export_csv_view.xml b/account_export_csv/wizard/account_export_csv_view.xml similarity index 100% rename from __unported__/account_export_csv/wizard/account_export_csv_view.xml rename to account_export_csv/wizard/account_export_csv_view.xml From bbc4c43860b534cd8e11fac5d36fdeb9de40126c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 30 Nov 2014 11:20:23 +0100 Subject: [PATCH 2/6] [MIG] account_export_csv: make installable --- account_export_csv/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_export_csv/__openerp__.py b/account_export_csv/__openerp__.py index 71b981bc..3c432f5d 100644 --- a/account_export_csv/__openerp__.py +++ b/account_export_csv/__openerp__.py @@ -45,6 +45,6 @@ 'wizard/account_export_csv_view.xml', 'menu.xml', ], - 'installable': False, + 'installable': True, 'active': False, } From 7b293ae76965fc3961748fec1b32e08a4d98d667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 30 Nov 2014 11:29:08 +0100 Subject: [PATCH 3/6] [MIG] account_export_csv: frozendict issue --- account_export_csv/wizard/account_export_csv.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/account_export_csv/wizard/account_export_csv.py b/account_export_csv/wizard/account_export_csv.py index 5d8f90f0..010d1e8f 100644 --- a/account_export_csv/wizard/account_export_csv.py +++ b/account_export_csv/wizard/account_export_csv.py @@ -105,7 +105,8 @@ class AccountCSVExport(orm.TransientModel): def _get_fiscalyear_default(self, cr, uid, context=None): fiscalyear_obj = self.pool['account.fiscalyear'] - context['company_id'] = self._get_company_default(cr, uid, context) + context = dict(context, + company_id=self._get_company_default(cr, uid, context)) return fiscalyear_obj.find(cr, uid, dt=None, exception=True, context=context) From 240b13b36f68327dd1895627ff2fd7a4ac03eb21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 30 Nov 2014 11:34:06 +0100 Subject: [PATCH 4/6] [IMP] account_export_csv: use cStringIO instead of StringIO --- account_export_csv/wizard/account_export_csv.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/account_export_csv/wizard/account_export_csv.py b/account_export_csv/wizard/account_export_csv.py index 010d1e8f..81d1f38a 100644 --- a/account_export_csv/wizard/account_export_csv.py +++ b/account_export_csv/wizard/account_export_csv.py @@ -23,8 +23,7 @@ import itertools import tempfile -import StringIO -import cStringIO +from cStringIO import StringIO import base64 import csv @@ -43,7 +42,7 @@ class AccountUnicodeWriter(object): def __init__(self, f, dialect=csv.excel, encoding="utf-8", **kwds): # Redirect output to a queue - self.queue = cStringIO.StringIO() + self.queue = StringIO() # created a writer with Excel formating settings self.writer = csv.writer(self.queue, dialect=dialect, **kwds) self.stream = f @@ -117,7 +116,7 @@ class AccountCSVExport(orm.TransientModel): def action_manual_export_account(self, cr, uid, ids, context=None): this = self.browse(cr, uid, ids)[0] rows = self.get_data(cr, uid, ids, "account", context) - file_data = StringIO.StringIO() + file_data = StringIO() try: writer = AccountUnicodeWriter(file_data) writer.writerows(rows) @@ -177,7 +176,7 @@ class AccountCSVExport(orm.TransientModel): def action_manual_export_analytic(self, cr, uid, ids, context=None): this = self.browse(cr, uid, ids)[0] rows = self.get_data(cr, uid, ids, "analytic", context) - file_data = StringIO.StringIO() + file_data = StringIO() try: writer = AccountUnicodeWriter(file_data) writer.writerows(rows) From 24be7610ffdc3b5dda8a91f5fa9cf7c6b6047b90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 30 Nov 2014 11:34:55 +0100 Subject: [PATCH 5/6] [IMP] account_export_csv: spelling --- account_export_csv/wizard/account_export_csv.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_export_csv/wizard/account_export_csv.py b/account_export_csv/wizard/account_export_csv.py index 81d1f38a..c4052cad 100644 --- a/account_export_csv/wizard/account_export_csv.py +++ b/account_export_csv/wizard/account_export_csv.py @@ -243,7 +243,7 @@ class AccountCSVExport(orm.TransientModel): """ Here we use TemporaryFile to avoid full filling the OpenERP worker Memory - We also write the data to the wizard with SQL query as write seams + We also write the data to the wizard with SQL query as write seems to use too much memory as well. Those improvements permitted to improve the export from a 100k line to From edee228de09af28b4bc97094b77d997bbfb1b2dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 30 Nov 2014 11:36:54 +0100 Subject: [PATCH 6/6] [FIX] account_export_csv: duplicate column definition (spotted by pylint) --- account_export_csv/wizard/account_export_csv.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/account_export_csv/wizard/account_export_csv.py b/account_export_csv/wizard/account_export_csv.py index c4052cad..5d3d25c2 100644 --- a/account_export_csv/wizard/account_export_csv.py +++ b/account_export_csv/wizard/account_export_csv.py @@ -92,8 +92,6 @@ class AccountCSVExport(orm.TransientModel): 'journal_id', 'Journals', help='If empty, use all journals, only used for journal entries'), - 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscalyear', - required=True), 'export_filename': fields.char('Export CSV Filename', size=128), }