From b7605a8862ac1f768216762049c6c52806a6187d Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Mon, 27 Jun 2011 12:12:52 +0530
Subject: [PATCH 1/2] [IMP] account_asset: Added parent_id field on asset form
 view and added constraint for the same to check recursion.

bzr revid: uco@tinyerp.com-20110627064252-n7pp50jf41hqr3ml
---
 addons/account_asset/account_asset.py       | 4 ++++
 addons/account_asset/account_asset_view.xml | 1 +
 2 files changed, 5 insertions(+)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index c67a60e0da2..67f3f8951e6 100644
--- a/addons/account_asset/account_asset.py
+++ b/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']),
     ]
 
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 229cff87c26..07ef8617dc6 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -65,6 +65,7 @@
                  <field name="name" select="1"/>
                  <field name="category_id" select="1" on_change="onchange_category_id(category_id)"/>
                  <field name="code" select="1"/>
+                 <field name="parent_id"/>
                  <field name="purchase_value" select="1"/>
                  <field name="salvage_value"/>
                  <field name="value_residual"/>

From a7407a955117ec32c4c576b935a1041d89c9d12a Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Mon, 27 Jun 2011 16:29:39 +0530
Subject: [PATCH 2/2] [IMP] account_asset: Changed position of parent_id field.
 [ADD] : Added tree view for Asset hierarchy.

bzr revid: uco@tinyerp.com-20110627105939-jun2vn3j2fx3lu81
---
 addons/account_asset/account_asset_view.xml | 24 +++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 07ef8617dc6..c3b6b0d82e4 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -65,10 +65,10 @@
                  <field name="name" select="1"/>
                  <field name="category_id" select="1" on_change="onchange_category_id(category_id)"/>
                  <field name="code" select="1"/>
-                 <field name="parent_id"/>
                  <field name="purchase_value" select="1"/>
                  <field name="salvage_value"/>
                  <field name="value_residual"/>
+                 <field name="parent_id"/>
                  <field name="currency_id" select="1"/>
                  <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
               </group>
@@ -184,13 +184,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"/>