[MERGE] forward port branch saas-6 up to e25629510c

addons/account_test/report/account_test_report.py

@@ -38,6 +38,7 @@ class ReportAssertAccount(models.AbstractModel):
             'reconciled_inv': reconciled_inv,  # specific function used in different tests
             'result': None,  # used to store the result of the test
             'column_order': None,  # used to choose the display order of columns (in case you are returning a list of dict)
+            '_': _, #used for translation
         }
         eval(code_exec, localdict, mode="exec", nocopy=True)
         result = localdict['result']

addons/point_of_sale/views/report_receipt.xml

@@ -47,7 +47,7 @@
                 </table>
 
                 <div class="row">
-                    <div class="col-xs-6 pull-right">
+                    <div class="col-xs-12 pull-right">
                         <table class="table table-condensed">
                             <tr class="border-black">
                                 <td><strong>Taxes</strong></td>

addons/stock/procurement.py

@@ -460,7 +460,7 @@ class procurement_order(osv.osv):
         product_obj = self.pool.get('product.product')
 
         dom = company_id and [('company_id', '=', company_id)] or []
-        orderpoint_ids = orderpoint_obj.search(cr, uid, dom, order="location_id")
+        orderpoint_ids = orderpoint_obj.search(cr, uid, dom, order="location_id", context=context)
         prev_ids = []
         tot_procs = []
         while orderpoint_ids: