Rifakat (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.0-opw-383738-rha into
lp:openobject-addons/6.0.
Requested reviews:
Naresh(OpenERP) (nch-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-383738-rha/+merge/96972
Hello,
Webkit report values do not get translated. Made it translatable with _()
Please review this fix.
Regards,
Rifakat
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-383738-rha/+merge/96972
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-opw-383738-rha.
=== 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-03-12 07:06:19 +0000
@@ -8,12 +8,12 @@
%for inv in objects :
<% setLang(inv.partner_id.lang) %>
<table class="dest_address">
- <tr><td ><b>${inv.partner_id.title or ''|entity} ${inv.partner_id.name |entity}</b></td></tr>
- <tr><td>${inv.address_invoice_id.street or ''|entity}</td></tr>
- <tr><td>${inv.address_invoice_id.street2 or ''|entity}</td></tr>
- <tr><td>${inv.address_invoice_id.zip or ''|entity} ${inv.address_invoice_id.city or ''|entity}</td></tr>
+ <tr><td ><b>${_(inv.partner_id.title and inv.partner_id.title.name) or ''|entity} ${_(inv.partner_id.name) |entity}</b></td></tr>
+ <tr><td>${_(inv.address_invoice_id.street) or ''|entity}</td></tr>
+ <tr><td>${_(inv.address_invoice_id.street2) or ''|entity}</td></tr>
+ <tr><td>${inv.address_invoice_id.zip or ''|entity} ${_(inv.address_invoice_id.city) or ''|entity}</td></tr>
%if inv.address_invoice_id.country_id :
- <tr><td>${inv.address_invoice_id.country_id.name or ''|entity} </td></tr>
+ <tr><td>${_(inv.address_invoice_id.country_id and inv.address_invoice_id.country_id.name) or ''|entity} </td></tr>
%endif
%if inv.address_invoice_id.phone :
<tr><td>${_("Tel")}: ${inv.address_invoice_id.phone|entity}</td></tr>
@@ -25,7 +25,7 @@
<tr><td>${_("E-mail")}: ${inv.address_invoice_id.email|entity}</td></tr>
%endif
%if inv.partner_id.vat :
- <tr><td>${_("VAT")}: ${inv.partner_id.vat|entity}</td></tr>
+ <tr><td>${_("VAT")}: ${_(inv.partner_id.vat) or ''|entity}</td></tr>
%endif
</table>
<br />
@@ -42,16 +42,16 @@
<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> </td></tr>
+ <tr><td>${_(inv.name) or ''}</td><td>${formatLang(inv.date_invoice, date=True)|entity}</td><td> </td></tr>
</table>
<h1><br /></h1>
<table class="list_table" width="90%">
<thead><tr><th>${_("Description")}</th><th class>${_("Taxes")}</th><th class>${_("QTY")}</th><th>${_("Unit Price")}</th><th >${_("Disc.(%)")}</th><th>${_("Price")}</th></tr></thead>
%for line in inv.invoice_line :
<tbody>
- <tr><td>${line.name|entity}</td><td>${ ', '.join([ tax.name or '' for tax in line.invoice_line_tax_id ])|entity}</td><td>${line.quantity}</td><td style="text-align:right;">${formatLang(line.price_unit)}</td><td style="text-align:center;">${line.discount or 0.00}</td><td style="text-align:right;">${formatLang(line.price_subtotal)}</td></tr>
+ <tr><td>${_(line.name)|entity}</td><td>${ ', '.join([ _(tax.name) or '' for tax in line.invoice_line_tax_id ])|entity}</td><td>${line.quantity}</td><td style="text-align:right;">${formatLang(line.price_unit)}</td><td style="text-align:center;">${line.discount or 0.00}</td><td style="text-align:right;">${formatLang(line.price_subtotal)}</td></tr>
%if line.note :
- <tr><td colspan="6" style="border-style:none"><pre style="font-family:Helvetica;padding-left:20px">${line.note |entity}</pre></td></tr>
+ <tr><td colspan="6" style="border-style:none"><pre style="font-family:Helvetica;padding-left:20px">${_(line.note) |entity}</pre></td></tr>
%endif
%endfor
<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>Net Total:</b></td><td style="border-top:2px solid;text-align:right">${formatLang(inv.amount_untaxed)}</td></tr>
@@ -65,7 +65,7 @@
%if inv.tax_line :
%for t in inv.tax_line :
<tr>
- <td>${ t.name|entity } </td>
+ <td>${ _(t.name)|entity } </td>
<td>${ t.base|entity}</td>
<td>${ formatLang(t.amount) }</td>
</tr>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
