From a798f06d1a860dd57ac75400cb9a4a6e976eb1ac Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Fri, 27 May 2011 18:32:11 +0530 Subject: [PATCH 1/2] [IMP] account_asset: Allow only supplier invoice to make asset. bzr revid: uco@tinyerp.com-20110527130211-q78ssuf0290lr0jy --- addons/account_asset/account_asset_invoice.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py index f130bdc09cf..bbabe252f68 100755 --- a/addons/account_asset/account_asset_invoice.py +++ b/addons/account_asset/account_asset_invoice.py @@ -38,15 +38,16 @@ class account_invoice_line(osv.osv): def move_line_get_item(self, cr, uid, line, context={}): asset_obj = self.pool.get('account.asset.asset') res = super(account_invoice_line, self).move_line_get_item(cr, uid, line, context) - if line.asset_category_id: - vals = { - 'name': line.product_id and (line.name + ": " + line.product_id.name) or line.name, - 'category_id': line.asset_category_id.id, - 'purchase_value': line.price_subtotal - } - asset_id = asset_obj.create(cr, uid, vals, context=context) - if line.asset_category_id.open_asset: - asset_obj.validate(cr, uid, [asset_id], context=context) + if line.invoice_id and line.invoice_id.type not in ['out_invoice', 'out_refund']: + if line.asset_category_id: + vals = { + 'name': line.product_id and (line.name + ": " + line.product_id.name) or line.name, + 'category_id': line.asset_category_id.id, + 'purchase_value': line.price_subtotal + } + asset_id = asset_obj.create(cr, uid, vals, context=context) + if line.asset_category_id.open_asset: + asset_obj.validate(cr, uid, [asset_id], context=context) return res account_invoice_line() From 4d0f29fa257b773229732de00e40a069a259d167 Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Fri, 27 May 2011 19:08:54 +0530 Subject: [PATCH 2/2] [IMP] account_asset: Improved condition and added necessary changes. bzr revid: uco@tinyerp.com-20110527133854-jy21rj1sezo79lev --- addons/account_asset/account_asset_invoice.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py index bbabe252f68..8fbcd4053a2 100755 --- a/addons/account_asset/account_asset_invoice.py +++ b/addons/account_asset/account_asset_invoice.py @@ -38,12 +38,15 @@ class account_invoice_line(osv.osv): def move_line_get_item(self, cr, uid, line, context={}): asset_obj = self.pool.get('account.asset.asset') res = super(account_invoice_line, self).move_line_get_item(cr, uid, line, context) - if line.invoice_id and line.invoice_id.type not in ['out_invoice', 'out_refund']: - if line.asset_category_id: + if line.invoice_id and line.invoice_id.type not in ('out_invoice', 'out_refund') and line.asset_category_id: vals = { 'name': line.product_id and (line.name + ": " + line.product_id.name) or line.name, 'category_id': line.asset_category_id.id, - 'purchase_value': line.price_subtotal + 'purchase_value': line.price_subtotal, + 'period_id': line.invoice_id.period_id.id, + 'partner_id': line.invoice_id.partner_id.id, + 'company_id': line.invoice_id.company_id.id, + 'currency_id': line.invoice_id.currency_id.id, } asset_id = asset_obj.create(cr, uid, vals, context=context) if line.asset_category_id.open_asset: