From bd96a7e8d6dd1b60dab5f80e5c29faa5e366f129 Mon Sep 17 00:00:00 2001
From: gde-odoo <gde-odoo@users.noreply.github.com>
Date: Tue, 22 Jul 2014 10:57:21 +0200
Subject: [PATCH 1/3] Update stock.rst

Fix typo in table
---
 addons/stock/doc/stock.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/doc/stock.rst b/addons/stock/doc/stock.rst
index 42b9c79b8a5..7bb09b6b2b0 100644
--- a/addons/stock/doc/stock.rst
+++ b/addons/stock/doc/stock.rst
@@ -238,7 +238,7 @@ To see a calculation of the lead times, take the example of the cabinet above. S
 Bill of Materials for 1 SHE100 Unit
 
 
-+-------------+----------+------------
++-------------+----------+-----------+
 | Product Code| Quantity | UoM       |
 +====================================+
 |SIDEPAN      |        2 | PCE       |
@@ -253,11 +253,11 @@ Bill of Materials for 1 SHE100 Unit
 Bill of Materials for 2 SIDEPAN Units
 
 
-+-------------+----------+------------
++-------------+----------+-----------+
 | Product Code| Quantity | UoM       |
 +====================================+
 | WOOD002     |      0.17| M         |
-+-------------+----------+------------
++-------------+----------+-----------+
 
 The SIDEPAN is made from an order using the workflow shown. The WOOD002 is purchased on order and the other products are all found in stock. An order for the product SHE100 will then generate two production orders (SHE100 and SIDEPAN) then produce two purchase orders for the product WOOD002. Product WOOD002 is used in the production of both SHE100 and SIDEPAN. Set the lead times on the product forms to the following:
 

From 87ad6d54738f7afefe2afc2e4c96e70a67c06742 Mon Sep 17 00:00:00 2001
From: avo-odoo <avo@openerp.com>
Date: Mon, 14 Jul 2014 17:54:22 +0530
Subject: [PATCH 2/3] [IMP] point_of_sale: add product variants in reporting

Closes #1322
---
 addons/point_of_sale/report/pos_order_report.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/point_of_sale/report/pos_order_report.py b/addons/point_of_sale/report/pos_order_report.py
index efc46dfe9ce..8e42ecaa908 100644
--- a/addons/point_of_sale/report/pos_order_report.py
+++ b/addons/point_of_sale/report/pos_order_report.py
@@ -67,7 +67,8 @@ class pos_order_report(osv.osv):
                     l.product_id as product_id
                 from pos_order_line as l
                     left join pos_order s on (s.id=l.order_id)
-                    left join product_template pt on (pt.id=l.product_id)
+                    left join product_product p on (l.product_id=p.id)
+                    left join product_template pt on (p.product_tmpl_id=pt.id)
                     left join product_uom u on (u.id=pt.uom_id)
                 group by
                     s.date_order, s.partner_id,s.state,

From f7073c0644ea7a02bdf35818c571c3f6567b360d Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Wed, 23 Jul 2014 15:15:31 +0200
Subject: [PATCH 3/3] [FIX] tour.js: wait must be used for the current step
 instead of the previous step. Remove setimeout delay for activate the
 element.

---
 addons/web/static/src/js/tour.js | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/addons/web/static/src/js/tour.js b/addons/web/static/src/js/tour.js
index bebb59d7210..fec189e06f5 100644
--- a/addons/web/static/src/js/tour.js
+++ b/addons/web/static/src/js/tour.js
@@ -430,7 +430,7 @@ var Tour = {
                 return Tour.error(next, "Can't reach the next step");
             }
         }
-        checkNext();
+        setTimeout(checkNext, 0);
     },
     nextStep: function (step) {
         var state = Tour.getState();
@@ -458,21 +458,17 @@ var Tour = {
             step.onload();
         }
 
-        if (next) {
+        if (state.mode === "test") {
             setTimeout(function () {
-                if (Tour.getState()) {
+                Tour.autoNextStep(state.tour, step);
+                if (next && Tour.getState()) {
                     Tour.waitNextStep();
                 }
-                if (state.mode === "test") {
-                    setTimeout(function(){
-                        Tour.autoNextStep(state.tour, step);
-                    }, Tour.defaultDelay);
-                }
-            }, next.wait || 0);
-        } else {
-            setTimeout(function(){
-                Tour.autoNextStep(state.tour, step);
-            }, Tour.defaultDelay);
+            }, step.wait || Tour.defaultDelay);
+        } else if (next) {
+            setTimeout(Tour.waitNextStep, next.wait || 0);
+        }
+        if (!next) {
             Tour.endTour();
         }
     },
@@ -544,7 +540,7 @@ var Tour = {
             
             }
         }
-        Tour.testtimer = setTimeout(autoStep, 100);
+        Tour.testtimer = setTimeout(autoStep, 0);
     },
     autoDragAndDropSnippet: function (selector) {
         var $thumbnail = $(selector).first();