From ca431c8f6847b086b36d62c536e844830b77f091 Mon Sep 17 00:00:00 2001 From: "pso (OpenERP)" Date: Thu, 12 May 2011 16:53:50 +0530 Subject: [PATCH] [IMP] account_asset: Improved create_move method bzr revid: pso@tinyerp.com-20110512112350-1mqjopaoewcuc1m0 --- addons/account_asset/account_asset.py | 9 ++++++--- addons/account_asset/account_asset_view.xml | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index f5759ce4dfe..652816de57e 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -33,7 +33,7 @@ class account_asset_category(osv.osv): 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'), #FIXME:add in the form view with group = analytic 'account_asset_id': fields.many2one('account.account', 'Asset Account', required=True), 'account_depreciation_id': fields.many2one('account.account', 'Depreciation Account', required=True), - 'account_expense_depreciation_id': fields.many2one('account.account', 'Depr. Expense Account', required=True),#FIXME: required=True + add in the form view + 'account_expense_depreciation_id': fields.many2one('account.account', 'Depr. Expense Account', required=True), 'journal_id': fields.many2one('account.journal', 'Journal', required=True), 'company_id': fields.many2one('res.company', 'Company'), } @@ -300,14 +300,16 @@ class account_asset_depreciation_line(osv.osv): move_vals = { 'name': line.name, 'date': depreciation_date, + 'ref': line.name, 'period_id': period_ids and period_ids[0] or False, 'journal_id': line.asset_id.category_id.journal_id.id, } move_id = move_obj.create(cr, uid, move_vals, context=context) move_line_obj.create(cr, uid, { 'name': line.name, + 'ref': line.name, 'move_id': move_id, - 'account_id': line.asset_id.category_id.account_expense_depreciation_id.id, + 'account_id': line.asset_id.category_id.account_depreciation_id.id, 'debit': 0.0, 'credit': line.amount, 'period_id': period_ids and period_ids[0] or False, @@ -319,8 +321,9 @@ class account_asset_depreciation_line(osv.osv): }) move_line_obj.create(cr, uid, { 'name': line.name, + 'ref': line.name, 'move_id': move_id, - 'account_id': line.asset_id.category_id.account_depreciation_id.id, + 'account_id': line.asset_id.category_id.account_expense_depreciation_id.id, 'credit': 0.0, 'debit': line.amount, 'period_id': period_ids and period_ids[0] or False, diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index 0112dc89d67..713652d777c 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -89,7 +89,7 @@ -