pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] *: BS4, restore right-aligned columns

Browse Source 
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.
This commit is contained in:
qsm-odoo
2018-08-19 16:57:14 +02:00
parent aa0c4d702d
commit ece1e3d93f
18 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/views/account_view.xml
+1 -1
View File
@@ -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>
addons/account/views/report_invoice.xml
+2 -2
View File
@@ -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>
addons/account/views/report_journal.xml
+2 -2
View File
@@ -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>
addons/account_asset/views/account_asset_views.xml
+1 -1
View File
@@ -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>
addons/analytic/views/analytic_account_views.xml
+1 -1
View File
@@ -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>
addons/hr_expense/report/hr_expense_report.xml
+2 -2
View File
@@ -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>
addons/hr_payroll/views/report_contributionregister_templates.xml
+2 -2
View File
@@ -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>
addons/l10n_fr_hr_payroll/report/report_l10n_fr_fiche_paye.xml
+1 -1
View File
@@ -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>
addons/lunch/report/lunch_order_templates.xml
+2 -2
View File
@@ -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>
addons/point_of_sale/views/report_statement.xml
+2 -2
View File
@@ -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>
addons/purchase/report/purchase_order_templates.xml
+2 -2
View File
@@ -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>
addons/repair/report/repair_templates_repair_order.xml
+2 -2
View File
@@ -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">
addons/sale_stock/report/stock_report_deliveryslip.xml
+2 -2
View File
@@ -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>
addons/stock/report/report_stockinventory.xml
+2 -2
View File
@@ -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>
addons/stock/report/report_stockpicking_operations.xml
+2 -2
View File
@@ -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>
addons/stock/views/stock_move_views.xml
+1 -1
View File
@@ -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>
addons/website_slides/views/website_slides_embed.xml
+1 -1
View File
@@ -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>
odoo/addons/base/views/res_currency_views.xml
+1 -1
View File
@@ -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>