From ece1e3d93fda7dcede36566699b45e06738701c5 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Fri, 17 Aug 2018 11:48:55 +0200
Subject: [PATCH] [FIX] *: BS4, restore right-aligned columns

With BS3, if a column was supposed to be aligned on the right, using
the 'pull-right' class on it did the trick.

With BS4, this is not the case anymore as .row elements use flex.
This commit use one of those 3 solutions case per case:

- If the column was alone on its row, then adding the
  'justify-content-end' class on the row.

- If the column was not alone on its row, then adding the 'ml-auto'
  class on the column instead.

- If the column was already filling the row, there was no point in
  aligning it to the right

Note: this commit does not case about potential xpath which would add
new columns in one of those rows. If any, this can be handled as a fix
later.
---
 addons/account/views/account_view.xml                         | 2 +-
 addons/account/views/report_invoice.xml                       | 4 ++--
 addons/account/views/report_journal.xml                       | 4 ++--
 addons/account_asset/views/account_asset_views.xml            | 2 +-
 addons/analytic/views/analytic_account_views.xml              | 2 +-
 addons/hr_expense/report/hr_expense_report.xml                | 4 ++--
 .../views/report_contributionregister_templates.xml           | 4 ++--
 .../l10n_fr_hr_payroll/report/report_l10n_fr_fiche_paye.xml   | 2 +-
 addons/lunch/report/lunch_order_templates.xml                 | 4 ++--
 addons/point_of_sale/views/report_statement.xml               | 4 ++--
 addons/purchase/report/purchase_order_templates.xml           | 4 ++--
 addons/repair/report/repair_templates_repair_order.xml        | 4 ++--
 addons/sale_stock/report/stock_report_deliveryslip.xml        | 4 ++--
 addons/stock/report/report_stockinventory.xml                 | 4 ++--
 addons/stock/report/report_stockpicking_operations.xml        | 4 ++--
 addons/stock/views/stock_move_views.xml                       | 2 +-
 addons/website_slides/views/website_slides_embed.xml          | 2 +-
 odoo/addons/base/views/res_currency_views.xml                 | 2 +-
 18 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml
index f0def971791..66712742be1 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -1074,7 +1074,7 @@
                                     <div class="col-6">
                                         <strong><span><t t-esc="record.name.value"/></span></strong>
                                     </div>
-                                    <div class="col-6 float-right text-right">
+                                    <div class="col-6 text-right">
                                         <span class="badge badge-pill"><t t-esc="record.type_tax_use.value"/></span>
                                     </div>
                                 </div>
diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml
index b5876623cc9..1a9e7b54244 100644
--- a/addons/account/views/report_invoice.xml
+++ b/addons/account/views/report_invoice.xml
@@ -139,8 +139,8 @@
                     </table>
 
                     <div class="clearfix">
-                        <div id="total" class="row">
-                            <div t-attf-class="col-md-4 float-right #{'col-4' if not type_html else ''}">
+                        <div id="total" class="row justify-content-end">
+                            <div t-attf-class="col-md-4 #{'col-4' if not type_html else ''}">
                                 <table class="table table-sm" style="min-width: 250px;max-width: 400px;">
                                     <tr class="border-black" style="border-bottom:1px solid #dddddd;">
                                         <td><strong>Subtotal</strong></td>
diff --git a/addons/account/views/report_journal.xml b/addons/account/views/report_journal.xml
index 740fb4aad79..8e831f550e0 100644
--- a/addons/account/views/report_journal.xml
+++ b/addons/account/views/report_journal.xml
@@ -60,8 +60,8 @@
                         </tbody>
                     </table>
 
-                    <div class="row">
-                        <div class="col-4 float-right">
+                    <div class="row justify-content-end">
+                        <div class="col-4">
                             <table class="table table-sm">
                                 <tr>
                                     <td><strong>Total</strong></td>
diff --git a/addons/account_asset/views/account_asset_views.xml b/addons/account_asset/views/account_asset_views.xml
index cc1de28907e..6acfbe984ab 100644
--- a/addons/account_asset/views/account_asset_views.xml
+++ b/addons/account_asset/views/account_asset_views.xml
@@ -255,7 +255,7 @@
                                 <div class="col-6">
                                     <strong><span><t t-esc="record.name.value"/></span></strong>
                                 </div>
-                                <div class="col-6 float-right text-right">
+                                <div class="col-6 text-right">
                                     <strong><t t-esc="record.date.value"/></strong>
                                 </div>
                             </div>
diff --git a/addons/analytic/views/analytic_account_views.xml b/addons/analytic/views/analytic_account_views.xml
index bfd7e19f800..8b5b51f164f 100644
--- a/addons/analytic/views/analytic_account_views.xml
+++ b/addons/analytic/views/analytic_account_views.xml
@@ -352,7 +352,7 @@
                                     <div class="col-6">
                                         <strong><span><t t-esc="record.name.value"/></span></strong>
                                     </div>
-                                    <div class="col-6 float-right text-right">
+                                    <div class="col-6 text-right">
                                         <strong><t t-esc="record.date.value"/></strong>
                                     </div>
                                 </div>
diff --git a/addons/hr_expense/report/hr_expense_report.xml b/addons/hr_expense/report/hr_expense_report.xml
index 562deba76b1..411eb88a6e1 100644
--- a/addons/hr_expense/report/hr_expense_report.xml
+++ b/addons/hr_expense/report/hr_expense_report.xml
@@ -81,8 +81,8 @@
                             </tbody>
                         </table>
 
-                        <div class="row">
-                            <div class="col-4 float-right">
+                        <div class="row justify-content-end">
+                            <div class="col-4">
                                 <table class="table table-sm">
                                     <tr class="border-black">
                                         <td><strong>Total</strong></td>
diff --git a/addons/hr_payroll/views/report_contributionregister_templates.xml b/addons/hr_payroll/views/report_contributionregister_templates.xml
index b7ec13cfec6..021e6c0f1ca 100644
--- a/addons/hr_payroll/views/report_contributionregister_templates.xml
+++ b/addons/hr_payroll/views/report_contributionregister_templates.xml
@@ -52,8 +52,8 @@
                         </tbody>
                     </table>
 
-                    <div class="row">
-                        <div class="col-4 float-right">
+                    <div class="row justify-content-end">
+                        <div class="col-4">
                             <table class="table table-sm">
                                 <tr class="border-black">
                                     <td><strong>Total</strong></td>
diff --git a/addons/l10n_fr_hr_payroll/report/report_l10n_fr_fiche_paye.xml b/addons/l10n_fr_hr_payroll/report/report_l10n_fr_fiche_paye.xml
index 0202926bb21..fe6a0cff3a6 100644
--- a/addons/l10n_fr_hr_payroll/report/report_l10n_fr_fiche_paye.xml
+++ b/addons/l10n_fr_hr_payroll/report/report_l10n_fr_fiche_paye.xml
@@ -11,7 +11,7 @@
                             <h2>Bulletin de paie</h2>
                             <h4>Paie du <span t-field="o.date_from"/> au <span t-field="o.date_to"/></h4>
                         </div>
-                        <div class="col-4 float-right">
+                        <div class="col-4 ml-auto">
                             <table class="table table-bordered" stype="border: 2px solid black;">
                                 <tr>
                                     <td>
diff --git a/addons/lunch/report/lunch_order_templates.xml b/addons/lunch/report/lunch_order_templates.xml
index 370ffcf2ab2..82290ce2310 100644
--- a/addons/lunch/report/lunch_order_templates.xml
+++ b/addons/lunch/report/lunch_order_templates.xml
@@ -57,8 +57,8 @@
                             </tbody>
                         </table>
 
-                        <div class="row">
-                            <div class="col-4 float-right">
+                        <div class="row justify-content-end">
+                            <div class="col-4">
                                 <table class="table table-sm">
                                     <tr class="border-black">
                                         <td><strong>Total</strong></td>
diff --git a/addons/point_of_sale/views/report_statement.xml b/addons/point_of_sale/views/report_statement.xml
index 63dded422c7..a0aab97babc 100644
--- a/addons/point_of_sale/views/report_statement.xml
+++ b/addons/point_of_sale/views/report_statement.xml
@@ -62,8 +62,8 @@
                         </tbody>
                     </table>           
 
-                    <div class="row">
-                        <div class="col-4 float-right">
+                    <div class="row justify-content-end">
+                        <div class="col-4">
                             <table class="table table-sm">
                                 <tr class="border-black">
                                     <td><strong>Total</strong></td>
diff --git a/addons/purchase/report/purchase_order_templates.xml b/addons/purchase/report/purchase_order_templates.xml
index bb7be36e03b..a475acce4ca 100644
--- a/addons/purchase/report/purchase_order_templates.xml
+++ b/addons/purchase/report/purchase_order_templates.xml
@@ -78,8 +78,8 @@
                 </tbody>
             </table>
 
-            <div class="row">
-                <div class="col-4 float-right">
+            <div class="row justify-content-end">
+                <div class="col-4">
                     <table class="table table-sm">
                         <tr class="border-black">
                             <td><strong>Subtotal</strong></td>
diff --git a/addons/repair/report/repair_templates_repair_order.xml b/addons/repair/report/repair_templates_repair_order.xml
index 2c08a0ddad6..59972c3c33f 100644
--- a/addons/repair/report/repair_templates_repair_order.xml
+++ b/addons/repair/report/repair_templates_repair_order.xml
@@ -118,8 +118,8 @@
                         </tbody>
                     </table>
 
-                    <div class="row">
-                        <div class="col-4 float-right">
+                    <div class="row justify-content-end">
+                        <div class="col-4">
                             <table class="table table-sm">
                                 <t t-if="o.invoice_method !='none'">
                                     <tr class="border-black">
diff --git a/addons/sale_stock/report/stock_report_deliveryslip.xml b/addons/sale_stock/report/stock_report_deliveryslip.xml
index 9fe7da5a003..c127bdad671 100644
--- a/addons/sale_stock/report/stock_report_deliveryslip.xml
+++ b/addons/sale_stock/report/stock_report_deliveryslip.xml
@@ -2,8 +2,8 @@
 <odoo>
     <template id="report_delivery_document_inherit_sale_stock" inherit_id="stock.report_delivery_document">
         <xpath expr="//h2" position="before">
-            <div class="row" t-if="o.sale_id.client_order_ref">
-                <div class="col-4 float-right">
+            <div class="row justify-content-end" t-if="o.sale_id.client_order_ref">
+                <div class="col-4">
                     <strong>Customer Reference:</strong>
                     <p t-field="o.sale_id.client_order_ref"/>
                 </div>
diff --git a/addons/stock/report/report_stockinventory.xml b/addons/stock/report/report_stockinventory.xml
index ff28a190b8b..90abd6b4109 100644
--- a/addons/stock/report/report_stockinventory.xml
+++ b/addons/stock/report/report_stockinventory.xml
@@ -58,8 +58,8 @@
                             </table>
 
                             <t t-if="o.filter == 'product' and o.product_id">
-                              <div class="row">
-                                <div class="col-4 float-right">
+                              <div class="row justify-content-end">
+                                <div class="col-4">
                                      <table class="table table-sm">
                                         <tr class="border-black">
                                             <td><strong>Total Quantity</strong></td>
diff --git a/addons/stock/report/report_stockpicking_operations.xml b/addons/stock/report/report_stockpicking_operations.xml
index 7661c492e71..de02f3868a2 100644
--- a/addons/stock/report/report_stockpicking_operations.xml
+++ b/addons/stock/report/report_stockpicking_operations.xml
@@ -7,8 +7,8 @@
                 <t t-foreach="docs" t-as="o">
                     <t t-call="web.external_layout">
                         <div class="page">
-                            <div class="row mb16">
-                                <div class="col-4 float-right" name="right_box">
+                            <div class="row justify-content-end mb16">
+                                <div class="col-4" name="right_box">
                                     <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', o.name, 600, 100)" style="width:300px;height:50px;" alt="Barcode"/>
                                 </div>
                             </div>
diff --git a/addons/stock/views/stock_move_views.xml b/addons/stock/views/stock_move_views.xml
index f0d4b5813a1..8a69a4aba1b 100644
--- a/addons/stock/views/stock_move_views.xml
+++ b/addons/stock/views/stock_move_views.xml
@@ -501,7 +501,7 @@
                                     <div class="col-6">
                                         <strong><field name="product_id"/></strong>
                                     </div>
-                                    <div class="col-6 float-right text-right">
+                                    <div class="col-6 text-right">
                                         <strong>Qty: </strong><field name="product_uom_qty"/>
                                     </div>
                                 </div>
diff --git a/addons/website_slides/views/website_slides_embed.xml b/addons/website_slides/views/website_slides_embed.xml
index f25bd8a1c94..27e1973d038 100644
--- a/addons/website_slides/views/website_slides_embed.xml
+++ b/addons/website_slides/views/website_slides_embed.xml
@@ -132,7 +132,7 @@
                                     </div>
                                     <div class="col-xl-4 col-lg-4 col-md-4 col-4 text-center"></div>
                                 </div>
-                                <div class="col-xl-2 col-lg-2 col-md-2 col-2 float-right text-right">
+                                <div class="col-xl-2 col-lg-2 col-md-2 col-2 text-right">
                                     <a t-if="slide.download_security and not is_embedded" target="_top" t-attf-href="/slides/slide/#{slug(slide)}/download" title="Download" id="download">
                                         <i class="fa fa-download fa-2x" role="img" aria-label="Download"></i>
                                     </a>
diff --git a/odoo/addons/base/views/res_currency_views.xml b/odoo/addons/base/views/res_currency_views.xml
index 3f055b03142..a8ac7b4a277 100644
--- a/odoo/addons/base/views/res_currency_views.xml
+++ b/odoo/addons/base/views/res_currency_views.xml
@@ -96,7 +96,7 @@
                                     <div class="col-6">
                                         <strong><span><t t-esc="record.name.value"/></span></strong>
                                     </div>
-                                    <div class="col-6 float-right text-right">
+                                    <div class="col-6 text-right">
                                         <span class="badge badge-pill"><t t-esc="record.symbol.value"/></span>
                                     </div>
                                 </div>