From ff24a250f86c3024a437e0c55f9b21effe857ee5 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 6 Nov 2012 18:31:31 +0530
Subject: [PATCH] [IMP] Improved the Cancel Opening Entries Wizard.

bzr revid: mdi@tinyerp.com-20121106130131-f462qb5s6pfduv6p
---
 addons/account/wizard/account_open_closed_fiscalyear.py     | 4 ++--
 .../account/wizard/account_open_closed_fiscalyear_view.xml  | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/account/wizard/account_open_closed_fiscalyear.py b/addons/account/wizard/account_open_closed_fiscalyear.py
index b8d64fac0b5..1b5622a589d 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear.py
+++ b/addons/account/wizard/account_open_closed_fiscalyear.py
@@ -27,7 +27,7 @@ class account_open_closed_fiscalyear(osv.osv_memory):
     _description = "Choose Fiscal Year"
     _columns = {
        'fyear_id': fields.many2one('account.fiscalyear', \
-                                 'Fiscal Year to Open', required=True, help='Select Fiscal Year which you want to remove entries for its End of year entries journal'),
+                                 'Fiscal Year', required=True, help='Select Fiscal Year which you want to remove entries for its End of year entries journal'),
     }
 
     def remove_entries(self, cr, uid, ids, context=None):
@@ -36,7 +36,7 @@ class account_open_closed_fiscalyear(osv.osv_memory):
         data = self.browse(cr, uid, ids, context=context)[0]
         period_journal = data.fyear_id.end_journal_period_id or False
         if not period_journal:
-            raise osv.except_osv(_('Error!'), _('You have to set the end of the fiscal year for this journal.'))
+            raise osv.except_osv(_('Error!'), _("You have to set the 'End  of Year Entries Journal' for this Fiscal Year which is set after generating opening entries from 'Generate Opening Entries'."))
 
         ids_move = move_obj.search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
         if ids_move:
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index c2c271af41b..ff927549a68 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -5,9 +5,11 @@
             <field name="name">account.open.closed.fiscalyear.form</field>
             <field name="model">account.open.closed.fiscalyear</field>
             <field name="arch" type="xml">
-                <form string="Choose Fiscal Year " version="7.0">
+                <form string="Cancel Fiscal Year Opening Entries" version="7.0">
+                    <separator string="Cancel Fiscal Year Opening Entries"/>
+                    <label string="This wizard will remove the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year."/>
                     <group>
-                        <field name="fyear_id" domain="[('state','=','draft')]"/>
+                        <field name="fyear_id" domain="[('state','=','draft'), ('end_journal_period_id', '!=', False)]"/>
                     </group>
                     <footer>
                         <button string="Open" name="remove_entries" type="object" class="oe_highlight"/>