Merge branch 'master' into master-pos-small-imps-of-july-fva

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,

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:
 

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();