From af14b338d5dc23b08ab3da970e1e89e3ed3f0ed2 Mon Sep 17 00:00:00 2001 From: "nicolas.bessi@camptocamp.com" <> Date: Fri, 28 Jan 2011 12:01:29 +0100 Subject: [PATCH] [FIX] l10n_ch escaping label bzr revid: nicolas.bessi@camptocamp.com-20110128110129-m3z5nawwh5vjlvbo --- addons/l10n_ch/report/report_webkit_html.mako | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/l10n_ch/report/report_webkit_html.mako b/addons/l10n_ch/report/report_webkit_html.mako index 1cb2c7fe091..d15bfda2898 100644 --- a/addons/l10n_ch/report/report_webkit_html.mako +++ b/addons/l10n_ch/report/report_webkit_html.mako @@ -17,37 +17,37 @@ ${inv.address_invoice_id.country_id.name or ''|entity} %endif %if inv.address_invoice_id.phone : - ${_("Tel")}: ${inv.address_invoice_id.phone|entity} + ${_("Tel") |entity}: ${inv.address_invoice_id.phone|entity} %endif %if inv.address_invoice_id.fax : - ${_("Fax")}: ${inv.address_invoice_id.fax|entity} + ${_("Fax") |entity}: ${inv.address_invoice_id.fax|entity} %endif %if inv.address_invoice_id.email : - ${_("E-mail")}: ${inv.address_invoice_id.email|entity} + ${_("E-mail") |entity}: ${inv.address_invoice_id.email|entity} %endif %if inv.partner_id.vat : - ${_("VAT")}: ${inv.partner_id.vat|entity} + ${_("VAT") |entity}: ${inv.partner_id.vat|entity} %endif
%if inv.type == 'out_invoice' : - ${_("Invoice")} ${inv.number or ''|entity} + ${_("Invoice") |entity} ${inv.number or ''|entity} %elif inv.type == 'in_invoice' : - ${_("Supplier Invoice")} ${inv.number or ''|entity} + ${_("Supplier Invoice") |entity} ${inv.number or ''|entity} %elif inv.type == 'out_refund' : - ${_("Refund")} ${inv.number or ''|entity} + ${_("Refund") |entity} ${inv.number or ''|entity} %elif inv.type == 'in_refund' : - ${_("Supplier Refund")} ${inv.number or ''|entity} + ${_("Supplier Refund") |entity} ${inv.number or ''|entity} %endif

- +
${_("Document")}${_("Invoice Date")}${_("Partner Ref.")}
${_("Document") |entity}${_("Invoice Date") |entity}${_("Partner Ref.") |entity}
${inv.name}${formatLang(inv.date_invoice, date=True)|entity} 


- + %for line in inv.invoice_line : @@ -62,7 +62,7 @@
${_("Description")}${_("Taxes")}${_("QTY")}${_("Unit Price")}${_("Disc.(%)")}${_("Price")}
${_("Description") |entity}${_("Taxes") |entity}${_("QTY") |entity}${_("Unit Price") |entity}${_("Disc.(%)") |entity}${_("Price") |entity}
${line.name|entity}${ ', '.join([ tax.name or '' for tax in line.invoice_line_tax_id ])|entity}${line.quantity}${formatLang(line.price_unit)}${line.discount or 0.00}${formatLang(line.price_subtotal)}
- + %if inv.tax_line : %for t in inv.tax_line : @@ -74,7 +74,7 @@ %endif +
Tax${_("Base")}${_("Amount")}
Tax${_("Base") |entity}${_("Amount") |entity}
- ${_("Total")}${_("Total") |entity} ${ formatLang(inv.amount_tax) }