diff --git a/addons/account/wizard/wizard_account_balance_report.py b/addons/account/wizard/wizard_account_balance_report.py
index 90eeaf44256..f038ce2bd68 100644
--- a/addons/account/wizard/wizard_account_balance_report.py
+++ b/addons/account/wizard/wizard_account_balance_report.py
@@ -1,9 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
-#
-# $Id$
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -30,37 +28,117 @@
 
 import wizard
 import pooler
+import time
+
+report_type =  '''<?xml version="1.0"?>
+<form string="Select Report Type">
+</form>'''
+
 
 dates_form = '''<?xml version="1.0"?>
 <form string="Select period">
-    <field name="fiscalyear" colspan="4"/>
-    <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal year)"/>
-    <field name="periods" colspan="4"/>
-    <field name="state" colspan="4"/>
+    <field name="date_from" colspan="4"/>
+    <field name="date_to" colspan="4"/>
+    <field name="display_account" colspan="4"/>
+    
 </form>'''
 
 dates_fields = {
+    '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')},
+    'display_account':{'string':"Display accounts",'type':'selection','selection':[('bal_mouvement','With movements'),('bal_all','All'),('bal_solde','With balance is not equal to 0')]}
+}
+
+
+period_form = '''<?xml version="1.0"?>
+<form string="Select period">
+    <field name="fiscalyear" colspan="4"/>
+    <field name="periods" colspan="4"/>
+    <field name="display_account" colspan="4"/>
+    
+</form>'''
+
+
+
+period_fields = {
     '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'},
-    'state':{'string':'Target Moves','type':'selection','selection': [('all','All Entries'),('posted','All Posted Entries')]}
+    'display_account':{'string':"Display accounts ",'type':'selection','selection':[('bal_mouvement','With movements'),('bal_all','All'),('bal_solde','With balance is not equal to 0')]}
 }
 
+account_form = '''<?xml version="1.0"?>
+<form string="Select parent account">
+    <field name="Account_list" colspan="4"/>
+</form>'''
+
+account_fields = {
+    'Account_list': {'string':'Account', 'type':'many2one', 'relation':'account.account', 'required':True},
+}
+
+
 class wizard_report(wizard.interface):
     def _get_defaults(self, cr, uid, data, context):
         fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
+        periods_obj=pooler.get_pool(cr.dbname).get('account.period')
         data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
-        data['form']['target_move'] = False
-        data['form']['state']='all'
-        if context.has_key('target_move'):
-            data['form']['target_move'] = context['target_move']
+        data['form']['periods'] =periods_obj.search(cr, uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
+        data['form']['display_account']='bal_all'
         return data['form']
 
+    def _get_defaults_fordate(self, cr, uid, data, context):
+        data['form']['display_account']='bal_all'
+        return data['form']
+
+
+    def _check_path(self, cr, uid, data, context):
+        if data['model'] == 'account.account':
+            return 'checktype'
+        else:
+            return 'account_selection'
+
+    
+    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 """%(data['form']['date_from'])
+        cr.execute(sql)
+        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 ' + res[0]['date_start'] + " and " + res[0]['date_stop'])
+            else:
+                return 'report'
+            
+        else:
+            raise wizard.except_wizard('UserError','Date not in a defined fiscal year')
+
     states = {
+        
         'init': {
-            'actions': [_get_defaults],
-            'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('report','Print')]}
+            'actions': [],
+            'result': {'type':'choice','next_state':_check_path}
         },
+        'account_selection': {
+            'actions': [],
+            'result': {'type':'form', 'arch':account_form,'fields':account_fields, 'state':[('end','Cancel'),('checktype','Print')]}
+        },
+        'checktype': {
+            'actions': [],
+            'result': {'type':'form', 'arch':report_type,'fields':{}, 'state':[('with_period','Use with Period'),('with_date','Use with Date')]}
+        },
+        'with_period': {
+            'actions': [_get_defaults],
+            'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel'),('report','Print')]}
+        },
+        'with_date': {
+            'actions': [_get_defaults_fordate],
+            'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('checkdate','Print')]}
+        },
+        'checkdate': {
+            'actions': [],
+            'result': {'type':'choice','next_state':_check_date}
+        },
+
         'report': {
             'actions': [],
             'result': {'type':'print', 'report':'account.account.balance', 'state':'end'}
@@ -69,6 +147,3 @@ class wizard_report(wizard.interface):
 wizard_report('account.account.balance.report')
 
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-