diff --git a/addons/account/wizard/account_invoice_state.py b/addons/account/wizard/account_invoice_state.py
index 6b1a41f49af..c3934e38db0 100644
--- a/addons/account/wizard/account_invoice_state.py
+++ b/addons/account/wizard/account_invoice_state.py
@@ -21,6 +21,7 @@
 from osv import fields, osv
 from tools.translate import _
 import netsvc
+import pooler
 
 class account_invoice_confirm(osv.osv_memory):
     """
@@ -34,7 +35,12 @@ class account_invoice_confirm(osv.osv_memory):
         wf_service = netsvc.LocalService('workflow')
         if context is None:
             context = {}
-        for id in context['active_ids']:
+        pool_obj = pooler.get_pool(cr.dbname)
+        data_inv = pool_obj.get('account.invoice').read(cr, uid, context['active_ids'], ['state'], context=context)
+        
+        for record in data_inv:
+            if record['state'] not in ('draft','proforma','proforma2'):
+                raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state!"))
             wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_open', cr)
         return {}
 
@@ -47,14 +53,19 @@ class account_invoice_cancel(osv.osv_memory):
     """
 
     _name = "account.invoice.cancel"
-    _description = "Cancel the selected invoices"
+    _description = "Cancel the Selected Invoices"
 
     def invoice_cancel(self, cr, uid, ids, context=None):
-        wf_service = netsvc.LocalService('workflow')
         if context is None:
             context = {}
-        for id in context['active_ids']:
-            wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_cancel', cr)
+        wf_service = netsvc.LocalService('workflow')
+        pool_obj = pooler.get_pool(cr.dbname)
+        data_inv = pool_obj.get('account.invoice').read(cr, uid, context['active_ids'], ['state'], context=context)
+        
+        for record in data_inv:
+            if record['state'] in ('cancel','paid'):
+                raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!"))
+            wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_cancel', cr)
         return {}
 
 account_invoice_cancel()
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index 8748edbb688..d83c0c6f2dc 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -6,10 +6,10 @@
             <field name="model">account.invoice.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Confirm draft invoices">
-			    <separator string="Confirm draft invoices" colspan="4"/>
+			<form string="Confirm Draft Invoices">
+			    <separator string="Confirm Draft Invoices" colspan="4"/>
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Close"/>
                     	<button icon="gtk-execute" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1"/>
                    </group>
                </form>
@@ -17,7 +17,7 @@
     	</record>
 
 		<record id="action_account_invoice_confirm" model="ir.actions.act_window">
-            <field name="name">Confirm draft invoices</field>
+            <field name="name">Confirm Draft Invoices</field>
             <field name="res_model">account.invoice.confirm</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -28,7 +28,7 @@
 		<record model="ir.values" id="action_account_invoice_confirm_values">
             <field name="model_id" ref="account.model_account_invoice" />
             <field name="object" eval="1" />
-            <field name="name">Confirm draft invoices</field>
+            <field name="name">Confirm Draft Invoices</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_confirm'))" />
             <field name="key">action</field>
@@ -40,18 +40,18 @@
             <field name="model">account.invoice.cancel</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Cancel selected invoices">
-			    <separator string="Cancel selected invoices" colspan="4"/>
+			<form string="Cancel Selected Invoices">
+			    <separator string="Cancel Selected Invoices" colspan="4"/>
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-execute" string="Cancel selected invoices" name="invoice_cancel" type="object" default_focus="1"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Close"/>
+                    	<button icon="gtk-execute" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
     	</record>
 
 		<record id="action_account_invoice_cancel" model="ir.actions.act_window">
-            <field name="name">Cancel selected invoices</field>
+            <field name="name">Cancel Selected Invoices</field>
             <field name="res_model">account.invoice.cancel</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -62,7 +62,7 @@
 		<record model="ir.values" id="action_account_invoice_cancel_values">
             <field name="model_id" ref="account.model_account_invoice" />
             <field name="object" eval="1" />
-            <field name="name">Cancel selected invoices</field>
+            <field name="name">Cancel Selected Invoices</field>
             <field name="key2">client_action_multi</field>
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_cancel'))" />
             <field name="key">action</field>