[IMP] Tristates should be working even if the picking has no name

diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index b6473a7..7108a2d 100644 (file)
--- 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 0bc0f92..ed8c946 100644 (file)
--- 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