Merge lp:~camptocamp/account-invoice-report/invoice_webkit_VRE into lp:~account-core-editors/account-invoice-report/7.0

[Vincent Renaville@camptocamp]

Add translations terms + change from tax name to tax description for invoice line

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

LGTM, but don't trust me on german translations

review: Approve (code review, no test)

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Merged

Thanks for the fixes

=== modified file 'invoice_webkit/i18n/de.po'
--- invoice_webkit/i18n/de.po	2012-07-24 12:27:35 +0000
+++ invoice_webkit/i18n/de.po	2013-01-30 15:38:24 +0000
@@ -169,6 +169,12 @@
 msgstr "Menge"
 
 #. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:173
+msgid "UoM"
+msgstr "Maßeinheit"
+
+
+#. module: invoice_webkit
 #: selection:account.condition_text_webkit,type:0
 #: field:account.invoice,note1_webkit:0
 #: field:account.invoice,text_condition1_webkit:0
@@ -212,3 +218,14 @@
 msgid "Net :"
 msgstr "Net :"
 
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:0
+msgid "Bank"
+msgstr "Bank"
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:0
+msgid "Bank account"
+msgstr "Bankkonto"
+
+
 
=== modified file 'invoice_webkit/i18n/en.po'
--- invoice_webkit/i18n/en.po	2012-07-24 12:27:35 +0000
+++ invoice_webkit/i18n/en.po	2013-01-30 15:38:24 +0000
@@ -169,6 +169,12 @@
 msgstr "Qty"
 
 #. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:173
+msgid "UoM"
+msgstr "UoM"
+
+
+#. module: invoice_webkit
 #: selection:account.condition_text_webkit,type:0
 #: field:account.invoice,note1_webkit:0
 #: field:account.invoice,text_condition1_webkit:0
@@ -212,3 +218,14 @@
 msgid "Net :"
 msgstr "Net :"
 
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:0
+msgid "Bank"
+msgstr "Bank"
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:0
+msgid "Bank account"
+msgstr "Bank account"
+
+
 
=== modified file 'invoice_webkit/i18n/fr.po'
--- invoice_webkit/i18n/fr.po	2012-08-02 15:30:01 +0000
+++ invoice_webkit/i18n/fr.po	2013-01-30 15:38:24 +0000
@@ -51,6 +51,12 @@
 msgstr "Prix unitaire"
 
 #. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:173
+msgid "UoM"
+msgstr "UdM"
+
+
+#. module: invoice_webkit
 #: report:addons/invoice_webkit/report/account_invoice.mako:175
 msgid "Disc.(%)"
 msgstr "Esc.(%)"
@@ -216,3 +222,11 @@
 #: report:addons/invoice_webkit/report/account_invoice.mako:0
 msgid "Bank"
 msgstr "Banque"
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:0
+msgid "Bank account"
+msgstr "Compte bancaire"
+
+
+
 
=== modified file 'invoice_webkit/report/account_invoice.mako'
--- invoice_webkit/report/account_invoice.mako	2013-01-24 14:17:51 +0000
+++ invoice_webkit/report/account_invoice.mako	2013-01-30 15:38:24 +0000
@@ -236,7 +236,7 @@
                 <td class="amount">${formatLang(line.quantity or 0.0,digits=get_digits(dp='Account'))}</td>
                 <td class="amount">${line.uos_id and line.uos_id.name or ''}</td>
                 <td class="amount">${formatLang(line.price_unit)}</td>
-                <td style="font-style:italic; font-size: 10;text-align:center;" >${ ', '.join([ tax.name or '' for tax in line.invoice_line_tax_id ])}</td>
+                <td style="font-style:italic; font-size: 10;text-align:center;" >${ ', '.join([ tax.description or '' for tax in line.invoice_line_tax_id ])}</td>
                 <td class="amount" width="10%">${line.discount and formatLang(line.discount, digits=get_digits(dp='Account')) or ''} ${line.discount and '%' or ''}</td>
                 <td class="amount" width="13%">${formatLang(line.price_subtotal, digits=get_digits(dp='Account'))} ${inv.currency_id.symbol}</td>
             </tr>