From 2572e7d06258324b4821c9e2c8ce190dfa6e48e8 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 7 Jul 2010 14:29:17 +0530
Subject: [PATCH] account view and deprecated fields fixes

bzr revid: al@openerp.com-20100707085917-jouhgqj16j60alhh
---
 addons/account/account.py       |  5 +-
 addons/account/account_view.xml | 90 ++++++++++++++++-----------------
 2 files changed, 46 insertions(+), 49 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index a461cbe5bb7..4629a306a0b 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -136,7 +136,6 @@ class account_account_type(osv.osv):
         'name': fields.char('Acc. Type Name', size=64, required=True, translate=True),
         'code': fields.char('Code', size=32, required=True),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of account types."),
-        'partner_account': fields.boolean('Partner account'),
         'close_method': fields.selection([('none', 'None'), ('balance', 'Balance'), ('detail', 'Detail'), ('unreconciled', 'Unreconciled')], 'Deferral Method', required=True),
         'sign': fields.selection([(-1, 'Negative'), (1, 'Positive')], 'Sign on Reports', required=True, help='Allows you to change the sign of the balance amount displayed in the reports, so that you can see positive figures instead of negative ones in expenses accounts.'),
         'report_type':fields.selection([
@@ -366,11 +365,11 @@ class account_account(osv.osv):
         'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
         'code': fields.char('Code', size=64, required=True),
         'type': fields.selection([
+            ('view', 'View'),
+            ('other', 'Regular'),
             ('receivable', 'Receivable'),
             ('payable', 'Payable'),
-            ('view', 'View'),
             ('consolidation', 'Consolidation'),
-            ('other', 'Others'),
             ('closed', 'Closed'),
         ], 'Internal Type', required=True, help="This type is used to differentiate types with "\
             "special effects in Open ERP: view can not have entries, consolidation are accounts that "\
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1af3f1bef1e..c52302cb823 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -3,8 +3,8 @@
     <data>
 
         <!--
-     Fiscal Year
-    -->
+            Fiscal Year
+        -->
 
         <record id="view_account_fiscalyear_form" model="ir.ui.view">
             <field name="name">account.fiscalyear.form</field>
@@ -12,7 +12,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Fiscalyear">
-                	<group>
+                    <group>
                     <field name="name"/>
                     <field name="code"/>
                     <field name="date_start"/>
@@ -32,7 +32,7 @@
                     </field>
                     <separator colspan="4" string="States"/>
                     <group>
-                    	<field name="state" select="1" readonly="1"/>
+                        <field name="state" select="1" readonly="1"/>
                         <button name="create_period" states="draft" string="Create Monthly Periods" type="object" icon="gtk-dnd"/>
                         <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" icon="gtk-dnd"/>
                     </group>
@@ -57,17 +57,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Fiscalyear">
-                	<group>
-                		<filter string="Done" domain="[('state','=','done')]" icon="terp-dolar_ok!"/>
-                		<filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
-                		<separator orientation="vertical"/>
-	                    <field name="code"/>
-	                    <field name="name"/>
-	                    <field name="state"/>
+                    <group>
+                        <filter string="Done" domain="[('state','=','done')]" icon="terp-dolar_ok!"/>
+                        <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+                        <separator orientation="vertical"/>
+                        <field name="code"/>
+                        <field name="name"/>
+                        <field name="state"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                    	<filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
+                        <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </search>
             </field>
@@ -133,9 +133,8 @@
 
 
         <!--
-    Accounts
-    -->
-
+            Accounts
+        -->
         <record id="view_account_form" model="ir.ui.view">
             <field name="name">account.account.form</field>
             <field name="model">account.account</field>
@@ -143,21 +142,21 @@
             <field name="arch" type="xml">
                 <form string="Account">
                     <group col="6" colspan="4">
-                    <field name="name" select="1" colspan="4"/>
+                    <field name="name" select="1"/>
                     <field name="code" select="1"/>
-                    <field name="parent_id"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <newline/>
+                    <field name="parent_id"/>
+                    <field name="type" select="1"/>
                     <field name="user_type" select="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <newline/>
                             <field name="currency_id"/>
+                            <field name="active"/>
                             <field name="currency_mode"/>
                             <field name="reconcile"/>
-                            <field name="active"/>
-                            <field name="check_history"/>
-                            <field name="type" select="1"/>
                             <newline/>
                             <separator string="Default Taxes" colspan="4"/>
                             <field colspan="4" name="tax_ids" nolabel="1" domain="[('parent_id','=',False)]"/>
@@ -178,21 +177,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Accounts">
-                	<group col="10" colspan="4">
+                    <group col="10" colspan="4">
                         <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
                         <filter icon="terp-purchase" string="Purchase Accounts" domain="[('type','=','purchase')]"/>
                         <separator orientation="vertical"/>
-	                    <field name="code"/>
-	                    <field name="name"/>
-	                    <field name="user_type"/>
-	                    <field name="type"/>
+                        <field name="code"/>
+                        <field name="name"/>
+                        <field name="user_type"/>
+                        <field name="type"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                    	<filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
-                    	<separator orientation="vertical"/>
-                    	<filter string="User Type" icon="terp-folder-blue" domain="" context="{'group_by':'user_type'}"/>
-                    	<filter string="Internal Type" icon="terp-folder-yellow" domain="" context="{'group_by':'type'}"/>
+                        <filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="User Type" icon="terp-folder-blue" domain="" context="{'group_by':'user_type'}"/>
+                        <filter string="Internal Type" icon="terp-folder-yellow" domain="" context="{'group_by':'type'}"/>
                     </group>
                 </search>
             </field>
@@ -308,11 +307,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <tree string="Search Account Journal">
-                	<group>
-					<filter domain="[('type', '=', 'sale')]" string="Sale Journals" icon="terp-sale"/>
-					<filter domain="[('type', '=', 'purchase')]" string="Purchase Journals" icon="terp-purchase"/>
-					<filter domain="[('centralisation', '=', 'True')]" string="Centralized Journals" icon="terp-stock"/>
-					<separator orientation="vertical"/>
+                    <group>
+                    <filter domain="[('type', '=', 'sale')]" string="Sale Journals" icon="terp-sale"/>
+                    <filter domain="[('type', '=', 'purchase')]" string="Purchase Journals" icon="terp-purchase"/>
+                    <filter domain="[('centralisation', '=', 'True')]" string="Centralized Journals" icon="terp-stock"/>
+                    <separator orientation="vertical"/>
                     <field name="code"/>
                     <field name="name"/>
                     </group>
@@ -443,19 +442,19 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
-                	<group>
-                		<filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
-                		<filter string="Confirm" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
-                		<separator orientation="vertical"/>
-	                    <field name="date"/>
-	                    <field name="name"/>
-	                    <field name="journal_id"/>
+                    <group>
+                        <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+                        <filter string="Confirm" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <field name="name"/>
+                        <field name="journal_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                    	<filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
-                    	<filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
-                    	<filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
+                        <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
+                        <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
+                        <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </search>
             </field>
@@ -596,11 +595,10 @@
             <field name="arch" type="xml">
                 <form string="Account Type">
                     <group col="6" colspan="4">
-                        <field name="name" select="1" colspan="4"/>
+                        <field name="name" select="1"/>
                         <field name="code" select="1"/>
                         <field name="sequence"/>
                         <field name="parent_id"/>
-                        <field name="partner_account"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Reporting Configuration" colspan="4"/>