diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 1111f15c906..63c179bf626 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -69,6 +69,7 @@ module named account_voucherss
         'wizard/account_statement_from_invoice_view.xml',
         'wizard/account_pay_invoice_view.xml',
         'wizard/account_unreconcile_view.xml',
+        'wizard/account_general_ledger_report_view.xml',
         'wizard/account_invoice_state_view.xml',
         'wizard/account_use_model_view.xml',
         'wizard/account_partner_balance_report_view.xml',
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index b966ab6077e..c10bac8d588 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -82,8 +82,10 @@
         <wizard id="wizard_third_party_ledger" menu="False" model="res.partner" name="account.third_party_ledger.report" string="Partner Ledger"/>
         <menuitem icon="STOCK_PRINT" action="wizard_third_party_ledger" id="menu_third_party_ledger" parent="account.next_id_22" type="wizard"/>
 
+<!--        <wizard id="wizard_general_ledger_report" keyword="client_print_multi" model="account.account" name="account.general.ledger.report" string="General Ledger"/>-->
+
 <!--        <wizard id="wizard_balance_report" keyword="client_print_multi" model="account.account" name="account.account.balance.report" string="Account Balance"/>-->
-        <wizard id="wizard_general_ledger_report" keyword="client_print_multi" model="account.account" name="account.general.ledger.report" string="General Ledger"/>
+
 
 <!--        <wizard id="wizard_invoice_state_confirm" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.confirm" string="Confirm draft invoices" groups="base.group_user"/>-->
 <!--        <wizard id="wizard_invoice_state_cancel" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.cancel" string="Cancel selected invoices" groups="base.group_user"/>-->
@@ -108,8 +110,8 @@
 <!--	    <wizard id="wizard_account_balance_report" menu="False" model="account.account" name="account.account.balance.report" string="Account Balance"/>-->
 <!--        <menuitem icon="STOCK_PRINT" action="wizard_account_balance_report" id="menu_account_balance_report" parent="account.menu_generic_report" type="wizard"/>-->
 
-		<wizard id="wizard_general_ledger" menu="False" model="account.account" name="account.general.ledger.report" string="General Ledger"/>
-        <menuitem icon="STOCK_PRINT" action="wizard_general_ledger" id="menu_general_ledger" parent="account.menu_generic_report" type="wizard"/>
+<!--		<wizard id="wizard_general_ledger" menu="False" model="account.account" name="account.general.ledger.report" string="General Ledger"/>
+        <menuitem icon="STOCK_PRINT" action="wizard_general_ledger" id="menu_general_ledger" parent="account.menu_generic_report" type="wizard"/>-->
 
 <!--        <wizard id="wizard_print_journal" menu="False" model="account.journal.period" name="account.print.journal.report" string="Print Journal" />
 		<menuitem icon="STOCK_PRINT" action="wizard_print_journal" id="menu_print_journal" parent="account.menu_generic_report" type="wizard" />
diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py
index b06aa1198fc..00031a77ed8 100644
--- a/addons/account/report/general_ledger.py
+++ b/addons/account/report/general_ledger.py
@@ -41,7 +41,7 @@ class general_ledger(rml_parse.rml_parse):
         ##
         new_ids = []
         if (data['model'] == 'account.account'):
-            new_ids = ids
+            new_ids = 'active_ids' in data['form']['context'] and data['form']['context']['active_ids'] or []
         else:
             new_ids.append(data['form']['Account_list'])
 
@@ -117,7 +117,7 @@ class general_ledger(rml_parse.rml_parse):
         borne_max = res[0]['stop_date']
         if form['state'] == 'byperiod':
             ## This function will return the most aged date
-            periods = form['periods'][0][2]
+            periods = form['periods']
             if not periods:
                 self.cr.execute("""
                     Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = %s""",(form['fiscalyear'],))
@@ -131,13 +131,16 @@ class general_ledger(rml_parse.rml_parse):
             borne_min = form['date_from']
             borne_max = form['date_to']
         elif form['state'] == 'all':
-            periods = form['periods'][0][2]
+            periods = form['periods']
             if not periods:
-               self.cr.execute("""
-                    Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = %s""",(form['fiscalyear'],))
+                if form['fiscalyear'] == False:
+                   fiscalyears = self.pool.get('account.fiscalyear').search(self.cr, self.uid, [('state', '=', 'draft')])
+                else:
+                    fiscalyears = [form['fiscalyear']]
+                self.cr.execute("select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id =ANY(%s)" ,(fiscalyears,))
             else:
-               self.cr.execute("""
-                    Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id  =ANY(%s)""",(periods,))
+                self.cr.execute("""
+                    Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,))
             res = self.cr.dictfetchall()
             period_min = res[0]['start_date']
             period_max = res[0]['stop_date']
@@ -180,7 +183,7 @@ class general_ledger(rml_parse.rml_parse):
         ctx['state'] = form['context'].get('state','all')
         if form.has_key('fiscalyear'):
             ctx['fiscalyear'] = form['fiscalyear']
-            ctx['periods'] = form['periods'][0][2]
+            ctx['periods'] = form['periods']
         else:
             ctx['date_from'] = form['date_from']
             ctx['date_to'] = form['date_to']
diff --git a/addons/account/report/general_ledger_landscape.py b/addons/account/report/general_ledger_landscape.py
index c888994622b..472f0675519 100644
--- a/addons/account/report/general_ledger_landscape.py
+++ b/addons/account/report/general_ledger_landscape.py
@@ -42,12 +42,10 @@ class general_ledger_landscape(rml_parse.rml_parse):
         ##
         new_ids = []
         if (data['model'] == 'account.account'):
-            new_ids = ids
+            new_ids = 'active_ids' in data['form']['context'] and data['form']['context']['active_ids'] or []
         else:
             new_ids.append(data['form']['Account_list'])
-
             objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
-
         super(general_ledger_landscape, self).set_context(objects, data, new_ids,report_type)
 
     def __init__(self, cr, uid, name, context):
@@ -118,7 +116,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
         borne_max = res[0]['stop_date']
         if form['state'] == 'byperiod':
             ## This function will return the most aged date
-            periods = form['periods'][0][2]
+            periods = form['periods']
             if not periods:
                 self.cr.execute("""
                     Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = %s""" ,(form['fiscalyear'],))
@@ -133,11 +131,13 @@ class general_ledger_landscape(rml_parse.rml_parse):
             borne_min = form['date_from']
             borne_max = form['date_to']
         elif form['state'] == 'all':
-            periods = form['periods'][0][2]
+            periods = form['periods']
             if not periods:
-                self.cr.execute("""
-                    Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id =  = %s""" ,(form['fiscalyear'],))
-
+                if form['fiscalyear'] == False:
+                   fiscalyears = self.pool.get('account.fiscalyear').search(self.cr, self.uid, [('state', '=', 'draft')])
+                else:
+                    fiscalyears = [form['fiscalyear']]
+                self.cr.execute("select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id =ANY(%s)" ,(fiscalyears,))
             else:
                 self.cr.execute("""
                     Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,))
@@ -182,7 +182,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
         ctx['state'] = form['context'].get('state','all')
         if form.has_key('fiscalyear'):
             ctx['fiscalyear'] = form['fiscalyear']
-            ctx['periods'] = form['periods'][0][2]
+            ctx['periods'] = form['periods']
         else:
             ctx['date_from'] = form['date_from']
             ctx['date_to'] = form['date_to']
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index 21694ef9747..2a209f291b8 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -31,7 +31,7 @@ import account_journal_select
 import account_move_bank_reconcile
 import account_subscription_generate
 import wizard_aged_trial_balance
-import wizard_general_ledger_report
+import account_general_ledger_report
 import wizard_third_party_ledger
 import account_partner_balance_report
 import account_balance_report
diff --git a/addons/account/wizard/account_general_ledger_report.py b/addons/account/wizard/account_general_ledger_report.py
new file mode 100644
index 00000000000..6292709e29d
--- /dev/null
+++ b/addons/account/wizard/account_general_ledger_report.py
@@ -0,0 +1,151 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+
+from osv import fields, osv
+from tools.translate import _
+import tools
+
+class account_general_ledger_report(osv.osv_memory):
+    _name = "account.general.ledger.report"
+    _description = "General Ledger Report"
+
+    _columns = {
+        'Account_list': fields.many2one('account.account', 'Chart account', required=True, domain = [('parent_id','=',False)]),
+
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'state': fields.selection([('bydate','By Date'),
+                                  ('byperiod','By Period'),
+                                  ('all','By Date and Period'),
+                                  ('none','No Filter')],"Date/Period Filter"),
+        'fiscalyear': fields.many2one('account.fiscalyear', 'Fiscal year', help='Keep empty for all open fiscal year'),
+        'periods': fields.many2many('account.period', 'ledger_period_rel', 'ledger_id', 'period_id', 'Periods',  help='All periods if empty' ),
+        'sortbydate': fields.selection([('sort_date','Date'),
+                                ('sort_mvt','Movement')],"Sort by:"),
+        'display_account': fields.selection([('bal_mouvement','With movements'),
+                                     ('bal_all','All'),
+                                     ('bal_solde','With balance is not equal to 0')],"Display accounts"),
+        'landscape': fields.boolean("Landscape Mode"),
+        'soldeinit': fields.boolean("Include initial balances"),
+        'amount_currency': fields.boolean("With Currency"),
+        'date_from': fields.date("Start date", required=True),
+        'date_to': fields.date("End date", required=True)
+                }
+
+    def _get_company(self, cr, uid, ids, context=None):
+        user_obj = self.pool.get('res.users')
+        company_obj = self.pool.get('res.company')
+        if context is None:
+            context = {}
+        user = user_obj.browse(cr, uid, uid, context=context)
+        if user.company_id:
+           return user.company_id.id
+        else:
+           return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
+
+    _defaults = {
+            'state' : 'none',
+            'date_from' : lambda *a: time.strftime('%Y-01-01'),
+            'date_to' : lambda *a: time.strftime('%Y-%m-%d'),
+            'company_id' : _get_company,
+            'display_account' : 'bal_all',
+            'sortbydate' : 'sort_date',
+            'fiscalyear' : False,
+            'landscape': True,
+            'amount_currency' : True,
+                }
+
+    def next_view(self, cr, uid, ids, context=None):
+        obj_model = self.pool.get('ir.model.data')
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids, [])[0]
+        context.update({'Account_list': data['Account_list']})
+        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','account_general_ledger_report_view')])
+        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'account.general.ledger.report',
+            'views': [(resource_id,'form')],
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'context': context
+        }
+
+    def _check_date(self, cr, uid, data, context=None):
+        if context is None:
+            context = {}
+        sql = """
+            SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f  Where %s between f.date_start and f.date_stop """
+        cr.execute(sql,(data['form']['date_from'],))
+        res = cr.dictfetchall()
+        if res:
+            if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_to'] < res[0]['date_start']):
+                    raise  osv.except_osv(_('UserError'),_('Date to must be set between %s and %s') % (str(res[0]['date_start']), str(res[0]['date_stop'])))
+            else:
+                if data['form']['landscape'] == True:
+                    return {
+                        'type': 'ir.actions.report.xml',
+                        'report_name': 'account.general.ledger_landscape',
+                        'datas': data,
+                    }
+                else:
+                    return {
+                        'type': 'ir.actions.report.xml',
+                        'report_name': 'account.general.ledger',
+                        'datas': data,
+                    }
+        else:
+            raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
+
+    def check_report(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        data={}
+        data['ids'] = context.get('active_ids',[])
+        data['form'] = self.read(cr, uid, ids, ['date_from', 'sortbydate', 'company_id', 'soldeinit', 'state', 'periods', 'date_to', 'amount_currency', 'display_account', 'landscape', 'fiscalyear'])[0]
+        data['form']['Account_list'] = context.get('Account_list',[])
+        if data['form']['Account_list']:
+            data['model'] = 'ir.ui.menu'
+        else:
+            data['model'] = 'account.account'
+        data['form']['context'] = context
+        if data['form']['state'] == 'bydate':
+            return self._check_date(cr, uid, data, context)
+        elif  data['form']['state'] == 'byperiod':
+            if not data['form']['periods']:
+                raise osv.except_osv(_('Data Insufficient !'),_('Please select periods.'))
+        if data['form']['landscape'] == True:
+            return {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'account.general.ledger_landscape',
+                'datas': data,
+            }
+        else:
+            return {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'account.general.ledger',
+                'datas': data,
+            }
+account_general_ledger_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_general_ledger_report_view.xml b/addons/account/wizard/account_general_ledger_report_view.xml
new file mode 100644
index 00000000000..dc3462ac307
--- /dev/null
+++ b/addons/account/wizard/account_general_ledger_report_view.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="account_general_ledger_report_view" model="ir.ui.view">
+            <field name="name">General Ledger</field>
+            <field name="model">account.general.ledger.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Select Date-Period">
+			    <field name="company_id" colspan="4"/>
+			    <newline/>
+			    <field name="fiscalyear"/>
+			    <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
+			    <newline/>
+
+			    <field name="display_account" required="True"/>
+			    <field name="sortbydate" required="True"/>
+
+			    <field name="soldeinit" invisible="1"/>
+
+			    <field name="landscape"/>
+			    <field name="amount_currency"/>
+			    <newline/>
+			    <separator string="Filters" colspan="4"/>
+			    <field name="state" required="True"/>
+			    <newline/>
+			    <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
+			        <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
+			            <separator string="Date Filter" colspan="4"/>
+			            <field name="date_from"/>
+			            <field name="date_to"/>
+			        </group>
+			        <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
+			            <separator string="Filter on Periods" colspan="4"/>
+			            <field name="periods" colspan="4" nolabel="1"/>
+			        </group>
+			    </group>
+    				<newline/>
+    				<group colspan="4" col="6">
+	     				<separator string="" colspan="4"/>
+	     				<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	               		<button name="check_report" string="Print" type="object" icon="gtk-print"/>
+               		</group>
+			</form>
+            </field>
+        </record>
+
+		<record id="action_account_general_ledger_report" model="ir.actions.act_window">
+            <field name="name">General Ledger</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.general.ledger.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_general_ledger_report_view"/>
+            <field name="target">new</field>
+    	</record>
+
+		<record model="ir.values" id="account_general_ledger_report_values">
+            <field name="model_id" ref="account.model_account_account" />
+            <field name="object" eval="1" />
+            <field name="name">Account General Ledger</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_general_ledger_report'))" />
+            <field name="key">action</field>
+            <field name="model">account.account</field>
+        </record>
+
+        <record id="account_general_ledger_report_view1" model="ir.ui.view">
+            <field name="name">General Ledger</field>
+            <field name="model">account.general.ledger.report</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+		        <form string="Select Chart">
+		        	<field name="Account_list"/>
+		        	<separator colspan="4"/>
+		            <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+		            <button name="next_view" string="Next" type="object" icon="gtk-go-forward" default_focus="1"/>
+		        </form>
+            </field>
+        </record>
+
+		<record id="action_account_general_ledger_menu" model="ir.actions.act_window">
+            <field name="name">Select Chart</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.general.ledger.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_general_ledger_report_view1"/>
+            <field name="target">new</field>
+    	</record>
+
+        <menuitem
+        	icon="STOCK_PRINT"
+	        name="General Ledger"
+	        parent="account.menu_generic_report"
+	        action="action_account_general_ledger_menu"
+	        id="menu_general_ledger"
+	       />
+
+    </data>
+</openerp>
diff --git a/addons/account/wizard/wizard_general_ledger_report.py b/addons/account/wizard/wizard_general_ledger_report.py
deleted file mode 100644
index d5f8ac0fa98..00000000000
--- a/addons/account/wizard/wizard_general_ledger_report.py
+++ /dev/null
@@ -1,179 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-import locale
-import time
-from tools.translate import _
-
-account_form = '''<?xml version="1.0"?>
-<form string="Select Chart">
-    <field name="Account_list" colspan="4"/>
-</form>'''
-
-account_fields = {
-    'Account_list': {'string':'Chart of Accounts', 'type':'many2one', 'relation':'account.account', 'required':True ,'domain':[('parent_id','=',False)]},
-}
-
-period_form = '''<?xml version="1.0"?>
-<form string="Select Date-Period">
-    <field name="company_id" colspan="4"/>
-    <newline/>
-    <field name="fiscalyear"/>
-    <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
-    <newline/>
-
-    <field name="display_account" required="True"/>
-    <field name="sortbydate" required="True"/>
-
-    <field name="soldeinit" invisible="1"/>
-
-    <field name="landscape"/>
-    <field name="amount_currency"/>
-    <newline/>
-    <separator string="Filters" colspan="4"/>
-    <field name="state" required="True"/>
-    <newline/>
-    <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
-        <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
-            <separator string="Date Filter" colspan="4"/>
-            <field name="date_from"/>
-            <field name="date_to"/>
-        </group>
-        <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
-            <separator string="Filter on Periods" colspan="4"/>
-            <field name="periods" colspan="4" nolabel="1"/>
-        </group>
-    </group>
-
-
-
-
-
-</form>'''
-
-period_fields = {
-    'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
-    'state':{
-        'string':"Date/Period Filter",
-        'type':'selection',
-        'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],
-        'default': lambda *a:'none'
-    },
-    'fiscalyear': {'string': 'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
-        'help': 'Keep empty for all open fiscal year'},
-    'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'},
-    'sortbydate':{'string':"Sort by:",'type':'selection','selection':[('sort_date','Date'),('sort_mvt','Movement')]},
-    'display_account':{'string':"Display accounts ",'type':'selection','selection':[('bal_mouvement','With movements'),('bal_all','All'),('bal_solde','With balance is not equal to 0')]},
-    'landscape':{'string':"Landscape Mode",'type':'boolean'},
-    'soldeinit':{'string':"Include initial balances",'type':'boolean'},
-    'amount_currency':{'string':"With Currency",'type':'boolean'},
-    'date_from': {'string':"           Start date",'type':'date','required':True ,'default': lambda *a: time.strftime('%Y-01-01')},
-    'date_to': {'string':"End date",'type':'date','required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
-}
-def _check_path(self, cr, uid, data, context):
-    if data['model'] == 'account.account':
-        return 'checktype'
-    else:
-        return 'account_selection'
-
-def _check(self, cr, uid, data, context):
-    if data['form']['landscape']==True:
-        return 'report_landscape'
-    else:
-        return 'report'
-
-def _check_date(self, cr, uid, data, context):
-
-    sql = """
-        SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f  Where %s between f.date_start and f.date_stop """
-    cr.execute(sql,(data['form']['date_from'],))
-    res = cr.dictfetchall()
-    if res:
-        if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_to'] < res[0]['date_start']):
-                raise  wizard.except_wizard(_('UserError'),_('Date to must be set between %s and %s') % (str(res[0]['date_start']), str(res[0]['date_stop'])))
-        else:
-            return 'checkreport'
-
-    else:
-        raise wizard.except_wizard(_('UserError'),_('Date not in a defined fiscal year'))
-
-def _check_state(self, cr, uid, data, context):
-
-        if data['form']['state'] == 'bydate':
-           _check_date(self, cr, uid, data, context)
-#           data['form']['fiscalyear'] = 0
-#        else :
-#
-#           data['form']['fiscalyear'] = 1
-        return data['form']
-
-
-class wizard_report(wizard.interface):
-    def _get_defaults(self, cr, uid, data, context={}):
-        user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
-        if user.company_id:
-            company_id = user.company_id.id
-        else:
-            company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
-        data['form']['company_id'] = company_id
-        fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
-
-        data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
-        #periods_obj=pooler.get_pool(cr.dbname).get('account.period')
-        #data['form']['periods'] =periods_obj.search(cr, uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
-        data['form']['sortbydate'] = 'sort_date'
-        data['form']['display_account']='bal_all'
-        data['form']['landscape']=True
-        data['form']['fiscalyear'] = False
-        data['form']['amount_currency'] = True
-        data['form']['context'] = context
-        return data['form']
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'choice','next_state':_check_path}
-        },
-        'account_selection': {
-            'actions': [],
-            'result': {'type':'form', 'arch':account_form,'fields':account_fields, 'state':[('end','Cancel','gtk-cancel'),('checktype','Next','gtk-go-forward')]}
-        },
-        'checktype': {
-            'actions': [_get_defaults],
-            'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('checkreport','Print','gtk-print')]}
-        },
-        'checkreport': {
-            'actions': [],
-            'result': {'type':'choice','next_state':_check}
-        },
-        'report_landscape': {
-            'actions': [_check_state],
-            'result': {'type':'print', 'report':'account.general.ledger_landscape', 'state':'end'}
-        },
-        'report': {
-            'actions': [_check_state],
-            'result': {'type':'print', 'report':'account.general.ledger', 'state':'end'}
-        }
-    }
-wizard_report('account.general.ledger.report')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: