From 830a4af3e59d39184a1ddc4497dac4948d5ab070 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Fri, 2 May 2014 16:58:52 +0200
Subject: [PATCH 1/2] [IMP] Picking type instead of warehouse in PoS

bzr revid: jco@openerp.com-20140502145852-th5tc9tsdwm9l9z8
---
 addons/point_of_sale/views/report_receipt.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/views/report_receipt.xml b/addons/point_of_sale/views/report_receipt.xml
index 70b2d8a3dc4..cec54bfb8bb 100644
--- a/addons/point_of_sale/views/report_receipt.xml
+++ b/addons/point_of_sale/views/report_receipt.xml
@@ -11,7 +11,7 @@
                         <div t-field="o.partner_id"
                             t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": true}'/>
                         User: <span t-field="o.user_id"/><br/>
-                        Warehouse: <span t-field="o.warehouse_id"/><br/>
+                        <span t-if="o.picking_type_id">Warehouse: <span t-field="o.picking_type_id"/><br/></span>
                         Date: <span t-field="o.date_order"/><br/>
                     </div>
                 </div>

From d763f4387899a592ff4e6812a70bff29e1d3db1f Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Mon, 5 May 2014 09:39:31 +0200
Subject: [PATCH 2/2] [IMP] Correct js assets for barcode scanner

bzr revid: jco@openerp.com-20140505073931-mwikrhmngq1ju402
---
 addons/stock/__openerp__.py      | 1 +
 addons/stock/controllers/main.py | 2 +-
 addons/stock/views/stock.xml     | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 2c0f4267d05..0e2ef92fda9 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -103,6 +103,7 @@ Dashboard / Reports for Warehouse Management will include:
     'installable': True,
     'application': True,
     'auto_install': False,
+    'qweb': ['static/src/xml/picking.xml'],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/controllers/main.py b/addons/stock/controllers/main.py
index b877dd11614..21ee554d27a 100644
--- a/addons/stock/controllers/main.py
+++ b/addons/stock/controllers/main.py
@@ -30,7 +30,7 @@ html_template = """<!DOCTYPE html>
         <link rel="stylesheet" href="/web/static/lib/bootstrap/css/bootstrap.css" /> 
         <link rel="stylesheet" href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css" />
         <link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css" />
-        %(js)s
+        <script type="text/javascript" src="/web/js/web.assets_backend"></script>
         <script type="text/javascript">
             $(function() {
                 var s = new openerp.init(%(modules)s);
diff --git a/addons/stock/views/stock.xml b/addons/stock/views/stock.xml
index 2d935a12475..a38fe9bb9fe 100644
--- a/addons/stock/views/stock.xml
+++ b/addons/stock/views/stock.xml
@@ -6,6 +6,7 @@
         <template id="assets_backend" name="stock assets" inherit_id="web.assets_backend">
             <xpath expr="." position="inside">
                 <link rel="stylesheet" href="/stock/static/src/css/stock.css"/>
+                <script type="text/javascript" src="/stock/static/src/js/widgets.js"></script>
             </xpath>
         </template>
     </data>