Lorenzo Battistini - Agile BG has proposed merging
lp:~agilebg/sale-reports/7_fix_1315445 into lp:sale-reports.
Requested reviews:
Sale Core Editors (sale-core-editors)
Related bugs:
Bug #1315445 in Sales - Reports: "[7.0] sale_order_webkit - 'Description'
field overlaps the next one 'Qty' when it is very long"
https://bugs.launchpad.net/sale-reports/+bug/1315445
For more details, see:
https://code.launchpad.net/~agilebg/sale-reports/7_fix_1315445/+merge/223795
Same as
https://code.launchpad.net/~agilebg/account-invoice-report/7.0-fix_invoice_webkit_description_bugs/+merge/205204
--
https://code.launchpad.net/~agilebg/sale-reports/7_fix_1315445/+merge/223795
Your team Sale Core Editors is requested to review the proposed merge of
lp:~agilebg/sale-reports/7_fix_1315445 into lp:sale-reports.
=== modified file 'sale_order_webkit/report/sale_order.mako'
--- sale_order_webkit/report/sale_order.mako 2014-02-17 10:20:33 +
+++ sale_order_webkit/report/sale_order.mako 2014-06-19 17:05:51 +
@@ -8,92 +8,113 @@
border:thin solid #E3E4EA;
text-align:center;
border-collapse: collapse;
-}
-table.list_main_table {
-margin-top: 20px;
-}
-.list_main_headers {
-padding: 0;
-}
-.list_main_headers th {
+margin-top: 15px;
+}
+.list_main_table th {
+background-color: #EE;
border: thin solid #00;
+text-align:center;
+font-size:12;
+font-weight:bold;
padding-right:3px;
padding-left:3px;
-background-color: #EE;
-text-align:center;
-font-size:12;
-font-weight:bold;
}
.list_main_table td {
+border-bottom : thin solid #EE;
+text-align:left;
+font-size:12;
padding-right:3px;
padding-left:3px;
padding-top:3px;
padding-bottom:3px;
}
-.list_main_lines,
-.list_main_footers {
-padding: 0;
-}
-.list_main_footers {
-padding-top: 15px;
-}
-.list_main_lines td,
-.list_main_footers td,
-.list_main_footers th {
-border-style: none;
-text-align:left;
-font-size:12;
-padding:0;
-}
-.list_main_footers th {
-text-align:right;
-}
-
-td .total_empty_cell {
-width: 77%;
-}
-td .total_sum_cell {
-width: 13%;
-}
-
-.nobreak {
-page-break-inside: avoid;
-}
-caption.formatted_note {
-text-align:left;
-border-right:thin solid #EE;
-border-left:thin solid #EE;
-border-top:thin solid #EE;
+.list_main_table thead {
+display:table-header-group;
+}
+
+div.formatted_note {
+text-align:left;
padding-left:10px;
font-size:11;
-caption-side: bottom;
-}
-caption.formatted_note p {
-margin: 0;
-}
-
-.main_col1 {
-width: 40%;
-}
-td.main_col1 {
-text-align:left;
-}
-.main_col2,
-.main_col3,
-.main_col4,
-.main_col6 {
-width: 10%;
-}
-.main_col5 {
-width: 7%;
-}
-td.main_col5 {
-text-align: center;
-font-style:italic;
-font-size: 10;
-}
-.main_col7 {
-width: 13%;
+}
+
+
+.list_bank_table {
+text-align:center;
+border-collapse: collapse;
+page-break-inside: avoid;
+display:table;
+}
+
+.act_as_row {
+ display:table-row;
+}
+.list_bank_table .act_as_thead {
+background-color: #EE;
+text-align:left;
+font-size:12;
+font-weight:bold;
+padding-right:3px;
+padding-left:3px;
+white-space:nowrap;
+background-clip:border-box;
+display:table-cell;
+}
+.list_bank_table .act_as_cell {
+text-align:left;
+font-size:12;
+padding-right:3px;
+padding-left:3px;
+padding-top:3px;
+padding-bottom:3px;
+white-space:nowrap;
+display:table-cell;
+}
+
+
+.list_tax_table {
+}
+.list_tax_table td {
+text-align:left;
+font-size:12;
+}
+.list_tax_table th {
+}
+.list_tax_table thead {
+display:table-header-group;
+}
+
+
+.list_total_table {
+border:thin solid #E3E4EA;
+text-align:center;
+border-collapse: collapse;
+}
+.list_total_table td {
+border-top : thin solid #EE;
+text-align:left;
+font-size:12;
+padding-right:3px;
+padding-left:3px;
+padding-top:3px;
+padding-bottom:3px;
+}
+.list_total_table th {
+background-color: #EE;
+border: thin solid #00;
+text-align:center;
+font-size:12;
+font-weight:bold;
+padding-right:3px
+padding-left:3px
+}
+.list_total_table thead {
+display:table-header-group;
+}
+
+
+.no_bloc {
+border-top: thin solid #ff ;
}
.right_table {
@@ -105,6 +126,14 @@
font-size:12;
}
+tfoot.totals tr:first-child td{
+padding-top: 15px;
+}
+
+tfoot.totals td {
+border: none;
+}
+
th.date {
width: 90px;
}
@@ -113,16 +142,43 @@
text-align: right;
white-space: nowrap;
}
+.header_table {
+text-align: center;
+border: 1px solid lightGrey;
+border-collapse: collapse;
+}
+.header_table th {
+font-size: 12px;
+border: 1px solid lightGrey;
+}
+.header_table td {
+font-size: 12px;
+border: 1px solid lightGrey;
+}
td.date {
white-space: nowrap;
width: 90px
