From 3394daefc5d270d7a2e718f641e251b94978c223 Mon Sep 17 00:00:00 2001
From: "ATP (OpenERP)" <>
Date: Tue, 2 Mar 2010 15:47:28 +0530
Subject: [PATCH] [IMP]: account: Added icons on wizard buttons

bzr revid: rpa@openerp.co.in-20100302101728-03qbgh5xy7c8ti61
---
 addons/account/wizard/account_chart_view.xml  |  8 +--
 .../wizard/account_fiscalyear_close_state.xml |  4 +-
 .../wizard/account_invoice_refund_view.xml    |  8 +--
 .../account_move_bank_reconcile_view.xml      |  4 +-
 .../wizard/account_move_journal_view.xml      |  2 +-
 ...ccount_move_line_reconcile_select_view.xml |  6 +-
 .../wizard/account_period_close_view.xml      |  4 +-
 addons/account/wizard/wizard_reconcile.py     | 60 +++++++++----------
 8 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index eedd259c762..ae89dfb9945 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -16,9 +16,10 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button  special="cancel" string="Cancel"/>
-                    	<button string="Open Charts" name="_account_chart_open_window" type="object"/>
-                   </group>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
+                    	<button icon="gtk-open" string="Open Charts"
+                    		name="_account_chart_open_window" type="object" />
+                    </group>
                </form>
             </field>
   		</record>
@@ -35,6 +36,5 @@
         <menuitem icon="STOCK_INDENT" action="action_account_chart"
         	id="menu_action_account_tree2"
         	parent="account.menu_finance_charts" />
-
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index 7a6492ddb0d..d6fe49c9b2c 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -15,8 +15,8 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button  special="cancel" string="Cancel"/>
-                    	<button string="Close states" name="_data_save" type="object"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-close" string="Close states" name="_data_save" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index 4a38f3e2c63..0d2bb036c06 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -18,10 +18,10 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button  special="cancel" string="Cancel"/>
-                    	<button string="Refund Invoice" name="_invoice_refund" type="object"/>
-                    	<button string="Cancel Invoice" name="_invoice_cancel" type="object"/>
-                    	<button string="Modify Invoice" name="_invoice_modify" type="object"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-redo" string="Refund Invoice" name="_invoice_refund" type="object"/>
+                    	<button icon="gtk-ok" string="Cancel Invoice" name="_invoice_cancel" type="object"/>
+                    	<button icon="gtk-undo" string="Modify Invoice" name="_invoice_modify" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index 719e9f8a9a2..5a542a7e270 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -13,8 +13,8 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button  special="cancel" string="Cancel"/>
-                    	<button string="Open for bank reconciliation" name="_action_open_window" type="object"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-open" string="Open for bank reconciliation" name="_action_open_window" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index 293212ce2e3..e32148c9c69 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -17,7 +17,7 @@
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button string="Open Journal" name="_action_open_window" type="object"/>
+                    	<button icon="gtk-open" string="Open Journal" name="_action_open_window" type="object"/>
                    	</group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index f6598413767..2bb05b2e9ab 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -13,8 +13,10 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button  special="cancel" string="Cancel"/>
-                    	<button string="Open for reconciliation" name="_action_open_window" type="object"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
+						<button icon="gtk-open"
+							string="Open for reconciliation" name="_action_open_window"
+							type="object" />
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index 3be41101fdc..fc8c5273a79 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -15,8 +15,8 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button  special="cancel" string="Cancel"/>
-                    	<button string="Close Period" name="_data_save" type="object"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-close" string="Close Period" name="_data_save" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/wizard_reconcile.py b/addons/account/wizard/wizard_reconcile.py
index 9debe7afbef..6d7de403f79 100644
--- a/addons/account/wizard/wizard_reconcile.py
+++ b/addons/account/wizard/wizard_reconcile.py
@@ -19,13 +19,13 @@
 #
 ##############################################################################
 
-import wizard
-import netsvc
-import time
-import osv
-import pooler
 from datetime import datetime
 from tools.translate import _
+import netsvc
+import osv
+import pooler
+import time
+import wizard
 
 _transaction_form = '''<?xml version="1.0"?>
 <form string="Reconciliation">
@@ -39,10 +39,10 @@ _transaction_form = '''<?xml version="1.0"?>
 </form>'''
 
 _transaction_fields = {
-    'trans_nbr': {'string':'# of Transaction', 'type':'integer', 'readonly':True},
-    'credit': {'string':'Credit amount', 'type':'float', 'readonly':True},
-    'debit': {'string':'Debit amount', 'type':'float', 'readonly':True},
-    'writeoff': {'string':'Write-Off amount', 'type':'float', 'readonly':True},
+    'trans_nbr': {'string':'# of Transaction', 'type':'integer', 'readonly':True}, 
+    'credit': {'string':'Credit amount', 'type':'float', 'readonly':True}, 
+    'debit': {'string':'Debit amount', 'type':'float', 'readonly':True}, 
+    'writeoff': {'string':'Write-Off amount', 'type':'float', 'readonly':True}, 
 }
 
 def _trans_rec_get(self, cr, uid, data, context=None):
@@ -83,12 +83,12 @@ def _trans_rec_reconcile(self, cr, uid, data, context=None):
     journal_id = form.get('journal_id', False)
     context['comment'] = form.get('comment', False)
     context['analytic_id'] = form.get('analytic_id', False)
-    account_move_line_obj.reconcile(cr, uid, data['ids'], 'manual', account_id,
+    account_move_line_obj.reconcile(cr, uid, data['ids'], 'manual', account_id, 
             period_id, journal_id, context=context)
     return {}
 
 def _partial_check(self, cr, uid, data, context):
-    if _trans_rec_get(self,cr,uid, data, context)['writeoff'] == 0:
+    if _trans_rec_get(self, cr, uid, data, context)['writeoff'] == 0:
         return 'init_full'
     return 'init_partial'
 
@@ -104,11 +104,11 @@ _transaction_add_form = '''<?xml version="1.0"?>
 </form>'''
 
 _transaction_add_fields = {
-    'journal_id': {'string': 'Write-Off Journal', 'type': 'many2one', 'relation':'account.journal', 'required':True},
-    'writeoff_acc_id': {'string':'Write-Off account', 'type':'many2one', 'relation':'account.account', 'required':True},
-    'date_p': {'string':'Date','type':'date'},
-    'comment': {'string':'Comment','type':'char', 'size': 64, 'required':True},
-    'analytic_id': {'string':'Analytic Account', 'type': 'many2one', 'relation':'account.analytic.account'},
+    'journal_id': {'string': 'Write-Off Journal', 'type': 'many2one', 'relation':'account.journal', 'required':True}, 
+    'writeoff_acc_id': {'string':'Write-Off account', 'type':'many2one', 'relation':'account.account', 'required':True}, 
+    'date_p': {'string':'Date', 'type':'date'}, 
+    'comment': {'string':'Comment', 'type':'char', 'size': 64, 'required':True}, 
+    'analytic_id': {'string':'Analytic Account', 'type': 'many2one', 'relation':'account.analytic.account'}, 
 }
 
 def _trans_rec_addendum(self, cr, uid, data, context={}):
@@ -119,27 +119,27 @@ def _trans_rec_addendum(self, cr, uid, data, context={}):
 class wiz_reconcile(wizard.interface):
     states = {
         'init': {
-            'actions': [],
+            'actions': [], 
             'result': {'type': 'choice', 'next_state': _partial_check}
-        },
+        }, 
         'init_full': {
-            'actions': [_trans_rec_get],
-            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel'),('reconcile','Reconcile')]}
-        },
+            'actions': [_trans_rec_get], 
+            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end', 'Cancel'), ('reconcile', 'Reconcile')]}
+        }, 
         'init_partial': {
-            'actions': [_trans_rec_get],
-            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel'),('addendum','Reconcile With Write-Off'),('partial','Partial Reconcile')]}
-        },
+            'actions': [_trans_rec_get], 
+            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end', 'Cancel'), ('addendum', 'Reconcile With Write-Off'), ('partial', 'Partial Reconcile')]}
+        }, 
         'addendum': {
-            'actions': [_trans_rec_addendum],
-            'result': {'type': 'form', 'arch':_transaction_add_form, 'fields':_transaction_add_fields, 'state':[('end','Cancel'),('reconcile','Reconcile')]}
-        },
+            'actions': [_trans_rec_addendum], 
+            'result': {'type': 'form', 'arch':_transaction_add_form, 'fields':_transaction_add_fields, 'state':[('end', 'Cancel'), ('reconcile', 'Reconcile')]}
+        }, 
         'reconcile': {
-            'actions': [_trans_rec_reconcile],
+            'actions': [_trans_rec_reconcile], 
             'result': {'type': 'state', 'state':'end'}
-        },
+        }, 
         'partial': {
-            'actions': [_trans_rec_reconcile_partial],
+            'actions': [_trans_rec_reconcile_partial], 
             'result': {'type': 'state', 'state':'end'}
         }
     }