From 81e8742041a4af27f3b0f7c0cf3e0c35e553d801 Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Tue, 24 May 2011 17:13:50 +0530
Subject: [PATCH 1/3] [Merge] After posting also Compute button works fine

bzr revid: bde@tiny2-desktop-20110524114350-n9hnhlo2sppezmyj
---
 addons/account_asset/account_asset.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 4220fe0df1e..a6a55686c50 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -92,7 +92,6 @@ class account_asset_asset(osv.osv):
             old_depreciation_line_ids = depreciation_lin_obj.search(cr, uid, [('asset_id', '=', asset.id), ('move_id', '=', False)])
             if old_depreciation_line_ids:
                 depreciation_lin_obj.unlink(cr, uid, old_depreciation_line_ids, context=context)
-
             undone_dotation_number = asset.method_delay - len(asset.account_move_line_ids)
             residual_amount = asset.value_residual
             depreciation_date = datetime.strptime(self._get_last_depreciation_date(cr, uid, [asset.id], context)[asset.id], '%Y-%m-%d')
@@ -104,7 +103,7 @@ class account_asset_asset(osv.osv):
                     amount = residual_amount
                 else:
                     if asset.method == 'linear':
-                        amount = asset.purchase_value / undone_dotation_number
+                        amount = asset.value_residual / undone_dotation_number
                     else:
                         amount = residual_amount * asset.method_progress_factor
                 residual_amount -= amount
@@ -357,6 +356,7 @@ class account_asset_depreciation_line(osv.osv):
                 '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,
+                'asset_id': line.asset_id.id
             })
             self.write(cr, uid, line.id, {'move_id': move_id}, context=context)
         return True

From e8c36f693aeb152d5d89a9cbcff04e3f21ef99a4 Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Tue, 24 May 2011 17:36:50 +0530
Subject: [PATCH 2/3] [REM] 'asset_id': line.asset_id.id

bzr revid: bde@tiny2-desktop-20110524120650-auvsxkxn6g67caw7
---
 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 a6a55686c50..f1c4ee9d7f4 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -356,7 +356,6 @@ class account_asset_depreciation_line(osv.osv):
                 '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,
-                'asset_id': line.asset_id.id
             })
             self.write(cr, uid, line.id, {'move_id': move_id}, context=context)
         return True

From 8ca21fbc2afbb1854c2d5a252e73f89176b90686 Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Tue, 24 May 2011 18:34:45 +0530
Subject: [PATCH 3/3] [IMP] depreciation_lin_obj.create(cr, uid, vals,
 context=context)

bzr revid: bde@tiny2-desktop-20110524130445-b8m3qo2xk09v8qv1
---
 addons/account_asset/account_asset.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index f1c4ee9d7f4..296a9c82158 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -110,13 +110,13 @@ class account_asset_asset(osv.osv):
                 vals = {
                      'amount': amount,
                      'asset_id': asset.id,
-                     'sequence':i,
+                     'sequence': i,
                      'name': str(asset.id) +'/'+ str(i),
                      'remaining_value': residual_amount,
                      'depreciated_value': asset.purchase_value - residual_amount,
                      'depreciation_date': depreciation_date.strftime('%Y-%m-%d'),
                 }
-                self.pool.get('account.asset.depreciation.line').create(cr, uid, vals)
+                depreciation_lin_obj.create(cr, uid, vals, context=context)
                 month += asset.method_period
                 depreciation_date = datetime(year + (month / 12), month % 12, day)
         return True