From d258425749118b19bc9addcd26ed17a67956f386 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 15 Jul 2010 17:41:52 +0530
Subject: [PATCH] [FIX]: account: fix account chart installation wizard [IMP]:
 account: improvement in view [FIX]: account: add comments on the the wizards

bzr revid: mga@tinyerp.com-20100715121152-m0rys1jxwip4fzrx
---
 addons/account/account.py                     |  9 ++
 addons/account/account_invoice_view.xml       |  2 +-
 addons/account/board_account_view.xml         | 12 ++-
 addons/account/wizard/account_pl_report.py    |  2 +-
 .../account/wizard/account_pl_report_view.xml |  2 +
 .../wizard/account_print_journal_view.xml     | 82 +++++++++----------
 6 files changed, 62 insertions(+), 47 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 6aa47551a98..45d3cb4377c 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2684,6 +2684,15 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                                 'position_id' : new_fp,
                                 }
                     obj_ac_fp.create(cr, uid, vals_acc)
+        
+        #fially inactive the demo chart of accounts
+        data_id = data_pool.search(cr, uid, [('model','=','account.account'), ('name','=','chart0')])
+        if data_id:
+            data = data_pool.browse(cr, uid, data_id[0])
+            account_id = data.res_id
+            if account_id:
+                cr.execute("update account_account set active='f' where id=%s" % (account_id))
+        
 wizard_multi_charts_accounts()
 
 class account_bank_accounts_wizard(osv.osv_memory):
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 6fe0182b584..e9c66c3036d 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -207,7 +207,7 @@
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="terp-gtk-stop"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                     <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
-                                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='paid' icon="terp-dolar"/>
+                                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='open,paid' icon="terp-dolar"/>
                                 </group>
                             </group>
                         </page>
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 6738c7a7d37..4cf8cd89ec5 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -27,15 +27,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Board">
-                    <hpaned>
+                    <vpaned>
                         <child1>
                             <action colspan="4" height="160" name="%(account.action_invoice_tree1)d" string="Draft Customer Invoices" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
                         </child1>
                         <child2>
-                            <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged receivables"/>
-                            <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/>
+                            <group col="2" colspan="2" expand="1">
+                                <action colspan="4" name="%(action_aged_receivable)d" string="Aged receivables"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/>
+                            </group>
                         </child2>
-                    </hpaned>
+                    </vpaned>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_pl_report.py b/addons/account/wizard/account_pl_report.py
index f507226fefd..79b701b6fb9 100644
--- a/addons/account/wizard/account_pl_report.py
+++ b/addons/account/wizard/account_pl_report.py
@@ -68,7 +68,7 @@ class account_pl_report(osv.osv_memory):
         'fiscalyear' : False,
         'display_account': 'bal_all',
         'display_type': True,
-        }
+    }
 
     def next_view(self, cr, uid, ids, context=None):
         obj_model = self.pool.get('ir.model.data')
diff --git a/addons/account/wizard/account_pl_report_view.xml b/addons/account/wizard/account_pl_report_view.xml
index b1104df8d25..47ad83a235e 100644
--- a/addons/account/wizard/account_pl_report_view.xml
+++ b/addons/account/wizard/account_pl_report_view.xml
@@ -55,6 +55,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select Chart">
+                    <label string="Select account chart to print profit and loss account report" colspan="4"/>
+                    <separator colspan="4"/>
                     <field name="Account_list"/>
                     <separator colspan="4"/>
                     <button icon="gtk-cancel" special="cancel" string="Cancel"/>
diff --git a/addons/account/wizard/account_print_journal_view.xml b/addons/account/wizard/account_print_journal_view.xml
index 3c08fa5f697..1a4ad43724b 100644
--- a/addons/account/wizard/account_print_journal_view.xml
+++ b/addons/account/wizard/account_print_journal_view.xml
@@ -2,51 +2,51 @@
 <openerp>
     <data>
 <!---->
-<!--		<record id="view_account_print_journal" model="ir.ui.view">-->
+<!--        <record id="view_account_print_journal" model="ir.ui.view">-->
 <!--            <field name="name">Account Print Journal</field>-->
 <!--            <field name="model">account.print.journal</field>-->
 <!--            <field name="type">form</field>-->
 <!--            <field name="arch" type="xml">-->
-<!--			<form string="Print Journal">-->
-<!--			    <group col="4" colspan="6">-->
-<!--				    <field name="journal_id"/>-->
-<!--				    <field name="period_id"/>-->
-<!--				    <newline/>-->
-<!--				    <field name="sort_selection"/>-->
-<!--				</group>-->
-<!--				<separator colspan="4"/>-->
-<!--			    <group col="2" colspan="4">-->
-<!--	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>-->
-<!--						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>-->
-<!--				</group>-->
-<!--			</form>-->
+<!--            <form string="Print Journal">-->
+<!--                <group col="4" colspan="6">-->
+<!--                    <field name="journal_id"/>-->
+<!--                    <field name="period_id"/>-->
+<!--                    <newline/>-->
+<!--                    <field name="sort_selection"/>-->
+<!--                </group>-->
+<!--                <separator colspan="4"/>-->
+<!--                <group col="2" colspan="4">-->
+<!--                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>-->
+<!--                        <button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>-->
+<!--                </group>-->
+<!--            </form>-->
 <!--            </field>-->
 <!--        </record>-->
 
 
-		<record id="view_account_print_journal" model="ir.ui.view">
+        <record id="view_account_print_journal" model="ir.ui.view">
             <field name="name">Account Print Journal</field>
             <field name="model">account.print.journal</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Print Journal">
-				<group height="400" width="400">
-			    <group>
-			    	<separator string="Journals"/><newline/>
-				    <field name="journal_id" nolabel="1"/><newline/>
-				    <separator string="Periods"/><newline/>
-				    <field name="period_id" nolabel="1"/><newline/>
-				</group>
-				<newline/>
-				<group>
-				    <field name="sort_selection"/>
-				    <newline/>
-					<separator colspan="4"/>
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
-				</group>
-				</group>
-			</form>
+            <form string="Print Journal">
+                <group height="430" width="420">
+                    <group>
+                        <separator string="Journals"/><newline/>
+                        <field name="journal_id" nolabel="1"/><newline/>
+                        <separator string="Periods"/><newline/>
+                        <field name="period_id" nolabel="1"/><newline/>
+                    </group>
+                    <newline/>
+                    <group>
+                        <field name="sort_selection"/>
+                        <newline/>
+                        <separator colspan="4"/>
+                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                        <button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+                    </group>
+                </group>
+            </form>
             </field>
         </record>
         
@@ -59,12 +59,12 @@
             <field name="target">new</field>
         </record>
 
-		<menuitem
-	        name="Journals"
-	        parent="account.menu_generic_report"
-	        action="action_account_print_journal"
-	        id="menu_account_print_journal"
-	        icon="STOCK_PRINT"/>
+        <menuitem
+            name="Journals"
+            parent="account.menu_generic_report"
+            action="action_account_print_journal"
+            id="menu_account_print_journal"
+            icon="STOCK_PRINT"/>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>