From d812175390423f2b265ddd8957b887ed6df99ce8 Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Thu, 14 Apr 2016 16:16:56 +0200 Subject: [PATCH] [FIX] account_asset: asset_create When creating assets from invoice lines, the system must check that assets have not already been created for the related invoice. If assets already exist then these assets have to be removed. Used case: - In the purchase journal, tick "allow canceling entries" - On a supplier invoice line, set an asset category - validate the invoice - cancel the invoice - set to draft - validate the invoice Before the fix: the asset is created twice. After the fix: the asset is created once. opw:674674 --- addons/account_asset/account_asset_invoice.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py index 9212bc2f73c..aba583aea16 100644 --- a/addons/account_asset/account_asset_invoice.py +++ b/addons/account_asset/account_asset_invoice.py @@ -47,11 +47,12 @@ class account_invoice_line(osv.osv): def asset_create(self, cr, uid, lines, context=None): context = context or {} asset_obj = self.pool.get('account.asset.asset') + asset_ids = [] for line in lines: if line.invoice_id.number: - if asset_obj.search(cr, SUPERUSER_ID, [('code', '=', line.invoice_id.number)], context=context): - raise osv.except_osv(_('Warning!'), _('You already have assets with the reference %s.\nPlease delete these assets before creating new ones for this invoice.') % (line.invoice_id.number)) - + #FORWARDPORT UP TO SAAS-6 + asset_ids += asset_obj.search(cr, SUPERUSER_ID, [('code', '=', line.invoice_id.number), ('company_id', '=', line.company_id.id)], context=context) + asset_obj.write(cr, SUPERUSER_ID, asset_ids, {'active': False}) for line in lines: if line.asset_category_id: vals = {