[IMP] Make OBI label to Description and make the cash control tab as default in cash registers.

bzr revid: psa@tinyerp.com-20130916072909-4c1s5y4ah3riusik

2 files changed, 32 insertions, 32 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,36 +2275,6 @@
                         </group>
                     </group>
                     <notebook>
-                        <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
-                            <field name="line_ids" context="{'date':date}">
-                                <tree editable="bottom" string="Statement lines">
-                                    <field name="sequence" invisible="1"/>
-                                    <field name="date"/>
-                                    <field name="name"/>
-                                    <field name="ref"/>
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                                    <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]" name="account_id"/>
-                                    <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
-                                    <field name="amount"/>
-                                </tree>
-                                <form string="Statement lines" version="7.0">
-                                    <group col="4">
-                                        <field name="date"/>
-                                        <field name="name"/>
-                                        <field name="ref"/>
-                                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                                        <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                        <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]" name="account_id"/>
-                                        <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
-                                        <field name="amount"/>
-                                        <field name="sequence"/>
-                                    </group>
-                                    <separator string="Notes"/>
-                                    <field name="note"/>
-                                </form>
-                            </field>
-                        </page>
                         <page string="Cash Control">
                             <group col="2" expand="1">
                                 <group string="Opening Cash Control" attrs="{'invisible' : [('state', '!=', 'draft')]}">
@@ -2314,7 +2284,7 @@
                                             <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>    
+                                    </field>
                                 </group>
                                 <group>
                                     <group string="Opening Cash Control" attrs="{'invisible' : [('state', '=', 'draft')]}">
@@ -2338,6 +2308,36 @@
                                 </group>
                             </group>
                         </page>
+                        <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
+                            <field name="line_ids" context="{'date':date}">
+                                <tree editable="bottom" string="Statement lines">
+                                    <field name="sequence" invisible="1"/>
+                                    <field name="date"/>
+                                    <field name="name"/>
+                                    <field name="ref"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                                    <field name="type" on_change="onchange_type(partner_id, type)"/>
+                                    <field domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]" name="account_id"/>
+                                    <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
+                                    <field name="amount"/>
+                                </tree>
+                                <form string="Statement lines" version="7.0">
+                                    <group col="4">
+                                        <field name="date"/>
+                                        <field name="name"/>
+                                        <field name="ref"/>
+                                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                                        <field name="type" on_change="onchange_type(partner_id, type)"/>
+                                        <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]" name="account_id"/>
+                                        <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
+                                        <field name="amount"/>
+                                        <field name="sequence"/>
+                                    </group>
+                                    <separator string="Notes"/>
+                                    <field name="note"/>
+                                </form>
+                            </field>
+                        </page>
                         <page string="Journal Entries" attrs="{'invisible': [('state','!=','confirm')]}">
                             <field name="move_line_ids" string="Journal Entries"/>
                         </page>