diff --git a/account_asset_management/__openerp__.py b/account_asset_management/__openerp__.py
index 28ee6dddd..3fdccd5ff 100644
--- a/account_asset_management/__openerp__.py
+++ b/account_asset_management/__openerp__.py
@@ -4,7 +4,7 @@
 #    OpenERP, Open Source Management Solution
 #
 #    Copyright (C) 2010-2012 OpenERP s.a. (<http://openerp.com>).
-#    Copyright (c) 2014 Noviat nv/sa (www.noviat.com). All rights reserved.
+#    Copyright (c) 2014-2015 Noviat nv/sa (www.noviat.com).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -22,7 +22,7 @@
 ##############################################################################
 {
     'name': 'Assets Management',
-    'version': '2.4',
+    'version': '2.5',
     'depends': ['account'],
     'conflicts': ['account_asset'],
     'author': "OpenERP & Noviat,Odoo Community Association (OCA)",
diff --git a/account_asset_management/account_asset.py b/account_asset_management/account_asset.py
index 63c5c54f6..e29db3017 100644
--- a/account_asset_management/account_asset.py
+++ b/account_asset_management/account_asset.py
@@ -68,7 +68,8 @@ class account_asset_category(orm.Model):
         'name': fields.char('Name', size=64, required=True, select=1),
         'note': fields.text('Note'),
         'account_analytic_id': fields.many2one(
-            'account.analytic.account', 'Analytic account'),
+            'account.analytic.account', 'Analytic account',
+            domain=[('type', '!=', 'view')]),
         'account_asset_id': fields.many2one(
             'account.account', 'Asset Account', required=True,
             domain=[('type', '=', 'other')]),
@@ -1100,6 +1101,9 @@ class account_asset_asset(orm.Model):
             type='many2one',
             relation='res.currency',
             store=True, readonly=True,),
+        'account_analytic_id': fields.many2one(
+            'account.analytic.account', 'Analytic account',
+            domain=[('type', '!=', 'view')]),
     }
 
     _defaults = {
@@ -1172,6 +1176,7 @@ class account_asset_asset(orm.Model):
                 'method_period': category_obj.method_period,
                 'method_progress_factor': category_obj.method_progress_factor,
                 'prorata': category_obj.prorata,
+                'account_analytic_id': category_obj.account_analytic_id.id,
             }
         return res
 
@@ -1575,7 +1580,7 @@ class account_asset_depreciation_line(orm.Model):
         elif type == 'expense':
             debit = amount > 0 and amount or 0.0
             credit = amount < 0 and -amount or 0.0
-            analytic_id = asset.category_id.account_analytic_id.id
+            analytic_id = asset.account_analytic_id.id
         move_line_data = {
             'name': asset.name,
             'ref': depreciation_line.name,
diff --git a/account_asset_management/account_asset_view.xml b/account_asset_management/account_asset_view.xml
index e364df883..e3bd1896d 100644
--- a/account_asset_management/account_asset_view.xml
+++ b/account_asset_management/account_asset_view.xml
@@ -126,8 +126,9 @@
                 </group>
                 <separator string="Other Information" colspan="4"/>
                 <group colspan="4" col="4">
-                  <field name="category_id" on_change="onchange_category_id(category_id)" attrs="{'required':[('type','=','normal')]}" colspan="4"/>
+                  <field name="category_id" on_change="onchange_category_id(category_id)" attrs="{'required':[('type','=','normal')]}"/>
                   <field name="partner_id"/>
+                  <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                 </group>
                 <group colspan="4">
                   <group>