Merge lp:~camptocamp/sale-reports/7.0-sync-sale_order_webkit_with_invoice_webkit-20130607 into lp:~sale-core-editors/sale-reports/7.0

[Yannick Vaucher @ Camptocamp]

Synchronization with invoice_webkit

See https://code.launchpad.net/~camptocamp/account-invoice-report/7.0-fix-invoice-note1-position-20130607/+merge/168054

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve (code review, no test)

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

works fine

review: Approve (code review, test)

=== modified file 'sale_order_webkit/report/sale_order.mako'
--- sale_order_webkit/report/sale_order.mako	2013-05-22 14:26:07 +0000
+++ sale_order_webkit/report/sale_order.mako	2013-06-07 13:16:47 +0000
@@ -8,91 +8,43 @@
     text-align:center;
     border-collapse: collapse;
 }
-
+.list_sale_table th {
+    background-color: #EEEEEE;
+    border: thin solid #000000;
+    text-align:center;
+    font-size:12;
+    font-weight:bold;
+    padding-right:3px;
+    padding-left:3px;
+}
 .list_sale_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_sale_table thead {
+    display:table-header-group;
+}
+
+td.formatted_note {
+    text-align:left;
+    border-right:thin solid #EEEEEE;
+    border-left:thin solid #EEEEEE;
     border-top:thin solid #EEEEEE;
-    text-align:right;
-    font-size:12;
-    padding-right:3px;
-    padding-left:3px;
-    padding-top:3px;
-    padding-bottom:3px;
-}
-
-.list_bank_table {
-    text-align:center;
-    border-collapse: collapse;
-}
-
-.list_bank_table td {
-    text-align:left;
-    font-size:12;
-    padding-right:3px;
-    padding-left:3px;
-    padding-top:3px;
-    padding-bottom:3px;
-}
-
-.list_bank_table th {
-    background-color: #EEEEEE;
-    text-align:left;
-    font-size:12;
-    font-weight:bold;
-    padding-right:3px
-    padding-left:3px
-}
-
-.list_sale_table th {
-    background-color: #EEEEEE;
-    border: thin solid #000000;
-    text-align:center;
-    font-size:12;
-    font-weight:bold;
-    padding-right:3px;
-    padding-left:3px;
-}
-
-.list_table thead {
-    display:table-header-group;
-}
-
-
-.list_tax_table {
-}
-.list_tax_table td {
-    text-align:left;
-    font-size:12;
-}
-
-
-.list_table thead {
-    display:table-header-group;
-}
-
-
-.list_total_table {
-    border-collapse: collapse;
-}
-
-.list_total_table td {
-    text-align:right;
-    font-size:12;
-}
+    padding-left:10px;
+    font-size:11;
+}
+
+
 
 .no_bloc {
     border-top: thin solid  #ffffff ;
 }
 
-
-.list_total_table th {
-    background-color: #F7F7F7;
-    border-collapse: collapse;
-}
-
-tfoot.totals tr:first-child td{
-    padding-top: 15px;
-}
-
 .right_table {
     right: 4cm;
     width:"100%";
@@ -102,14 +54,20 @@
     font-size:12;
 }
 
-.note {
-    text-align:left;
-    font-size:10;
-    border-top:thin solid  #ffffff;
-    border-left:thin solid  #ffffff;
-    border-right:thin solid  #ffffff;
-}
-
+tfoot.totals tr:first-child td{
+    padding-top: 15px;
+}
+
+
+td.amount, th.amount {
+    text-align: right;
+    white-space: nowrap;
+}
+
+
+.address .recipient .shipping .invoice {
+    font-size: 12px;
+}
 
     </style>
 </head>
@@ -207,22 +165,24 @@
             </tr>
         </thead>
         <tbody>
-            %for line in order.order_line:
-                <tr class="line">
-                    <td style="text-align:left; " >${ line.name }</td>
-                    <td class="amount" width="7.5%">${ formatLang(line.product_uos and line.product_uos_qty or line.product_uom_qty) }</td>
-                    <td style="text-align:center;">${ line.product_uos and line.product_uos.name or line.product_uom.name }</td>
-                    <td class="amount" width="8%">${formatLang(line.price_unit)}</td>
-                    <td style="font-style:italic; font-size: 10;">${ ', '.join([tax.description or tax.name for tax in line.tax_id]) }</td>
-                    <td class="amount" width="10%">${line.discount and formatLang(line.discount, digits=get_digits(dp='Sale Price')) or ''} ${line.discount and '%' or ''}</td>
-                    <td class="amount" width="13%">${formatLang(line.price_subtotal, digits=get_digits(dp='Sale Price'))}&nbsp;${order.pricelist_id.currency_id.symbol}</td>
-                </tr>
-                %if line.formatted_note:
-                    <tr class="line">
-                        <td colspan="7" class="note" style="text-align:left;">${line.formatted_note| n}</td>
-                    </tr>
-                %endif
-            %endfor
+        %for line in order.order_line:
+            <tr class="line">
+                <td style="text-align:left; " >${ line.name }</td>
+                <td class="amount" width="7.5%">${ formatLang(line.product_uos and line.product_uos_qty or line.product_uom_qty) }</td>
+                <td style="text-align:center;">${ line.product_uos and line.product_uos.name or line.product_uom.name }</td>
+                <td class="amount" width="8%">${formatLang(line.price_unit)}</td>
+                <td style="font-style:italic; font-size: 10;">${ ', '.join([tax.description or tax.name for tax in line.tax_id]) }</td>
+                <td class="amount" width="10%">${line.discount and formatLang(line.discount, digits=get_digits(dp='Sale Price')) or ''} ${line.discount and '%' or ''}</td>
+                <td class="amount" width="13%">${formatLang(line.price_subtotal, digits=get_digits(dp='Sale Price'))}&nbsp;${order.pricelist_id.currency_id.symbol}</td>
+            </tr>
+            %if line.formatted_note:
+            <tr>
+              <td class="formatted_note" colspan="7">
+                ${line.formatted_note| n}
+              </td>
+            </tr>
+            %endif
+        %endfor
         </tbody>
         <tfoot class="totals">
             <tr>