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

[IMP] account,sale,web: use classes for section and note

Browse Source 
Instead of using custom CSS.

PR: #26801
task-1876864
This commit is contained in:
Sébastien Theys
2018-09-19 12:00:37 +02:00
committed by Romain Derie
parent 3ef1394806
commit 4decbcc55c
5 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/views/report_invoice.xml
+1 -1
View File
@@ -75,7 +75,7 @@
<t t-set="current_subtotal" t-value="current_subtotal + line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
<t t-set="current_subtotal" t-value="current_subtotal + line.price_total" groups="account.group_show_line_subtotals_tax_included"/>
<tr t-attf-class="{{ 'o_is_' + line.display_type if line.display_type else '' }}">
<tr t-att-class="'bg-200 font-weight-bold' if line.display_type == 'line_section' else 'font-italic' if line.display_type == 'line_note' else ''">
<t t-if="not line.display_type" name="account_invoice_line_accountable">
<td name="account_invoice_line_name"><span t-field="line.name"/></td>
<td class="d-none"><span t-field="line.origin"/></td>
addons/sale/report/sale_report_templates.xml
+1 -1
View File
@@ -94,7 +94,7 @@
<t t-set="current_subtotal" t-value="current_subtotal + line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
<t t-set="current_subtotal" t-value="current_subtotal + line.price_total" groups="account.group_show_line_subtotals_tax_included"/>
<tr t-attf-class="{{ 'o_is_' + line.display_type if line.display_type else '' }}">
<tr t-att-class="'bg-200 font-weight-bold' if line.display_type == 'line_section' else 'font-italic' if line.display_type == 'line_note' else ''">
<t t-if="not line.display_type">
<td><span t-field="line.name"/></td>
<td class="text-right">
addons/sale/static/src/scss/sale_portal.scss
-9
View File
@@ -8,12 +8,3 @@
.orders_label_text_align {
vertical-align: 15%;
}
tr.o_is_line_note {
font-style: italic;
}
tr.o_is_line_section {
font-weight: bold;
background-color: #DDDDDD;
}
addons/sale/views/sale_portal_templates.xml
+1 -1
View File
@@ -468,7 +468,7 @@
<t t-set="current_subtotal" t-value="current_subtotal + line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
<t t-set="current_subtotal" t-value="current_subtotal + line.price_total" groups="account.group_show_line_subtotals_tax_included"/>
<tr t-attf-class="{{ 'o_is_' + line.display_type if line.display_type else '' }}">
<tr t-att-class="'bg-200 font-weight-bold' if line.display_type == 'line_section' else 'font-italic' if line.display_type == 'line_note' else ''">
<t t-if="not line.display_type">
<td id="product_name"><span t-field="line.name"/></td>
<td class="text-right">
addons/web/static/src/scss/report.scss
-15
View File
@@ -44,18 +44,3 @@ body {
.o_underline {
text-decoration: underline;
}
/*
The goal of the following lines is to contain CSS hacks related to allowing
section and note on sale order and invoice.
*/
.row.o_is_line_section,
.table > tbody > tr.o_is_line_section td {
font-weight: bold;
background-color: #DDDDDD;
}
.row.o_is_line_note,
tr.o_is_line_note {
font-style: italic;
}