From 7c7c0d1668b6db359a8b417946d72a4ceac1a708 Mon Sep 17 00:00:00 2001 From: bde Date: Tue, 28 Jun 2011 17:07:54 +0530 Subject: [PATCH 1/3] [IMP] Copied the name of the Asset Name in Analytic Line bzr revid: bde@tiny2-desktop-20110628113754-w6723yrwj7d1hmul --- 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 c67a60e0da2..c09cd5c342c 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -399,7 +399,7 @@ class account_asset_depreciation_line(osv.osv): } move_id = move_obj.create(cr, uid, move_vals, context=context) move_line_obj.create(cr, uid, { - 'name': line.name, + 'name': line.asset_id.name, 'ref': line.name, 'move_id': move_id, 'account_id': line.asset_id.category_id.account_depreciation_id.id, @@ -413,7 +413,7 @@ class account_asset_depreciation_line(osv.osv): 'date': depreciation_date, }) move_line_obj.create(cr, uid, { - 'name': line.name, + 'name': line.asset_id.name, 'ref': line.name, 'move_id': move_id, 'account_id': line.asset_id.category_id.account_expense_depreciation_id.id, From 3c58e5c81870bfe1554d827b514b64dfcdb88f78 Mon Sep 17 00:00:00 2001 From: bde Date: Tue, 28 Jun 2011 18:13:08 +0530 Subject: [PATCH 2/3] [IMP] Optimized the Code bzr revid: bde@tiny2-desktop-20110628124308-b1d0phgot9u6a1p0 --- addons/account_asset/account_asset.py | 30 ++++++++++++++++----------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index c09cd5c342c..6a1c2af75ef 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -398,30 +398,36 @@ class account_asset_depreciation_line(osv.osv): 'journal_id': line.asset_id.category_id.journal_id.id, } move_id = move_obj.create(cr, uid, move_vals, context=context) + asset_name = line.asset_id.name + reference = line.name + mov_id = move_id + amt = amount + journal_id = line.asset_id.category_id.journal_id.id + partner_id = line.asset_id.partner_id.id move_line_obj.create(cr, uid, { - 'name': line.asset_id.name, - 'ref': line.name, - 'move_id': move_id, + 'name': asset_name, + 'ref': reference, + 'move_id': mov_id, 'account_id': line.asset_id.category_id.account_depreciation_id.id, 'debit': 0.0, - 'credit': amount, + 'credit': amt, 'period_id': period_ids and period_ids[0] or False, - 'journal_id': line.asset_id.category_id.journal_id.id, - 'partner_id': line.asset_id.partner_id.id, + 'journal_id': journal_id, + 'partner_id': partner_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, 'date': depreciation_date, }) move_line_obj.create(cr, uid, { - 'name': line.asset_id.name, - 'ref': line.name, - 'move_id': move_id, + 'name': asset_name, + 'ref': reference, + 'move_id': mov_id, 'account_id': line.asset_id.category_id.account_expense_depreciation_id.id, 'credit': 0.0, - 'debit': amount, + 'debit': amt, 'period_id': period_ids and period_ids[0] or False, - 'journal_id': line.asset_id.category_id.journal_id.id, - 'partner_id': line.asset_id.partner_id.id, + 'journal_id': journal_id, + 'partner_id': partner_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, From 52205d1140ac6e2a836d52db5cea0b480eeda3be Mon Sep 17 00:00:00 2001 From: bde Date: Tue, 28 Jun 2011 18:26:52 +0530 Subject: [PATCH 3/3] [IMP] Improved the Code by removing unnecessary variables bzr revid: bde@tiny2-desktop-20110628125652-s19i628aro8f2kue --- addons/account_asset/account_asset.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 6a1c2af75ef..c7227653133 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -400,17 +400,15 @@ class account_asset_depreciation_line(osv.osv): move_id = move_obj.create(cr, uid, move_vals, context=context) asset_name = line.asset_id.name reference = line.name - mov_id = move_id - amt = amount journal_id = line.asset_id.category_id.journal_id.id partner_id = line.asset_id.partner_id.id move_line_obj.create(cr, uid, { 'name': asset_name, 'ref': reference, - 'move_id': mov_id, + 'move_id': move_id, 'account_id': line.asset_id.category_id.account_depreciation_id.id, 'debit': 0.0, - 'credit': amt, + 'credit': amount, 'period_id': period_ids and period_ids[0] or False, 'journal_id': journal_id, 'partner_id': partner_id, @@ -421,10 +419,10 @@ class account_asset_depreciation_line(osv.osv): move_line_obj.create(cr, uid, { 'name': asset_name, 'ref': reference, - 'move_id': mov_id, + 'move_id': move_id, 'account_id': line.asset_id.category_id.account_expense_depreciation_id.id, 'credit': 0.0, - 'debit': amt, + 'debit': amount, 'period_id': period_ids and period_ids[0] or False, 'journal_id': journal_id, 'partner_id': partner_id,