odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

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

This commit is contained in:
Josse Colpaert 2014-06-23 15:23:20 +02:00
parent 6416fee88d
commit 5ecde0fa26
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/calendar/calendar.py
View File

@ -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):

6
addons/stock/stock.py
View File

@ -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