From 84ac2559cd0381977af28c46cc580bf04f920d0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 8 Apr 2016 09:52:09 +0200
Subject: [PATCH] Revert "[IMP] layout of picking report, alignment details
 [FIX] group by bug, visible in opportunity pipeline"

This reverts commit a206114d4c59dd125f87a7eca40eb8bebf044942.

This commit breaks several of our long standing and widely appreciated policy

 - one commit for one feature; do not forget to put the correct impacted addon
 - commit message should explain why the change is performed
 - a bug fix in master seems weird, why not in stable. If not applicable to
   stable the commit message should explain why
 - a bug fix in the ORM should come with a test case
 - code is not clean
---
 addons/stock/views/report_stockpicking_operations.xml | 4 ++--
 openerp/models.py                                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/views/report_stockpicking_operations.xml b/addons/stock/views/report_stockpicking_operations.xml
index a49f46c748c..33dfc4e06c8 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 mt8" name="right_box">
+                <div class="col-xs-4 pull-right" 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])" class="text-center">
+                                    <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])">
                                         <strong>Barcode</strong>
                                     </th>
                                     <th t-if="has_serial_number">
diff --git a/openerp/models.py b/openerp/models.py
index 2ce21699c30..a94446e2364 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 len(group.get(df, []) or []):
+                if df in group:
                     group[df] = group[df][1]
         return result