diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 2cf3e325315..15c201185c1 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1472,6 +1472,9 @@ class account_move_line(osv.osv):
                 #create the Tax movement
                 if not tax['amount'] and not tax[tax_code]:
                     continue
+                #FORWARD-PORT UPTO SAAS-6
+                tax_analytic = (tax_code == 'tax_code_id' and tax.get('account_analytic_collected_id')) or (tax_code == 'ref_tax_code_id' and tax.get('account_analytic_paid_id'))
+
                 data = {
                     'move_id': vals['move_id'],
                     'name': tools.ustr(vals['name'] or '') + ' ' + tools.ustr(tax['name'] or ''),
@@ -1485,6 +1488,7 @@ class account_move_line(osv.osv):
                     'account_id': tax[account_id] or vals['account_id'],
                     'credit': tax['amount']<0 and -tax['amount'] or 0.0,
                     'debit': tax['amount']>0 and tax['amount'] or 0.0,
+                    'analytic_account_id': tax_analytic,
                 }
                 self.create(cr, uid, data, context)
             del vals['account_tax_id']
diff --git a/addons/account_test/report/account_test_report.py b/addons/account_test/report/account_test_report.py
index bbf72ec2510..f6bf327fbc1 100644
--- a/addons/account_test/report/account_test_report.py
+++ b/addons/account_test/report/account_test_report.py
@@ -68,6 +68,7 @@ class report_assert_account(report_sxw.rml_parse):
             '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']
diff --git a/addons/point_of_sale/views/report_receipt.xml b/addons/point_of_sale/views/report_receipt.xml
index f9fe617d0f4..986e5aeadf9 100644
--- a/addons/point_of_sale/views/report_receipt.xml
+++ b/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>
diff --git a/addons/stock/procurement.py b/addons/stock/procurement.py
index 13dc2c6651e..cf8ec015bc0 100644
--- a/addons/stock/procurement.py
+++ b/addons/stock/procurement.py
@@ -474,7 +474,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: