[MERGE] asset hierarchy

bzr revid: qdp-launchpad@openerp.com-20110701093106-bnqtndvssi0eu5d4

addons/account_asset/account_asset.py

@@ -228,6 +228,9 @@ class account_asset_asset(osv.osv):
         'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
         'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'account.asset.asset',context=context),
     }
+    
+    def _check_recursion(self, cr, uid, ids, context=None, parent=None):
+        return super(account_asset_asset, self)._check_recursion(cr, uid, ids, context=context, parent=parent)
 
     def _check_prorata(self, cr, uid, ids, context=None):
         for asset in self.browse(cr, uid, ids, context=context):
@@ -236,6 +239,7 @@ class account_asset_asset(osv.osv):
         return True
 
     _constraints = [
+        (_check_recursion, 'Error ! You can not create recursive assets.', ['parent_id']),
         (_check_prorata, '\nProrata temporis can be applied only for computation method linear and time method delay.', ['prorata']),
     ]
 

addons/account_asset/account_asset_view.xml

@@ -89,6 +89,7 @@
               <notebook colspan="4">
                  <page string="Depreciation">
                     <separator string="Other Information" colspan="4"/>
+                    <field name="parent_id"/>
                     <field name="partner_id"/>
                     <field name="purchase_date"/>
                     <group colspan="2" col="2">
@@ -205,13 +206,33 @@
             </tree>
         </field>
     </record>
+    
+    <record model="ir.ui.view" id="view_account_asset_asset_hierarchy_tree">
+        <field name="name">account.asset.asset.hierarchy</field>
+        <field name="model">account.asset.asset</field>
+        <field name="type">tree</field>
+        <field name="field_parent">child_ids</field>
+        <field name="arch" type="xml">
+            <tree string="Assets">
+                <field name="name"/>
+                <field name="code"/>
+                <field name="category_id"/>
+                <field name="purchase_date"/>
+                <field name="purchase_value"/>
+                <field name="value_residual"/>
+                <field name="currency_id"/>
+                <field name="company_id" groups="base.group_multi_company"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
 
     <record model="ir.actions.act_window" id="action_account_asset_asset_tree">
         <field name="name">Asset Hierarchy</field>
         <field name="res_model">account.asset.asset</field>
         <field name="view_type">tree</field>
         <field name="domain">[('parent_id','=',False)]</field>
-        <field name="view_id" ref="view_account_asset_asset_tree"/>
+        <field name="view_id" ref="view_account_asset_asset_hierarchy_tree"/>
     </record>
 
     <menuitem id="menu_finance_assets" name="Assets" parent="account.menu_finance"/>