diff --git a/account_export_csv/__openerp__.py b/account_export_csv/__openerp__.py
index 1582a7af..b62a8abd 100644
--- a/account_export_csv/__openerp__.py
+++ b/account_export_csv/__openerp__.py
@@ -20,21 +20,22 @@
{
'name' : 'Account Export CSV',
- 'version' : '1',
+ 'version' : '1.1',
'depends' : [
- 'account',
+ 'account',
],
'author' : 'Camptocamp',
'description': """
-
+
Add a wizard that allow you to export a csv file based on accounting journal entries
-
+
- Trial Balance
- Analytic Balance (with accounts)
-
- You can filter by period
-
-
+ - Journal Entries
+
+ You can filter by period
+
+ TODO: rearange wizard view with only one button to generate file plus define a selection list to select report type
""",
'website': 'http://www.camptocamp.com',
'data': [
diff --git a/account_export_csv/wizard/account_export_csv.py b/account_export_csv/wizard/account_export_csv.py
index 1612f83e..c0cb09c2 100644
--- a/account_export_csv/wizard/account_export_csv.py
+++ b/account_export_csv/wizard/account_export_csv.py
@@ -19,7 +19,9 @@
#
##############################################################################
+import itertools
import time
+import tempfile
import StringIO
import cStringIO
import base64
@@ -47,15 +49,10 @@ class AccountUnicodeWriter(object):
def writerow(self, row):
#we ensure that we do not try to encode none or bool
- row = [x or u'' for x in row]
-
- encoded_row = []
- for c in row:
- if type(c) == unicode:
- encoded_row.append(c.encode("utf-8"))
- else:
- encoded_row.append(c)
-
+ row = (x or u'' for x in row)
+
+ encoded_row = [c.encode("utf-8") if isinstance(c, unicode) else c for c in row]
+
self.writer.writerow(encoded_row)
# Fetch UTF-8 output from the queue ...
data = self.queue.getvalue()
@@ -80,6 +77,8 @@ class AccountCSVExport(orm.TransientModel):
'company_id': fields.many2one('res.company', 'Company', invisible=True),
'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscalyear', required=True),
'periods': fields.many2many('account.period','rel_wizard_period','wizard_id','period_id','Periods',help='All periods in the fiscal year if empty'),
+ 'journal_ids': fields.many2many('account.journal','rel_wizard_journal','wizard_id','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),
}
@@ -98,7 +97,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)
+ rows = self.get_data(cr, uid, ids, "account", context)
file_data = StringIO.StringIO()
try:
writer = AccountUnicodeWriter(file_data)
@@ -128,7 +127,11 @@ class AccountCSVExport(orm.TransientModel):
_(u'BALANCE'),
]
- def _get_rows_account(self, cr, uid, ids, fiscalyear_id,period_range_ids,company_id,context=None):
+ def _get_rows_account(self, cr, uid, ids,
+ fiscalyear_id,
+ period_range_ids,
+ journal_ids,
+ context=None):
"""
Return list to generate rows of the CSV file
"""
@@ -141,15 +144,15 @@ class AccountCSVExport(orm.TransientModel):
group by ac.id,ac.code,ac.name
order by ac.code
""",
- {'fiscalyear_id': fiscalyear_id,'company_id':company_id,'period_ids':tuple(period_range_ids)}
+ {'fiscalyear_id': fiscalyear_id, 'period_ids':tuple(period_range_ids)}
)
res = cr.fetchall()
-
+
rows = []
for line in res:
rows.append(list(line))
return rows
-
+
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)
@@ -172,7 +175,7 @@ class AccountCSVExport(orm.TransientModel):
'views': [(False, 'form')],
'target': 'new',
}
-
+
def _get_header_analytic(self, cr, uid, ids, context=None):
return [_(u'ANALYTIC CODE'),
_(u'ANALYTIC NAME'),
@@ -183,7 +186,11 @@ class AccountCSVExport(orm.TransientModel):
_(u'BALANCE'),
]
- def _get_rows_analytic(self, cr, uid, ids, fiscalyear_id,period_range_ids,company_id,context=None):
+ def _get_rows_analytic(self, cr, uid, ids,
+ fiscalyear_id,
+ period_range_ids,
+ journal_ids,
+ context=None):
"""
Return list to generate rows of the CSV file
"""
@@ -198,29 +205,172 @@ class AccountCSVExport(orm.TransientModel):
group by aac.id,aac.code,aac.name,ac.id,ac.code,ac.name
order by aac.code
""",
- {'fiscalyear_id': fiscalyear_id,'company_id':company_id,'period_ids':tuple(period_range_ids)}
+ {'fiscalyear_id': fiscalyear_id, 'period_ids':tuple(period_range_ids)}
)
res = cr.fetchall()
-
+
rows = []
for line in res:
rows.append(list(line))
return rows
+
+ def action_manual_export_journal_entries(self, cr, uid, ids, context=None):
+ """
+ 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 to use
+ too much memory as well.
+
+ Those improvements permitted to improve the export from a 100k line to 200k lines
+ with default `limit_memory_hard = 805306368` (768MB) with more lines,
+ you might encounter a MemoryError when trying to download the file even
+ if it has been generated.
+
+ To be able to export bigger volume of data, it is advised to set
+ limit_memory_hard to 2097152000 (2 GB) to generate the file and let
+ OpenERP load it in the wizard when trying to download it.
+
+ Tested with up to a generation of 700k entry lines
+ """
+ this = self.browse(cr, uid, ids)[0]
+ rows = self.get_data(cr, uid, ids, "journal_entries", context)
+ with tempfile.TemporaryFile() as file_data:
+ writer = AccountUnicodeWriter(file_data)
+ writer.writerows(rows)
+ with tempfile.TemporaryFile() as base64_data:
+ file_data.seek(0)
+ base64.encode(file_data, base64_data)
+ base64_data.seek(0)
+ cr.execute("""UPDATE account_csv_export SET data = %s WHERE id = %s""", (base64_data.read(), ids[0]) )
+ return {
+ 'type': 'ir.actions.act_window',
+ 'res_model': 'account.csv.export',
+ 'view_mode': 'form',
+ 'view_type': 'form',
+ 'res_id': this.id,
+ 'views': [(False, 'form')],
+ 'target': 'new',
+ }
+
+
+ def _get_header_journal_entries(self, cr, uid, ids, context=None):
+
+ return [
+ # Standard Sage export fields
+ _(u'DATE'),
+ _(u'JOURNAL CODE'),
+ _(u'ACCOUNT CODE'),
+ _(u'PARTNER NAME'),
+ _(u'REF'),
+ _(u'DESCRIPTION'),
+ _(u'DEBIT'),
+ _(u'CREDIT'),
+ _(u'FULL RECONCILE'),
+ _(u'PARTIAL RECONCILE'),
+ _(u'ANALYTIC ACCOUNT CODE'),
+
+ # Other fields
+ _(u'ENTRY NUMBER'),
+ _(u'ACCOUNT NAME'),
+ _(u'BALANCE'),
+ _(u'AMOUNT CURRENCY'),
+ _(u'CURRENCY'),
+ _(u'ANALYTIC ACCOUNT NAME'),
+ _(u'JOURNAL'),
+ _(u'MONTH'),
+ _(u'FISCAL YEAR'),
+ _(u'TAX CODE CODE'),
+ _(u'TAX CODE NAME'),
+ _(u'TAX AMOUNT'),
+ ]
+
+
+ def _get_rows_journal_entries(self, cr, uid, ids,
+ fiscalyear_id,
+ period_range_ids,
+ journal_ids,
+ context=None):
+ """
+ Create a generator of rows of the CSV file
+ """
+ cr.execute("""
+ SELECT
+ account_move_line.date AS date,
+ account_journal.name as journal,
+ account_account.code AS account_code,
+ res_partner.name AS partner_name,
+ account_move_line.ref AS ref,
+ account_move_line.name AS description,
+ account_move_line.debit AS debit,
+ account_move_line.credit AS credit,
+ account_move_reconcile.name as full_reconcile,
+ account_move_line.reconcile_partial_id AS partial_reconcile_id,
+ account_analytic_account.code AS analytic_account_code,
+
+ account_move.name AS entry_number,
+ account_account.name AS account_name,
+ account_move_line.debit - account_move_line.credit AS balance,
+ account_move_line.amount_currency AS amount_currency,
+ res_currency.name AS currency,
+ account_analytic_account.name AS analytic_account_name,
+ account_journal.name as journal,
+ account_period.code AS month,
+ account_fiscalyear.name as fiscal_year,
+ account_tax_code.code AS aml_tax_code_code,
+ account_tax_code.name AS aml_tax_code_name,
+ account_move_line.tax_amount AS aml_tax_amount
+ FROM
+ public.account_move_line
+ JOIN account_account on (account_account.id=account_move_line.account_id)
+ JOIN account_period on (account_period.id=account_move_line.period_id)
+ JOIN account_fiscalyear on (account_fiscalyear.id=account_period.fiscalyear_id)
+ JOIN account_journal on (account_journal.id = account_move_line.journal_id)
+ LEFT JOIN res_currency on (res_currency.id=account_move_line.currency_id)
+ LEFT JOIN account_move_reconcile on (account_move_reconcile.id = account_move_line.reconcile_id)
+ LEFT JOIN res_partner on (res_partner.id=account_move_line.partner_id)
+ LEFT JOIN account_move on (account_move.id=account_move_line.move_id)
+ LEFT JOIN account_tax on (account_tax.id=account_move_line.account_tax_id)
+ LEFT JOIN account_tax_code on (account_tax_code.id=account_move_line.tax_code_id)
+ LEFT JOIN account_analytic_account on (account_analytic_account.id=account_move_line.analytic_account_id)
+ WHERE account_period.id IN %(period_ids)s
+ AND account_journal.id IN %(journal_ids)s
+ ORDER BY account_move_line.date
+ """,
+ {'period_ids': tuple(period_range_ids), 'journal_ids': tuple(journal_ids)}
+ )
+ while 1:
+ # http://initd.org/psycopg/docs/cursor.html#cursor.fetchmany
+ # Set cursor.arraysize to minimize network round trips
+ cr.arraysize=100
+ rows = cr.fetchmany()
+ if not rows:
+ break
+ for row in rows:
+ yield row
+
def get_data(self, cr, uid, ids,result_type,context=None):
get_header_func = getattr(self,("_get_header_%s"%(result_type)), None)
get_rows_func = getattr(self,("_get_rows_%s"%(result_type)), None)
form = self.browse(cr, uid, ids[0], context=context)
fiscalyear_id = form.fiscalyear_id.id
user_obj = self.pool.get('res.users')
- company_id = user_obj.browse(cr, uid, uid).company_id.id
if form.periods:
period_range_ids = [x.id for x in form.periods]
else:
# If not period selected , we take all periods
p_obj = self.pool.get("account.period")
- period_range_ids = p_obj.search(cr,uid,[('fiscalyear_id','=',fiscalyear_id)],context=context)
- rows = []
- rows.append(get_header_func(cr, uid, ids, context=context))
- rows.extend(get_rows_func(cr, uid, ids, fiscalyear_id,period_range_ids,company_id, context=context))
+ period_range_ids = p_obj.search(cr, uid, [('fiscalyear_id','=',fiscalyear_id)], context=context)
+ journal_ids = None
+ if form.journal_ids:
+ journal_ids = [x.id for x in form.journal_ids]
+ else:
+ j_obj = self.pool.get("account.journal")
+ journal_ids = j_obj.search(cr, uid, [], context=context)
+ rows = itertools.chain((get_header_func(cr, uid, ids, context=context),),
+ get_rows_func(cr, uid, ids,
+ fiscalyear_id,
+ period_range_ids,
+ journal_ids,
+ context=context)
+ )
return rows
diff --git a/account_export_csv/wizard/account_export_csv_view.xml b/account_export_csv/wizard/account_export_csv_view.xml
index 9cf4fb04..36f8f693 100644
--- a/account_export_csv/wizard/account_export_csv_view.xml
+++ b/account_export_csv/wizard/account_export_csv_view.xml
@@ -7,24 +7,26 @@
account.csv.export
form
-