Merge lp:~camptocamp/account-invoice-report/add-payment-term into lp:~account-core-editors/account-invoice-report/7.0

[Nicolas Bessi - Camptocamp]

Add payment term to invoice report

[Frederic Clementi - Camptocamp (frederic-clementi)]

Ok for me

[Frederic Clementi - Camptocamp (frederic-clementi)]

Ok.

Maybe, having the Due date with multi payment terms is a non-sense and we should remove the due date.

[Frederic Clementi - Camptocamp (frederic-clementi)]

review: Approve (features validation, no code review)

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

I'm worried about the use of hardcoded "px" sizes in mako templates. Don't you think it would be easier to read for a human to use "cm" or "mm" as a unit in such files, since the indended medium is a PDF and not the screen.

review: Needs Information (code review, no test)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

By the way (a bit out of MP topic), there is an other MP to improve the image helper to allow the use of other units like cm.

https://code.launchpad.net/~camptocamp/ocb-addons/7.0-webkit_report-image_helper-20130318/+merge/153775
https://code.launchpad.net/~camptocamp/openobject-addons/7.0-webkit_report-image_helper-20130318/+merge/153776

As Alexandre said, it would be better to have "cm" and "mm" everywhere in reports.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Alexandre, Yannick, Nicolas, what is the status of this MP?

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

It is still in Need Informations to know if there is a reason to use px instead of metric units. If no special reasons it needs fixing.

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

review: Approve (code review, no test)

=== modified file 'invoice_webkit/report/account_invoice.mako'
--- invoice_webkit/report/account_invoice.mako	2013-02-20 11:31:16 +0000
+++ invoice_webkit/report/account_invoice.mako	2013-03-05 16:04:28 +0000
@@ -215,14 +215,16 @@
         <tr>
             <th class="date">${_("Invoice Date")}</td>
             <th class="date">${_("Due Date")}</td>
-            <th style="text-align:center; width: 120px;">${_("Responsible")}</td>
-            <th style="text-align:left;">${_("Our Reference")}</td>
+            <th style="text-align:center;width:120px;">${_("Responsible")}</td>
+            <th style="text-align:center">${_("Payment Term")}</td>
+            <th style="text-align:center">${_("Our Reference")}</td>
         </tr>
         <tr>
             <td class="date">${formatLang(inv.date_invoice, date=True)}</td>
             <td class="date">${formatLang(inv.date_due, date=True)}</td>
-            <td style="text-align:center; width: 120px;">${inv.user_id and inv.user_id.name or ''}</td>
-            <td style="text-align:left;">${inv.origin or ''}</td>
+            <td style="text-align:center;width:120px;">${inv.user_id and inv.user_id.name or ''}</td>
+            <td style="text-align:center">${inv.payment_term and inv.payment_term.note or ''}</td>
+            <td style="text-align:center">${inv.origin or ''}</td>
         </tr>
     </table>