[MERGE] Merge with lp:openerp-web

bzr revid: hip@tinyerp.com-20121109131719-9a8neqj633brvjru
This commit is contained in:
Hiral Patel (OpenERP)
2012-11-09 18:47:19 +05:30
+1 -1
View File
@@ -2217,7 +2217,7 @@ instance.web.list.Many2OneButton = instance.web.list.Column.extend({
});
instance.web.list.Many2Many = instance.web.list.Column.extend({
_format: function (row_data, options) {
if (row_data[this.id].value) {
if (!_.isEmpty(row_data[this.id].value)) {
// If value, use __display version for printing
row_data[this.id] = row_data[this.id + '__display'];
}