From 9dee415befbb6739b9d1cb60bc5f3e5614acc966 Mon Sep 17 00:00:00 2001 From: "olt@tinyerp.com" <> Date: Mon, 21 Sep 2009 10:59:34 +0200 Subject: [PATCH] [FIX] fixed an "unsupported operand type(s) for +: 'bool' and 'str'" error. bzr revid: olt@tinyerp.com-20090921085934-zgzbsgopwdbcbjhx --- addons/purchase/wizard/wizard_group.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/purchase/wizard/wizard_group.py b/addons/purchase/wizard/wizard_group.py index 65c09f33593..6add3ad99f8 100644 --- a/addons/purchase/wizard/wizard_group.py +++ b/addons/purchase/wizard/wizard_group.py @@ -40,7 +40,7 @@ merge_form = """ - lines will only be merged if: * they are exactly the same except for the quantity and unit -""" +""" merge_fields = { } @@ -98,9 +98,9 @@ def _merge_orders(self, cr, uid, data, context): else: #order_infos['name'] += ', %s' % porder.name if porder.notes: - order_infos['notes'] += ('\n%s' % (porder.notes,)) + order_infos['notes'] = (order_infos['notes'] or '') + ('\n%s' % (porder.notes,)) if porder.origin: - order_infos['origin'] = order_infos['origin'] + ' ' + porder.origin + order_infos['origin'] = (order_infos['origin'] or '') + ' ' + porder.origin for order_line in porder.order_line: line_key = make_key(order_line, ('name', 'date_planned', 'taxes_id', 'price_unit', 'notes', 'product_id', 'move_dest_id', 'account_analytic_id')) @@ -156,7 +156,7 @@ class merge_orders(wizard.interface): states = { 'init': { 'actions': [], - 'result': {'type': 'form', 'arch' : merge_form, 'fields' : merge_fields, 'state' : [('end', 'Cancel'), ('merge', 'Merge orders') ]} + 'result': {'type': 'form', 'arch': merge_form, 'fields' : merge_fields, 'state' : [('end', 'Cancel'), ('merge', 'Merge orders') ]} }, 'merge': { 'actions': [],