From fea7004367f33a517a3f6c26a3f4968489d0004a Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Wed, 1 Jun 2011 11:35:02 +0530
Subject: [PATCH 1/2] [FIX] account_asset: Analytic entries should be created
 only for depreciation expense account.

bzr revid: uco@tinyerp.com-20110601060502-0g3btl51eess5atn
---
 addons/account_asset/account_asset.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 8cfb4f2afff..946822cf7af 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -365,7 +365,6 @@ class account_asset_depreciation_line(osv.osv):
                 'partner_id': line.asset_id.partner_id.id,
                 'currency_id': company_currency <> current_currency and  current_currency or False,
                 'amount_currency': company_currency <> current_currency and - sign * line.amount or 0.0,
-                'analytic_account_id': line.asset_id.category_id.account_analytic_id.id,
                 'date': depreciation_date,
             })
             move_line_obj.create(cr, uid, {

From b1928c32d9d369d59a641146aa08fc9decec4378 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Mon, 6 Jun 2011 17:56:18 +0530
Subject: [PATCH 2/2] [REM] account_asset: Removed analytic journal field from
 asset category as it is not used anywhere.

bzr revid: uco@tinyerp.com-20110606122618-wt9xmz5xtsybempd
---
 addons/account_asset/account_asset.py       | 1 -
 addons/account_asset/account_asset_view.xml | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 946822cf7af..56446dd5c2e 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -31,7 +31,6 @@ class account_asset_category(osv.osv):
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=1),
         'note': fields.text('Note'),
-        'journal_analytic_id': fields.many2one('account.analytic.journal', 'Analytic journal'),
         'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
         'account_asset_id': fields.many2one('account.account', 'Asset Account', required=True),
         'account_depreciation_id': fields.many2one('account.account', 'Depreciation Account', required=True),
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index dd9e1682c1c..579c3962bd3 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -28,11 +28,10 @@
                     <field name="prorata"/>
                     <field name="open_asset"/>
                 </group>
-        	<group col="4" colspan="4" groups="analytic.group_analytic_accounting">
+        	<group col="2" colspan="2" groups="analytic.group_analytic_accounting">
         	    <separator string="Analytic information" colspan="4" />
         	    <newline/>
         	    <field name="account_analytic_id" />
-        	    <field name="journal_analytic_id" />
         	</group>
                 <separator string="Notes" colspan="4"/>
                 <field name="note" colspan="4" nolabel="1"/>