From 5ecde0fa265e7f130adafcaf39400dcfe414d7dc Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Mon, 23 Jun 2014 15:23:20 +0200 Subject: [PATCH] [IMP] Tristates should be working even if the picking has no name --- addons/calendar/calendar.py | 1 - addons/stock/stock.py | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py index b6473a7f1a7..7108a2d1d73 100644 --- a/addons/calendar/calendar.py +++ b/addons/calendar/calendar.py @@ -762,7 +762,6 @@ class calendar_event(osv.Model): res[meeting_id][field] = meeting.start_date if meeting.allday else meeting.start_datetime elif field == 'stop': res[meeting_id][field] = meeting.stop_date if meeting.allday else meeting.stop_datetime - return res def _get_rulestring(self, cr, uid, ids, name, arg, context=None): diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 0bc0f92f1af..ed8c946d78a 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -4094,11 +4094,11 @@ class stock_picking_type(osv.osv): tristates = [] for picking in picking_obj.browse(cr, uid, picking_ids, context=context): if picking.date_done > picking.date: - tristates.insert(0, {'tooltip': picking.name + _(': Late'), 'value': -1}) + tristates.insert(0, {'tooltip': picking.name or '' + _(': Late'), 'value': -1}) elif picking.backorder_id: - tristates.insert(0, {'tooltip': picking.name + _(': Backorder exists'), 'value': 0}) + tristates.insert(0, {'tooltip': picking.name or '' + _(': Backorder exists'), 'value': 0}) else: - tristates.insert(0, {'tooltip': picking.name + _(': OK'), 'value': 1}) + tristates.insert(0, {'tooltip': picking.name or '' + _(': OK'), 'value': 1}) res[picking_type_id] = tristates return res