Merge lp:~openerp-dev/openobject-addons/6.1-opw-579319-ksa into lp:openobject-addons/6.1

[Kirti Savalia(OpenERP)]

Hello,

Steps to reproduce:

Install membership module
1.Create a partner
2.Click on Join Membership
3.Select the membership Product
4.Confirm Membership Invoice (State Draft)
5.Click on WebkitInvoice reports
6.Open invoice

Document and partner ref field displays "False" instead of blank in the Webkit Invoice.

Thanks

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Not Relevant on Trunk (means that architecture on trunk has changed and so this bug has no meaning anymore). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6996. By Kirti Savalia(OpenERP) <email address hidden> on 2012-09-18

[FIX]:Document and partner ref field displays false instead of blank in the Webkit Invoice

=== modified file 'report_webkit_sample/report/report_webkit_html.mako'
--- report_webkit_sample/report/report_webkit_html.mako	2011-01-14 00:11:01 +0000
+++ report_webkit_sample/report/report_webkit_html.mako	2012-09-18 13:04:21 +0000
@@ -42,7 +42,7 @@
     <br/>
     <table class="basic_table" width="90%">
         <tr><td>${_("Document")}</td><td>${_("Invoice Date")}</td><td>${_("Partner Ref.")}</td></tr>
-        <tr><td>${inv.name}</td><td>${formatLang(inv.date_invoice, date=True)|entity}</td><td>&nbsp;</td></tr>
+        <tr><td>${inv.name or ''|entity}</td><td>${formatLang(inv.date_invoice, date=True)|entity}</td><td>${inv.number or ''|entity}</td></tr>
     </table>
     <h1><br /></h1>
     <table class="list_table"  width="90%">