Account - Invoicing Reports

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

  1. account_invoice_report_VRE
  2. Merge into 7.0
Proposed by Vincent Renaville@camptocamp
Status: Merged
Merged at revision: 22
Proposed branch: lp:~camptocamp/account-invoice-report/account_invoice_report_VRE
Merge into: lp:~account-core-editors/account-invoice-report/7.0
Diff against target: 162 lines (+21/-21)
4 files modified
invoice_webkit/i18n/de.po (+8/-8)
invoice_webkit/i18n/en.po (+2/-2)
invoice_webkit/i18n/fr.po (+6/-6)
invoice_webkit/report/account_invoice.mako (+5/-5)
To merge this branch: bzr merge lp:~camptocamp/account-invoice-report/account_invoice_report_VRE
Reviewer Review Type Date Requested Status
Nicolas Bessi - Camptocamp (community) Approve
Joël Grand-Guillaume @ camptocamp code review, no test Approve
Review via email: mp+149537@code.launchpad.net

Description of the change

Fix missing translation + Improve invoice layout

To post a comment you must log in.
Revision history for this message
Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c) wrote :

LGTM

review: Approve (code review, no test)
Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote :

LGTM

Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'invoice_webkit/i18n/de.po'
--- invoice_webkit/i18n/de.po 2013-02-08 13:49:46 +0000
+++ invoice_webkit/i18n/de.po 2013-02-20 11:35:37 +0000
@@ -99,7 +99,7 @@
99#. module: invoice_webkit99#. module: invoice_webkit
100#: report:addons/invoice_webkit/report/account_invoice.mako:155100#: report:addons/invoice_webkit/report/account_invoice.mako:155
101msgid "Our VAT No"101msgid "Our VAT No"
102msgstr "Unsere MvSt."102msgstr "Unsere USt-IdNr."
103103
104#. module: invoice_webkit104#. module: invoice_webkit
105#: report:addons/invoice_webkit/report/account_invoice.mako:241105#: report:addons/invoice_webkit/report/account_invoice.mako:241
@@ -139,12 +139,12 @@
139#. module: invoice_webkit139#. module: invoice_webkit
140#: report:addons/invoice_webkit/report/account_invoice.mako:205140#: report:addons/invoice_webkit/report/account_invoice.mako:205
141msgid "Taxes:"141msgid "Taxes:"
142msgstr "Steuern:"142msgstr "Mwst:"
143143
144#. module: invoice_webkit144#. module: invoice_webkit
145#: report:addons/invoice_webkit/report/account_invoice.mako:153145#: report:addons/invoice_webkit/report/account_invoice.mako:153
146msgid "Our Ref."146msgid "Our Reference"
147msgstr "Unsere Ref."147msgstr "Unsere Referenz"
148148
149#. module: invoice_webkit149#. module: invoice_webkit
150#: constraint:account.invoice:0150#: constraint:account.invoice:0
@@ -159,7 +159,7 @@
159#. module: invoice_webkit159#. module: invoice_webkit
160#: report:addons/invoice_webkit/report/account_invoice.mako:225160#: report:addons/invoice_webkit/report/account_invoice.mako:225
161msgid "Base"161msgid "Base"
162msgstr "Basis"162msgstr "Steuergrundbetrag"
163163
164#. module: invoice_webkit164#. module: invoice_webkit
165#: field:account.condition_text_webkit,text:0165#: field:account.condition_text_webkit,text:0
@@ -259,7 +259,7 @@
259#. module: invoice_webkit259#. module: invoice_webkit
260#: report:addons/invoice_webkit/report/account_invoice.mako:224260#: report:addons/invoice_webkit/report/account_invoice.mako:224
261msgid "Rate"261msgid "Rate"
262msgstr "Rate"262msgstr "Mwst. %"
263263
264#. module: invoice_webkit264#. module: invoice_webkit
265#: field:account.condition_text_webkit,name:0265#: field:account.condition_text_webkit,name:0
@@ -286,12 +286,12 @@
286#. module: invoice_webkit286#. module: invoice_webkit
287#: report:addons/invoice_webkit/report/account_invoice.mako:176287#: report:addons/invoice_webkit/report/account_invoice.mako:176
288msgid "Net Sub Total"288msgid "Net Sub Total"
289msgstr "Net Sub Total"289msgstr "Netto"
290290
291#. module: invoice_webkit291#. module: invoice_webkit
292#: report:addons/invoice_webkit/report/account_invoice.mako:199292#: report:addons/invoice_webkit/report/account_invoice.mako:199
293msgid "Net :"293msgid "Net :"
294msgstr "Net :"294msgstr "Netto :"
295295
296#. module: invoice_webkit296#. module: invoice_webkit
297#: report:addons/invoice_webkit/report/account_invoice.mako:0297#: report:addons/invoice_webkit/report/account_invoice.mako:0
298298
=== modified file 'invoice_webkit/i18n/en.po'
--- invoice_webkit/i18n/en.po 2013-02-08 13:49:46 +0000
+++ invoice_webkit/i18n/en.po 2013-02-20 11:35:37 +0000
@@ -164,8 +164,8 @@
164164
165#. module: invoice_webkit165#. module: invoice_webkit
166#: report:addons/invoice_webkit/report/account_invoice.mako:153166#: report:addons/invoice_webkit/report/account_invoice.mako:153
167msgid "Our Ref."167msgid "Our Reference"
168msgstr "Our Ref."168msgstr "Our Reference"
169169
170#. module: invoice_webkit170#. module: invoice_webkit
171#: constraint:account.invoice:0171#: constraint:account.invoice:0
172172
=== modified file 'invoice_webkit/i18n/fr.po'
--- invoice_webkit/i18n/fr.po 2013-02-08 13:49:46 +0000
+++ invoice_webkit/i18n/fr.po 2013-02-20 11:35:37 +0000
@@ -168,12 +168,12 @@
168#. module: invoice_webkit168#. module: invoice_webkit
169#: report:addons/invoice_webkit/report/account_invoice.mako:205169#: report:addons/invoice_webkit/report/account_invoice.mako:205
170msgid "Taxes:"170msgid "Taxes:"
171msgstr "Taxes:"171msgstr "TVA:"
172172
173#. module: invoice_webkit173#. module: invoice_webkit
174#: report:addons/invoice_webkit/report/account_invoice.mako:153174#: report:addons/invoice_webkit/report/account_invoice.mako:153
175msgid "Our Ref."175msgid "Our Reference"
176msgstr "Notre Ref."176msgstr "Notre Référence"
177177
178#. module: invoice_webkit178#. module: invoice_webkit
179#: constraint:account.invoice:0179#: constraint:account.invoice:0
@@ -188,7 +188,7 @@
188#. module: invoice_webkit188#. module: invoice_webkit
189#: report:addons/invoice_webkit/report/account_invoice.mako:225189#: report:addons/invoice_webkit/report/account_invoice.mako:225
190msgid "Base"190msgid "Base"
191msgstr "Base"191msgstr "HT"
192192
193#. module: invoice_webkit193#. module: invoice_webkit
194#: field:account.condition_text_webkit,text:0194#: field:account.condition_text_webkit,text:0
@@ -266,7 +266,7 @@
266#. module: invoice_webkit266#. module: invoice_webkit
267#: report:addons/invoice_webkit/report/account_invoice.mako:226267#: report:addons/invoice_webkit/report/account_invoice.mako:226
268msgid "Tax"268msgid "Tax"
269msgstr "Taxe"269msgstr "TVA"
270270
271#. module: invoice_webkit271#. module: invoice_webkit
272#: report:addons/invoice_webkit/report/account_invoice.mako:173272#: report:addons/invoice_webkit/report/account_invoice.mako:173
@@ -315,7 +315,7 @@
315#. module: invoice_webkit315#. module: invoice_webkit
316#: report:addons/invoice_webkit/report/account_invoice.mako:199316#: report:addons/invoice_webkit/report/account_invoice.mako:199
317msgid "Net :"317msgid "Net :"
318msgstr "Net :"318msgstr "HT :"
319319
320#. module: invoice_webkit320#. module: invoice_webkit
321#: report:addons/invoice_webkit/report/account_invoice.mako:0321#: report:addons/invoice_webkit/report/account_invoice.mako:0
322322
=== modified file 'invoice_webkit/report/account_invoice.mako'
--- invoice_webkit/report/account_invoice.mako 2013-02-14 09:13:42 +0000
+++ invoice_webkit/report/account_invoice.mako 2013-02-20 11:35:37 +0000
@@ -215,13 +215,13 @@
215 <tr>215 <tr>
216 <th class="date">${_("Invoice Date")}</td>216 <th class="date">${_("Invoice Date")}</td>
217 <th class="date">${_("Due Date")}</td>217 <th class="date">${_("Due Date")}</td>
218 <th style="text-align:left; width: 120px;">${_("Responsible")}</td>218 <th style="text-align:center; width: 120px;">${_("Responsible")}</td>
219 <th style="text-align:left;">${_("Our Ref.")}</td>219 <th style="text-align:left;">${_("Our Reference")}</td>
220 </tr>220 </tr>
221 <tr>221 <tr>
222 <td class="date">${formatLang(inv.date_invoice, date=True)}</td>222 <td class="date">${formatLang(inv.date_invoice, date=True)}</td>
223 <td class="date">${formatLang(inv.date_due, date=True)}</td>223 <td class="date">${formatLang(inv.date_due, date=True)}</td>
224 <td style="text-align:left; width: 120px;">${inv.user_id and inv.user_id.name or ''}</td>224 <td style="text-align:center; width: 120px;">${inv.user_id and inv.user_id.name or ''}</td>
225 <td style="text-align:left;">${inv.origin or ''}</td>225 <td style="text-align:left;">${inv.origin or ''}</td>
226 </tr>226 </tr>
227 </table>227 </table>
@@ -286,7 +286,7 @@
286 </tfoot>286 </tfoot>
287 </table>287 </table>
288 <br/>288 <br/>
289 <table class="list_total_table" width="40%" >289 <table class="list_total_table" width="60%" >
290 <tr>290 <tr>
291 <th style="text-align:left;">${_("Rate")}</th>291 <th style="text-align:left;">${_("Rate")}</th>
292 <th>${_("Base")}</th>292 <th>${_("Base")}</th>
@@ -326,7 +326,7 @@
326 </tr>326 </tr>
327 <tr>327 <tr>
328 <th style="width:20%;">${_("Bank account")}</th>328 <th style="width:20%;">${_("Bank account")}</th>
329 <td style="width:30%;text-align:left;">${ inv_bank and inv_bank.acc_number or '-' }</td>329 <td style="width:50%;text-align:left;">${ inv_bank and inv_bank.acc_number or '-' }</td>
330 <th style="width:20%;">${_("Our VAT No")}</th>330 <th style="width:20%;">${_("Our VAT No")}</th>
331 <td style="width:30%;" class="vat">${inv.company_id.partner_id.vat or '-'}</td>331 <td style="width:30%;" class="vat">${inv.company_id.partner_id.vat or '-'}</td>
332 </tr>332 </tr>

Subscribers

People subscribed via source and target branches