From 2c2fdc09f12fbbcb51b2d874c331ad5227fc3c4b Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 16 Sep 2013 12:59:09 +0530
Subject: [PATCH] [IMP] Make OBI label to Description and make the cash control
 tab as default in cash registers.

bzr revid: psa@tinyerp.com-20130916072909-4c1s5y4ah3riusik
---
 addons/account/account_bank_statement.py |  2 +-
 addons/account/account_view.xml          | 66 ++++++++++++------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 508cbb42808..a573077891e 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -546,7 +546,7 @@ class account_bank_statement_line(osv.osv):
     _name = "account.bank.statement.line"
     _description = "Bank Statement Line"
     _columns = {
-        'name': fields.char('OBI', required=True, help="Originator to Beneficiary Information"),
+        'name': fields.char('Description', required=True, help="Originator to Beneficiary Information"),
         'date': fields.date('Date', required=True),
         'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
         'type': fields.selection([
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 635ec6e2ea2..bdad02c252d 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2275,6 +2275,39 @@
                         </group>
                     </group>
                     <notebook>
+                        <page string="Cash Control">
+                            <group col="2" expand="1">
+                                <group string="Opening Cash Control" attrs="{'invisible' : [('state', '!=', 'draft')]}">
+                                    <field name="opening_details_ids" colspan="2" nolabel="1">
+                                        <tree string="Opening Cashbox Lines" editable="bottom">
+                                            <field name="pieces"/>
+                                            <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
+                                            <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
+                                        </tree>
+                                    </field>
+                                </group>
+                                <group>
+                                    <group string="Opening Cash Control" attrs="{'invisible' : [('state', '=', 'draft')]}">
+                                        <field name="details_ids" colspan="2" nolabel="1" attrs="{'readonly' : [('state', '!=', 'draft')]}">
+                                            <tree string="Opening Cashbox Lines" editable="bottom">
+                                                <field name="pieces"/>
+                                                <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
+                                                <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
+                                            </tree>
+                                        </field>
+                                    </group>
+                                    <group string="Closing Cash Control" attrs="{'invisible' : [('state', '=', 'draft')]}">
+                                        <field name="closing_details_ids" colspan="2" nolabel="1">
+                                            <tree string="Closing Cashbox Lines" editable="bottom">
+                                                <field name="pieces" readonly="1" />
+                                                <field name="number_closing" on_change="on_change_sub_closing(pieces, number_closing, parent.balance_end)"/>
+                                                <field name="subtotal_closing" string="Closing Subtotal" sum="Total"/>
+                                            </tree>
+                                        </field>
+                                    </group>
+                                </group>
+                            </group>
+                        </page>
                         <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
                             <field name="line_ids" context="{'date':date}">
                                 <tree editable="bottom" string="Statement lines">
@@ -2305,39 +2338,6 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Cash Control">
-                            <group col="2" expand="1">
-                                <group string="Opening Cash Control" attrs="{'invisible' : [('state', '!=', 'draft')]}">
-                                    <field name="opening_details_ids" colspan="2" nolabel="1">
-                                        <tree string="Opening Cashbox Lines" editable="bottom">
-                                            <field name="pieces"/>
-                                            <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
-                                            <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
-                                        </tree>
-                                    </field>    
-                                </group>
-                                <group>
-                                    <group string="Opening Cash Control" attrs="{'invisible' : [('state', '=', 'draft')]}">
-                                        <field name="details_ids" colspan="2" nolabel="1" attrs="{'readonly' : [('state', '!=', 'draft')]}">
-                                            <tree string="Opening Cashbox Lines" editable="bottom">
-                                                <field name="pieces"/>
-                                                <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
-                                                <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
-                                            </tree>
-                                        </field>
-                                    </group>
-                                    <group string="Closing Cash Control" attrs="{'invisible' : [('state', '=', 'draft')]}">
-                                        <field name="closing_details_ids" colspan="2" nolabel="1">
-                                            <tree string="Closing Cashbox Lines" editable="bottom">
-                                                <field name="pieces" readonly="1" />
-                                                <field name="number_closing" on_change="on_change_sub_closing(pieces, number_closing, parent.balance_end)"/>
-                                                <field name="subtotal_closing" string="Closing Subtotal" sum="Total"/>
-                                            </tree>
-                                        </field>
-                                    </group>
-                                </group>
-                            </group>
-                        </page>
                         <page string="Journal Entries" attrs="{'invisible': [('state','!=','confirm')]}">
                             <field name="move_line_ids" string="Journal Entries"/>
                         </page>