Merge lp:~agilebg/account-invoice-report/7.0-fix_invoice_webkit_description_bugs into lp:~account-core-editors/account-invoice-report/7.0

[Alex Comba - Agile BG]

[FIX] invoice_webkit bugs: #1208389, #1231329 and #1277024

Merge proposal to fix the following bugs:

https://bugs.launchpad.net/account-invoice-report/+bug/1208389
https://bugs.launchpad.net/account-invoice-report/+bug/1231329
https://bugs.launchpad.net/account-invoice-report/+bug/1277024

As explained in the bug #1277024 report.

[Lorenzo Battistini (elbati)]

l 324: <p class="std_text">${inv.note2 | n}</> should be <p class="std_text">${inv.note2 | n} />

review: Needs Fixing

[Alex Comba - Agile BG (tafaru)]

Lorenzo, my new commit should have fixed, please have a look at it.

Thank you.

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

I disagree with renaming back list_main_table to list_invoice_table

This was intended to be able to use same css through invoice, sale_order and so on.

Plus it seems to me it reintroduce
https://bugs.launchpad.net/account-invoice-report/+bug/1231329

Does this fix still ensure that a formated_note line is on the same page as its invoice line?
I see you removed that nobreak.

review: Needs Information

[Alex Comba - Agile BG (tafaru)]

Yannick,

you are right, we had not taken into consideration that type of problem related to formatted_note.

However, we still have to fix these two bugs:

https://bugs.launchpad.net/account-invoice-report/+bug/1208389 [1]
https://bugs.launchpad.net/account-invoice-report/+bug/1277024 [2]

[1] is easy to fix while [2] seems to harder. I played a bit whith [2], I tried to use the table-layout CSS property. This apparently improves the situation but it doesn't fix it in total.

Any ideas?

Thank you in advance.

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

If you set `word-wrap: break-word` on td where you print line.name

Plus `table-layout: fixed` on the inner table and it should do the trick

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Bug #1208389: [7.0] invoice_webkit - invoice line does not print line description

Is better fixed here:
https://code.launchpad.net/~camptocamp/account-invoice-report/account-invoice-webkit-line-description-vre/+merge/217929

I disapprove as it still replace css

review: Disapprove

[Vincent Renaville@camptocamp (vrenaville-c2c)]

Hello,

Thanks for you proposal.

Just a question why did you create a complex style at line 303, instead of use a specific class (like in the current version) ?

Vincent

review: Needs Information

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Have you tried word-wrap: break-word and table-layout: fixed ?

I merged Vincent MP so it seems the last bug to resolve is
https://bugs.launchpad.net/account-invoice-report/+bug/1277024

[Alex Comba - Agile BG (tafaru)]

Yannick wrote:
> Have you tried word-wrap: break-word and table-layout: fixed ?

Hi Yannick,

yes I tried, but it doesn't seem to work.

> I merged Vincent MP

Thank you.

> so it seems the last bug to resolve is https://bugs.launchpad.net/account-invoice-report/+bug/1277024

Yes, it's right.

[Lorenzo Battistini (elbati)]

Hello Yannick and Vincent,

I renamed list_invoice_table to list_main_table.

As you saw, in order to fix bug 1277024 we had to remove the nested tables but this reintroduced the bug 1231329.
In order to fix bug 1231329, I moved the formatted_note within the 'nobreak' div containing line.name

See the result of the new layout at https://app.box.com/s/0i8ra35jlnqken7dvp7n

Thanks

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

This project is now hosted on https://github.com/OCA/account-invoice-reporting. Please move your proposal there if you still want to merge it once fixed. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

Sorry Lorenzo didn't had the time to look closely at this MP again. Can we continue this on github ?

[Lorenzo Battistini (elbati)]

"Sorry Lorenzo didn't had the time to look closely at this MP again. Can we continue this on github ?"

Gladly!

Here it is
https://github.com/OCA/account-invoice-reporting/pull/2

Unmerged revisions

58. By Lorenzo Battistini on 2014-06-18

[MERGE] from lp:account-invoice-report
including fix from
https://code.launchpad.net/~camptocamp/account-invoice-report/account-invoice-webkit-line-description-vre/+merge/217929

57. By Lorenzo Battistini on 2014-06-18

[FIX] formatted_note with nobreak

56. By Lorenzo Battistini on 2014-06-18

[IMP] renaming to list_main_table

55. By Alex Comba - Agile BG on 2014-03-25

[FIX] typo

54. By Alex Comba - Agile BG on 2014-03-25

[REM] empty space

53. By Alex Comba - Agile BG on 2014-03-25

[FIX] Reverted changes committed in rev 52

52. By Alex Comba - Agile BG on 2014-02-07

[FIX] end p tags

51. By Alex Comba - Agile BG on 2014-02-06

[FIX] bug lp:1231329 - 'lines are separated from their description on page break'

50. By Alex Comba - Agile BG on 2014-02-06

[FIX] Reverted some parts of this revision http://bazaar.launchpad.net/~account-core-editors/account-invoice-report/7.0/revision/40.2.1

=== modified file 'invoice_webkit/report/account_invoice.mako'
--- invoice_webkit/report/account_invoice.mako	2014-05-01 15:23:35 +0000
+++ invoice_webkit/report/account_invoice.mako	2014-06-18 13:27:10 +0000
@@ -9,92 +9,34 @@
     text-align:center;
     border-collapse: collapse;
 }
-table.list_main_table {
-    margin-top: 20px;
-}
-.list_main_headers {
-    padding: 0;
-}
-.list_main_headers th {
+.list_main_table th {
+    background-color: #EEEEEE;
     border: thin solid #000000;
+    text-align:center;
+    font-size:12;
+    font-weight:bold;
     padding-right:3px;
     padding-left:3px;
-    background-color: #EEEEEE;
-    text-align:center;
-    font-size:12;
-    font-weight:bold;
 }
 .list_main_table td {
+    border-top : thin solid #EEEEEE;
+    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 #EEEEEE;
-    border-left:thin solid #EEEEEE;
-    border-top:thin solid #EEEEEE;
+.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;
@@ -169,6 +111,11 @@
     display:table-header-group;
 }
 
+
+.no_bloc {
+    border-top: thin solid  #ffffff ;
+}
+
 .right_table {
     right: 4cm;
     width:"100%";
@@ -178,6 +125,10 @@
     font-size:12;
 }
 
+tfoot.totals tr:first-child td{
+    padding-top: 15px;
+}
+
 th.date {
     width: 90px;
 }
@@ -186,6 +137,19 @@
     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;
@@ -202,6 +166,14 @@
     float: right;
 }
 
+.nobreak {
+     page-break-inside: avoid;
+ }
+
+.align_top {
+     vertical-align:text-top;
+ }
+
     </style>
 </head>
 <body>
@@ -300,87 +272,62 @@
     %endif
     </div>
 
-    <table class="list_main_table" width="100%">
-      <thead>
-        <tr>
-          <th class="list_main_headers" style="width: 100%">
-            <table style="width:100%">
-              <tr>
-                <th class="main_col1">${_("Description")}</th>
-                <th class="amount main_col2">${_("Qty")}</th>
-                <th class="amount main_col3">${_("UoM")}</th>
-                <th class="amount main_col4">${_("Unit Price")}</th>
-                <th class="main_col5">${_("Taxes")}</th>
-                <th class="amount main_col6">${_("Disc.(%)")}</th>
-                <th class="amount main_col7">${_("Net Sub Total")}</th>
-              </tr>
-            </table>
-          </th>
-        </tr>
-      </thead>
-      <tbody>
-        %for line in inv.invoice_line:
-          <tr>
-            <td class="list_main_lines" style="width: 100%">
-              <div class="nobreak">
-                <table style="width:100%">
-                  <tr>
-                    <td class="main_col1">${line.name.replace('\n','<br/>') or '' | n}</td>
-                    <td class="amount main_col2">${formatLang(line.quantity or 0.0,digits=get_digits(dp='Account'))}</td>
-                    <td class="amount main_col3">${line.uos_id and line.uos_id.name or ''}</td>
-                    <td class="amount main_col4">${formatLang(line.price_unit)}</td>
-                    <td class="main_col5">${ ', '.join([tax.description or tax.name for tax in line.invoice_line_tax_id])}</td>
-                    <td class="amount main_col6">${line.discount and formatLang(line.discount, digits=get_digits(dp='Account')) or ''} ${line.discount and '%' or ''}</td>
-                    <td class="amount main_col7">${formatLang(line.price_subtotal, digits=get_digits(dp='Account'))} ${inv.currency_id.symbol}</td>
-                  </tr>
-                  %if line.formatted_note:
-                    <caption class="formatted_note">
-                      ${line.formatted_note| n}
-                    </caption>
-                  %endif
-                </table>
-              </div>
-            </td>
-          </tr>
+    <table class="list_main_table" width="100%" style="margin-top: 20px;">
+        <thead>
+            <tr>
+                <th>${_("Description")}</th>
+                <th>${_("Qty")}</th>
+                <th>${_("UoM")}</th>
+                <th>${_("Unit Price")}</th>
+                <th>${_("Taxes")}</th>
+                <th>${_("Disc.(%)")}</th>
+                <th>${_("Net Sub Total")}</th>
+            </tr>
+        </thead>
+        <tbody>
+        %for line in inv.invoice_line :
+            <tr>
+                <td class="align_top"><div class="nobreak">${line.name.replace('\n','<br/>') or '' | n}
+                    %if line.formatted_note:
+                        <br />
+                        <div class="formatted_note">${line.formatted_note| n}</div>
+                    %endif
+                </div></td>
+                <td class="amount align_top">${formatLang(line.quantity or 0.0,digits=get_digits(dp='Account'))}</td>
+                <td class="amount align_top">${line.uos_id and line.uos_id.name or ''}</td>
+                <td class="amount align_top">${formatLang(line.price_unit)}</td>
+                <td class="align_top" style="font-style:italic; font-size: 10;text-align:center;" >${ ', '.join([ tax.description or tax.name for tax in line.invoice_line_tax_id ])}</td>
+                <td class="amount align_top" width="10%">${line.discount and formatLang(line.discount, digits=get_digits(dp='Account')) or ''} ${line.discount and '%' or ''}</td>
+                <td class="amount align_top" width="13%">${formatLang(line.price_subtotal, digits=get_digits(dp='Account'))} ${inv.currency_id.symbol}</td>
+            </tr>
         %endfor
-      </tbody>
-      <tfoot class="totals">
-        <tr>
-          <td class="list_main_footers" style="width: 100%">
-            <div class="nobreak">
-              <table style="width:100%">
-                <tr>
-                  <td class="total_empty_cell"/>
-                  <th>
-                    ${_("Net :")}
-                  </th>
-                  <td class="amount total_sum_cell">
+        </tbody>
+        <tfoot class="totals">
+            <tr>
+                <td colspan="6" style="text-align:right;border-right: thin solid  #ffffff ;border-left: thin solid  #ffffff ;">
+                    <b>${_("Net :")}</b>
+                </td>
+                <td class="amount" style="border-right: thin solid  #ffffff ;border-left: thin solid  #ffffff ;">
                     ${formatLang(inv.amount_untaxed, digits=get_digits(dp='Account'))} ${inv.currency_id.symbol}
-                  </td>
-                </tr>
-                <tr>
-                  <td class="total_empty_cell"/>
-                  <th>
-                    ${_("Taxes:")}
-                  </th>
-                  <td class="amount total_sum_cell">
-                    ${formatLang(inv.amount_tax, digits=get_digits(dp='Account'))} ${inv.currency_id.symbol}
-                  </td>
-                </tr>
-                <tr>
-                  <td class="total_empty_cell"/>
-                  <th>
-                    ${_("Total:")}
-                  </th>
-                  <td class="amount total_sum_cell">
-                    <b>${formatLang(inv.amount_total, digits=get_digits(dp='Account'))} ${inv.currency_id.symbol}</b>
-                  </td>
-                </tr>
-              </table>
-            </div>
-          </td>
-        </tr>
-      </tfoot>
+                </td>
+            </tr>
+            <tr class="no_bloc">
+                <td colspan="6" style="text-align:right; border-top: thin solid  #ffffff ; border-right: thin solid  #ffffff ;border-left: thin solid  #ffffff ;">
+                    <b>${_("Taxes:")}</b>
+                </td>
+                <td class="amount" style="border-right: thin solid  #ffffff ;border-top: thin solid  #ffffff ;border-left: thin solid  #ffffff ;">
+                        ${formatLang(inv.amount_tax, digits=get_digits(dp='Account'))} ${inv.currency_id.symbol}
+                </td>
+            </tr>
+            <tr>
+                <td colspan="6" style="border-right: thin solid  #ffffff ;border-top: thin solid  #ffffff ;border-left: thin solid  #ffffff ;border-bottom: thin solid  #ffffff ;text-align:right;">
+                    <b>${_("Total:")}</b>
+                </td>
+                <td class="amount" style="border-right: thin solid  #ffffff ;border-top: thin solid  #ffffff ;border-left: thin solid  #ffffff ;border-bottom: thin solid  #ffffff ;">
+                        <b>${formatLang(inv.amount_total, digits=get_digits(dp='Account'))} ${inv.currency_id.symbol}</b>
+                </td>
+            </tr>
+        </tfoot>
     </table>
         <br/>
     <table class="list_total_table" width="60%" >
@@ -434,7 +381,7 @@
         </div>
     </div>
     <br/>
-    %if inv.comment :
+    %if inv.comment:
         <p class="std_text">${inv.comment | carriage_returns}</p>
     %endif
     %if inv.note2 :
@@ -446,7 +393,7 @@
         ${inv.fiscal_position.note | n}
         </p>
     %endif
-    <p style="page-break-after:always"/>
+    <p style="page-break-after:always"></p>
     %endfor
 </body>
 </html>