From 194bcd8ab82454473c9b6037045f9500e3c19380 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Tue, 2 Mar 2010 14:34:52 +0530
Subject: [PATCH] [IMP]: account: Minor changes for wizards

bzr revid: rpa@openerp.co.in-20100302090452-elyjrhoo2g8ojqyl
---
 addons/account/account_invoice_view.xml                   | 6 +++---
 addons/account/account_view.xml                           | 5 ++++-
 addons/account/wizard/account_invoice_refund_view.xml     | 3 +++
 .../account/wizard/account_move_bank_reconcile_view.xml   | 1 +
 .../wizard/account_move_line_reconcile_select_view.xml    | 8 +++++++-
 addons/account/wizard/account_period_close_view.xml       | 2 ++
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 3b917b93f68..d281403b68f 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -196,11 +196,11 @@
                                     <button name='%(wizard_paid_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
                                     <!-- Wizard Buttons: To Remove -->
                                     <button name="%(wizard_invoice_pay)d" type="action" string="Pay Invoice" states="open,paid,proforma2" icon="STOCK_EXECUTE" /> 
-							 		<button name="%(wizard_invoice_refund)d" type="action" string="Credit Note"  icon="STOCK_EXECUTE" />
+							 		<button name="%(action_account_invoice_refund)d" type="action" string="Credit Note"  icon="STOCK_EXECUTE" />
                                 </group>
                             </group>
-                             
                         </page>
+                        
                         <page string="Other Info">
                             <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
                             <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
@@ -291,7 +291,7 @@
                                     <button name='%(wizard_paid_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
                                     <!-- Wizard Buttons: To Remove -->
                                     <button name="%(wizard_invoice_pay)d" type="action" string="Pay Invoice" states="open,paid,proforma2" icon="STOCK_EXECUTE" /> 
-							 		<button name="%(wizard_invoice_refund)d" type="action" string="Credit Note"  icon="STOCK_EXECUTE" />
+							 		<button name="%(action_account_invoice_refund)d" type="action" string="Credit Note"  icon="STOCK_EXECUTE" />
                                </group>
                             </group>
                         </page>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 9dc00c58c38..4723f2b890f 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -81,7 +81,10 @@
                     <separator colspan="4" string="States"/>
                     <field name="state" select="1"/>
                     <button name="action_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
-                    
+                    <!-- Wizard Buttons: To Remove -->
+                    <button name="%(action_account_period_close)d"
+                    	states="draft" string="Close Period" type="action"
+                    	icon="gtk-close" />
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index 8a02c20faf7..4a38f3e2c63 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
     	<record id="view_account_invoice_refund" model="ir.ui.view">
             <field name="name">account.invoice.refund.form</field>
             <field name="model">account.invoice.refund</field>
@@ -25,6 +26,7 @@
                </form>
             </field>
     	</record>
+
         <record id="action_account_invoice_refund" model="ir.actions.act_window">
             <field name="name">Credit Note</field>
             <field name="res_model">account.invoice.refund</field>
@@ -33,5 +35,6 @@
            <field name="view_id" ref="view_account_invoice_refund"/> 
            <field name="target">new</field>
         </record>
+
     </data>
 </openerp>	
\ No newline at end of file
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index 87400d5c3cd..719e9f8a9a2 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -19,6 +19,7 @@
                </form>
             </field>
     	</record>
+    	
     	<record id="action_account_bank_reconcile_tree" model="ir.actions.act_window">
             <field name="name">Bank reconciliation</field>
             <field name="res_model">account.move.bank.reconcile</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 a2a45454c90..f6598413767 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -27,6 +27,12 @@
            <field name="view_id" ref="view_account_move_line_reconcile_select"/> 
            <field name="target">new</field>
         </record>
-        <menuitem id="next_id_20" name="Reconciliation" parent="menu_finance_periodical_processing"/><menuitem action="action_account_reconcile_select" id="menu_reconcile_select" parent="account.next_id_20" />
+
+        <menuitem id="next_id_20" name="Reconciliation"
+        	parent="menu_finance_periodical_processing" />
+
+        <menuitem action="action_account_reconcile_select"
+        	id="menu_reconcile_select" parent="account.next_id_20" />
+
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index b1e9e289083..3be41101fdc 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+    
         <record id="view_account_period_close" model="ir.ui.view">
             <field name="name">account.period.close.form</field>
             <field name="model">account.period.close</field>
@@ -20,6 +21,7 @@
                </form>
             </field>
         </record>
+        
 		<record id="action_account_period_close" model="ir.actions.act_window">
             <field name="name">Close a Period</field>
             <field name="res_model">account.period.close</field>