From ec12e529c8bca333162db8ef5b2ef5d596a793e2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Fri, 8 Apr 2016 13:14:08 -0700
Subject: [PATCH] [IMP] Stock: minor report layout issues: delivery order /
 picking list [FIX] ORM: crash in group by (example: pipeline analysis ->
 graph)

---
 addons/product/product_view.xml                       | 2 +-
 addons/stock/views/report_stockpicking_operations.xml | 4 ++--
 openerp/models.py                                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index b1d643e916e..f8e21db754e 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -805,7 +805,7 @@
             <field name="name">product.supplierinfo.search.view</field>
             <field name="model">product.supplierinfo</field>
             <field name="arch" type="xml">
-                <search string="Vendor Information">
+                <search string="Vendor">
                     <field name="name"/>
                     <field name="product_tmpl_id"/>
                 </search>
diff --git a/addons/stock/views/report_stockpicking_operations.xml b/addons/stock/views/report_stockpicking_operations.xml
index 33dfc4e06c8..a49f46c748c 100644
--- a/addons/stock/views/report_stockpicking_operations.xml
+++ b/addons/stock/views/report_stockpicking_operations.xml
@@ -8,7 +8,7 @@
         </template>
         <template id="external_layout_header_barcode_right" inherit_id="report.external_layout_header" primary="True">
             <xpath expr="//div[@name='company_address']" position="after">
-                <div class="col-xs-4 pull-right" name="right_box">
+                <div class="col-xs-4 pull-right mt8" name="right_box">
                     <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', o.name, 600, 100)" style="width:300px;height:50px;"/>
                 </div>
             </xpath>
@@ -86,7 +86,7 @@
                                     <th><strong>Product</strong></th>
                                     <th class="text-right"><strong>Quantity</strong></th>
                                     <t t-if="o.picking_type_id.code != 'incoming'"><th><strong>Source</strong></th></t>
-                                    <th t-if="any([pack_operation.product_id and pack_operation.product_id.barcode or pack_operation.package_id for pack_operation in o.pack_operation_ids])">
+                                    <th t-if="any([pack_operation.product_id and pack_operation.product_id.barcode or pack_operation.package_id for pack_operation in o.pack_operation_ids])" class="text-center">
                                         <strong>Barcode</strong>
                                     </th>
                                     <th t-if="has_serial_number">
diff --git a/openerp/models.py b/openerp/models.py
index a94446e2364..102abcc1968 100644
--- a/openerp/models.py
+++ b/openerp/models.py
@@ -2172,7 +2172,7 @@ class BaseModel(object):
         # (range, label) by just the formatted label, in-place
         for group in result:
             for df in dt:
-                if df in group:
+                if group.get(df, False) and (len(group[df])>1):
                     group[df] = group[df][1]
         return result