*set the user_type field on account_account and account_account_template as mandatory

*removed deprecated type from account_account_template
*corrected minimal chart of account: moved account_account_type into the demo data + modified it in order to have something that makes more sense

bzr revid: qdp@tinyerp.com-20080910103313-1ed33vgw5z5q25n2

addons/account/account.py

@@ -51,6 +51,7 @@ class account_payment_term(osv.osv):
         'active': lambda *a: 1,
     }
     _order = "name"
+
     def compute(self, cr, uid, id, value, date_ref=False, context={}):
         if not date_ref:
             date_ref = now().strftime('%Y-%m-%d')
@@ -225,7 +226,7 @@ class account_account(osv.osv):
             ('closed','Closed'),
         ], 'Internal Type', required=True,),
 
-        'user_type': fields.many2one('account.account.type', 'Account Type'),
+        'user_type': fields.many2one('account.account.type', 'Account Type', required=True),
         'parent_id': fields.many2one('account.account','Parent', ondelete='cascade'),
         'child_parent_ids':fields.one2many('account.account','parent_id','Children'),
         'child_consol_ids':fields.many2many('account.account', 'account_account_consol_rel', 'child_id', 'parent_id', 'Consolidated Children',domain=[('type', '=', 'consolidation')]),
@@ -1647,15 +1648,10 @@ class account_account_template(osv.osv):
             ('payable','Payable'),
             ('view','View'),
             ('consolidation','Consolidation'),
-            ('income','Income'),
-            ('expense','Expense'),
-            ('tax','Tax'),
-            ('cash','Cash'),
-            ('asset','Asset'),
-            ('equity','Equity'),
+            ('other','Others'),
             ('closed','Closed'),
             ], 'Internal Type', required=True,),
-        'user_type': fields.many2one('account.account.type', 'Account Type'),
+        'user_type': fields.many2one('account.account.type', 'Account Type', required=True),
         'reconcile': fields.boolean('Allow Reconciliation', help="Check this option if the user can make a reconciliation of the entries in this account."),
         'shortcut': fields.char('Shortcut', size=12),
         'note': fields.text('Note'),

addons/account/data/account_minimal.xml

@@ -2,6 +2,44 @@
 <terp>
     <data noupdate="True">
 
+
+        <!--
+        Account Type
+        -->
+        <record id="account_type_root" model="account.account.type">
+            <field name="name">View</field>
+            <field name="code">view</field>
+            <field name="close_method">none</field>
+        </record>
+        <record id="account_type_asset" model="account.account.type">
+            <field name="name">Asset</field>
+            <field name="code">asset</field>
+            <field name="close_method">balance</field>
+        </record>
+        <record id="account_type_liability" model="account.account.type">
+            <field name="name">Liability</field> 
+            <field name="code">liability</field>
+            <field name="close_method">balance</field>
+        </record>
+        <record id="account_type_income" model="account.account.type">
+            <field name="name">Income</field> 
+            <field name="code">income</field>
+            <field name="close_method">none</field>
+        </record>
+        <record id="account_type_expense" model="account.account.type">
+            <field name="name">Expense</field> 
+            <field name="code">expense</field>
+            <field name="close_method">none</field>
+        </record>
+        <record id="account_type_cash_moves" model="account.account.type">
+            <field name="name">Cash</field> 
+            <field name="code">cash</field>
+            <field name="close_method">balance</field>
+        </record>
+
+        <!--
+        Chart of Account
+        -->
         <record id="minimal_0" model="account.account">
             <field name="code">x 0</field>
             <field name="name">Chart For Automated Tests</field>
@@ -13,8 +51,8 @@ only if you selected demo data during your database creation. Modules can
 do black box testing on entries on this chart of account, without modifying
 your own accounts.
             </field>
+            <field name="user_type" ref="account_type_root"/>
         </record>
-
         <record id="a_recv" model="account.account">
             <field name="name">Main Receivable</field>
             <field name="code">x 40000</field>
@@ -23,6 +61,7 @@ your own accounts.
             <field eval="ref('minimal_0')" name="parent_id"/>
             <field name="company_id" ref="base.main_company"/>
             <field eval="True" name="reconcile"/>
+            <field name="user_type" ref="account_type_income"/>
             <field name="note">
 This chart of account is used for automated testing purpose. It is installed
 only if you selected demo data during your database creation. Modules can
@@ -38,6 +77,7 @@ your own chart of account.
             <field eval="ref('minimal_0')" name="parent_id"/>
             <field name="company_id" ref="base.main_company"/>
             <field eval="True" name="reconcile"/>
+            <field name="user_type" ref="account_type_expense"/>
             <field name="note">
 This chart of account is used for automated testing purpose. It is installed
 only if you selected demo data during your database creation. Modules can
@@ -45,7 +85,6 @@ do black box testing on entries on this chart of account, without modifying
 your own chart of account.
 </field>
         </record>
-
         <record id="cash" model="account.account">
             <field name="name">Petty Cash</field>
             <field name="code">x 570000</field>
@@ -53,6 +92,7 @@ your own chart of account.
             <field name="user_type" ref="account.account_type_cash_moves"/>
             <field eval="ref('minimal_0')" name="parent_id"/>
             <field name="company_id" ref="base.main_company"/>
+            <field name="user_type" ref="account_type_cash_moves"/>
             <field name="note">
 This chart of account is used for automated testing purpose. It is installed
 only if you selected demo data during your database creation. Modules can
@@ -60,7 +100,6 @@ do black box testing on entries on this chart of account, without modifying
 your own chart of account.
 </field>
         </record>
-
         <record id="a_expense" model="account.account">
             <field name="name">Products Purchase</field>
             <field name="code">x 600000</field>
@@ -68,6 +107,7 @@ your own chart of account.
             <field name="user_type" ref="account.account_type_expense"/>
             <field eval="ref('minimal_0')" name="parent_id"/>
             <field name="company_id" ref="base.main_company"/>
+            <field name="user_type" ref="account_type_expense"/>
             <field name="note">
 This chart of account is used for automated testing purpose. It is installed
 only if you selected demo data during your database creation. Modules can
@@ -81,6 +121,7 @@ your own chart of account.
             <field name="type">other</field>
             <field name="user_type" ref="account.account_type_income"/>
             <field eval="ref('minimal_0')" name="parent_id"/>
+            <field name="user_type" ref="account_type_income"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="note">
 This chart of account is used for automated testing purpose. It is installed