diff --git a/account_export_csv/__init__.py b/account_export_csv/__init__.py index a332e0c2..3d455ad0 100644 --- a/account_export_csv/__init__.py +++ b/account_export_csv/__init__.py @@ -19,4 +19,4 @@ # ############################################################################## -import wizard +from . import wizard diff --git a/account_export_csv/__openerp__.py b/account_export_csv/__openerp__.py index 498db950..3c432f5d 100644 --- a/account_export_csv/__openerp__.py +++ b/account_export_csv/__openerp__.py @@ -29,7 +29,7 @@ 'description': """ Add a wizard that allow you to export a csv file based on accounting -journal entries + journal entries - Trial Balance - Analytic Balance (with accounts) @@ -38,7 +38,7 @@ 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 + define a selection list to select report type """, 'website': 'http://www.camptocamp.com', 'data': [ diff --git a/account_export_csv/wizard/__init__.py b/account_export_csv/wizard/__init__.py index 453b4a2d..a7104216 100644 --- a/account_export_csv/wizard/__init__.py +++ b/account_export_csv/wizard/__init__.py @@ -19,4 +19,4 @@ # ############################################################################## -import account_export_csv +from . import account_export_csv diff --git a/account_export_csv/wizard/account_export_csv.py b/account_export_csv/wizard/account_export_csv.py index 1f78470b..7fb4e080 100644 --- a/account_export_csv/wizard/account_export_csv.py +++ b/account_export_csv/wizard/account_export_csv.py @@ -215,8 +215,8 @@ class AccountCSVExport(orm.TransientModel): Return list to generate rows of the CSV file """ cr.execute(""" select aac.code as analytic_code, - aac.name as analytic_name, - ac.code,ac.name, + aac.name as analytic_name, + ac.code,ac.name, sum(debit) as sum_debit, sum(credit) as sum_credit, sum(debit) - sum(credit) as balance @@ -333,7 +333,6 @@ class AccountCSVExport(orm.TransientModel): 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,