From 6ccc52f380ea671bdbd44db12a8c2340b7e02444 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Tue, 26 Jun 2012 18:52:58 +0530
Subject: [PATCH] [IMP] improve view of Cash Registers.

bzr revid: nco@tinyerp.com-20120626132258-u7ye84qw0yf4dajp
---
 addons/account/account_view.xml | 106 +++++++++++++++++---------------
 1 file changed, 58 insertions(+), 48 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ab46f7519f8..5a6db76eb8c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2550,15 +2550,24 @@ action = pool.get('res.config').next(cr, uid, [], context)
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet string="Statement">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name='company_id' widget="selection" groups="base.group_multi_company" />
-                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
-                        <field name="user_id" readonly="1"/>
-                        <field name="period_id"/>
-                        <field name="currency" invisible="1"/>
-                    </group>
-
+                    <label for="name" class="oe_edit_only"/>
+                    <h1><field name="name" class="oe_inline"/>-<field name="period_id" class="oe_inline"/></h1>
+                    <label for="journal_id" class="oe_edit_only"/>
+                    <h2>
+                    	<field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>	
+                    </h2>
+                	<group col="4">
+	                    <group>
+	                    	<field name="user_id" readonly="1"/>
+	                    	<field name="total_entry_encoding"/>
+	                   		<field name='company_id' widget="selection" groups="base.group_multi_company" />     
+	                    </group>
+						<group>
+                            <field name="date" attrs="{'readonly':[('state','!=','draft')]}"  on_change="onchange_date(date, company_id)"/>
+                            <field name="closing_date" readonly="1"/>
+                            <field name="currency" invisible="1"/>
+	                   </group>
+                   </group>
                     <notebook>
                         <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
                             <field name="line_ids" context="{'date':date}">
@@ -2591,51 +2600,52 @@ action = pool.get('res.config').next(cr, uid, [], context)
                             </field>
                         </page>
                         <page string="CashBox">
-                            <group>
-                                <field name="starting_details_ids" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1">
-                                    <tree string = "Opening Balance" editable="bottom">
-                                        <field name="pieces"/>
-                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
-                                        <field name="subtotal" sum="Total"/>
-                                    </tree>
-                                    <form string = "Opening Balance" version="7.0">
-                                        <field name="pieces"/>
-                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
-                                        <field name="subtotal"/>
-                                    </form>
-                                </field>
-                                <field name="ending_details_ids" attrs="{'readonly':[('state','!=','open')]}" nolabel="1">
-                                    <tree string = "Closing Balance" editable="bottom">
-                                        <field name="pieces"/>
-                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
-                                        <field name="subtotal" sum="Total"/>
-                                    </tree>
-                                    <form string = "Closing Balance" version="7.0">
-                                        <field name="pieces"/>
-                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
-                                        <field name="subtotal"/>
-                                    </form>
-                                </field>
+                            <group col="4">
+                            	<group>
+                            		<label for="starting_details_ids" string="Opening Operations"/><newline/>
+	                                <field name="starting_details_ids" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1">
+	                                    <tree string = "Opening Balance" editable="bottom">
+	                                        <field name="pieces"/>
+	                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+	                                        <field name="subtotal" sum="Total"/>
+	                                    </tree>
+	                                    <form string = "Opening Balance" version="7.0">
+	                                        <field name="pieces"/>
+	                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+	                                        <field name="subtotal"/>
+	                                    </form>
+	                                </field>
+	                                <newline/>
+	                                <group class="oe_subtotal_footer oe_right">
+                                		<field name="balance_start" readonly="1" string="Total"/>
+                                	</group>
+                                </group>
+                                <group>
+                                	<label for="ending_details_ids" string="Closing Operations"/><newline/>
+	                                <field name="ending_details_ids" attrs="{'readonly':[('state','!=','open')]}" nolabel="1">
+	                                    <tree string = "Closing Balance" editable="bottom">
+	                                        <field name="pieces"/>
+	                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+	                                        <field name="subtotal" sum="Total"/>
+	                                    </tree>
+	                                    <form string = "Closing Balance" version="7.0">
+	                                        <field name="pieces"/>
+	                                        <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
+	                                        <field name="subtotal"/>
+	                                    </form>
+	                                </field>
+	                                <newline/>
+	                                <group class="oe_subtotal_footer oe_right">
+	                                	<field name="balance_end_cash" invisible="1" string="Total"/>
+                                		<field name="balance_end" string="Total"/>
+			                        </group>
+	                            </group> 
                             </group>
                         </page>
                         <page string="Journal Entries" attrs="{'invisible': [('state','!=','confirm')]}">
                             <field name="move_line_ids" string="Journal Entries"/>
                         </page>
                     </notebook>
-                    <group col="3">
-                        <group string="Dates">
-                            <field name="date" attrs="{'readonly':[('state','!=','draft')]}"  on_change="onchange_date(date, company_id)"/>
-                            <field name="closing_date" readonly="1"/>
-                        </group>
-                        <group string="Opening Balance">
-                            <field name="balance_start" readonly="1" string="Opening Balance"/>
-                            <field name="total_entry_encoding"/>
-                        </group>
-                        <group string="Closing Balance">
-                            <field name="balance_end"/>
-                            <field name="balance_end_cash"/>
-                        </group>
-                    </group>
                 </sheet>
                 </form>
             </field>