From 8827789ff29dec5d4cdb027696c389b0549f8059 Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Thu, 13 Aug 2015 12:46:22 +0200 Subject: [PATCH] [FIX] stock_account: remove traceback introduced by f2108e9 invoice_vals['name'] may not be defined yet. --- addons/stock_account/stock.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock_account/stock.py b/addons/stock_account/stock.py index e24f00afab2..addc7a97fc5 100644 --- a/addons/stock_account/stock.py +++ b/addons/stock_account/stock.py @@ -240,7 +240,7 @@ class stock_picking(osv.osv): @return: object of the partner to invoice """ return picking.partner_id and picking.partner_id.id - + def action_invoice_create(self, cr, uid, ids, journal_id, group=False, type='out_invoice', context=None): """ Creates invoice based on the invoice state selected for picking. @param journal_id: Id of journal @@ -315,7 +315,7 @@ class stock_picking(osv.osv): if not invoice.origin or invoice_vals['origin'] not in invoice.origin.split(', '): invoice_origin = filter(None, [invoice.origin, invoice_vals['origin']]) merge_vals['origin'] = ', '.join(invoice_origin) - if not invoice.name or invoice_vals['name'] not in invoice.name.split(', '): + if invoice_vals.get('name', False) and (not invoice.name or invoice_vals['name'] not in invoice.name.split(', ')): invoice_name = filter(None, [invoice.name, invoice_vals['name']]) merge_vals['name'] = ', '.join(invoice_name) if merge_vals: