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
1=== modified file 'invoice_webkit/i18n/de.po'
2--- invoice_webkit/i18n/de.po 2013-02-08 13:49:46 +0000
3+++ invoice_webkit/i18n/de.po 2013-02-20 11:35:37 +0000
4@@ -99,7 +99,7 @@
5 #. module: invoice_webkit
6 #: report:addons/invoice_webkit/report/account_invoice.mako:155
7 msgid "Our VAT No"
8-msgstr "Unsere MvSt."
9+msgstr "Unsere USt-IdNr."
10
11 #. module: invoice_webkit
12 #: report:addons/invoice_webkit/report/account_invoice.mako:241
13@@ -139,12 +139,12 @@
14 #. module: invoice_webkit
15 #: report:addons/invoice_webkit/report/account_invoice.mako:205
16 msgid "Taxes:"
17-msgstr "Steuern:"
18+msgstr "Mwst:"
19
20 #. module: invoice_webkit
21 #: report:addons/invoice_webkit/report/account_invoice.mako:153
22-msgid "Our Ref."
23-msgstr "Unsere Ref."
24+msgid "Our Reference"
25+msgstr "Unsere Referenz"
26
27 #. module: invoice_webkit
28 #: constraint:account.invoice:0
29@@ -159,7 +159,7 @@
30 #. module: invoice_webkit
31 #: report:addons/invoice_webkit/report/account_invoice.mako:225
32 msgid "Base"
33-msgstr "Basis"
34+msgstr "Steuergrundbetrag"
35
36 #. module: invoice_webkit
37 #: field:account.condition_text_webkit,text:0
38@@ -259,7 +259,7 @@
39 #. module: invoice_webkit
40 #: report:addons/invoice_webkit/report/account_invoice.mako:224
41 msgid "Rate"
42-msgstr "Rate"
43+msgstr "Mwst. %"
44
45 #. module: invoice_webkit
46 #: field:account.condition_text_webkit,name:0
47@@ -286,12 +286,12 @@
48 #. module: invoice_webkit
49 #: report:addons/invoice_webkit/report/account_invoice.mako:176
50 msgid "Net Sub Total"
51-msgstr "Net Sub Total"
52+msgstr "Netto"
53
54 #. module: invoice_webkit
55 #: report:addons/invoice_webkit/report/account_invoice.mako:199
56 msgid "Net :"
57-msgstr "Net :"
58+msgstr "Netto :"
59
60 #. module: invoice_webkit
61 #: report:addons/invoice_webkit/report/account_invoice.mako:0
62
63=== modified file 'invoice_webkit/i18n/en.po'
64--- invoice_webkit/i18n/en.po 2013-02-08 13:49:46 +0000
65+++ invoice_webkit/i18n/en.po 2013-02-20 11:35:37 +0000
66@@ -164,8 +164,8 @@
67
68 #. module: invoice_webkit
69 #: report:addons/invoice_webkit/report/account_invoice.mako:153
70-msgid "Our Ref."
71-msgstr "Our Ref."
72+msgid "Our Reference"
73+msgstr "Our Reference"
74
75 #. module: invoice_webkit
76 #: constraint:account.invoice:0
77
78=== modified file 'invoice_webkit/i18n/fr.po'
79--- invoice_webkit/i18n/fr.po 2013-02-08 13:49:46 +0000
80+++ invoice_webkit/i18n/fr.po 2013-02-20 11:35:37 +0000
81@@ -168,12 +168,12 @@
82 #. module: invoice_webkit
83 #: report:addons/invoice_webkit/report/account_invoice.mako:205
84 msgid "Taxes:"
85-msgstr "Taxes:"
86+msgstr "TVA:"
87
88 #. module: invoice_webkit
89 #: report:addons/invoice_webkit/report/account_invoice.mako:153
90-msgid "Our Ref."
91-msgstr "Notre Ref."
92+msgid "Our Reference"
93+msgstr "Notre Référence"
94
95 #. module: invoice_webkit
96 #: constraint:account.invoice:0
97@@ -188,7 +188,7 @@
98 #. module: invoice_webkit
99 #: report:addons/invoice_webkit/report/account_invoice.mako:225
100 msgid "Base"
101-msgstr "Base"
102+msgstr "HT"
103
104 #. module: invoice_webkit
105 #: field:account.condition_text_webkit,text:0
106@@ -266,7 +266,7 @@
107 #. module: invoice_webkit
108 #: report:addons/invoice_webkit/report/account_invoice.mako:226
109 msgid "Tax"
110-msgstr "Taxe"
111+msgstr "TVA"
112
113 #. module: invoice_webkit
114 #: report:addons/invoice_webkit/report/account_invoice.mako:173
115@@ -315,7 +315,7 @@
116 #. module: invoice_webkit
117 #: report:addons/invoice_webkit/report/account_invoice.mako:199
118 msgid "Net :"
119-msgstr "Net :"
120+msgstr "HT :"
121
122 #. module: invoice_webkit
123 #: report:addons/invoice_webkit/report/account_invoice.mako:0
124
125=== modified file 'invoice_webkit/report/account_invoice.mako'
126--- invoice_webkit/report/account_invoice.mako 2013-02-14 09:13:42 +0000
127+++ invoice_webkit/report/account_invoice.mako 2013-02-20 11:35:37 +0000
128@@ -215,13 +215,13 @@
129 <tr>
130 <th class="date">${_("Invoice Date")}</td>
131 <th class="date">${_("Due Date")}</td>
132- <th style="text-align:left; width: 120px;">${_("Responsible")}</td>
133- <th style="text-align:left;">${_("Our Ref.")}</td>
134+ <th style="text-align:center; width: 120px;">${_("Responsible")}</td>
135+ <th style="text-align:left;">${_("Our Reference")}</td>
136 </tr>
137 <tr>
138 <td class="date">${formatLang(inv.date_invoice, date=True)}</td>
139 <td class="date">${formatLang(inv.date_due, date=True)}</td>
140- <td style="text-align:left; width: 120px;">${inv.user_id and inv.user_id.name or ''}</td>
141+ <td style="text-align:center; width: 120px;">${inv.user_id and inv.user_id.name or ''}</td>
142 <td style="text-align:left;">${inv.origin or ''}</td>
143 </tr>
144 </table>
145@@ -286,7 +286,7 @@
146 </tfoot>
147 </table>
148 <br/>
149- <table class="list_total_table" width="40%" >
150+ <table class="list_total_table" width="60%" >
151 <tr>
152 <th style="text-align:left;">${_("Rate")}</th>
153 <th>${_("Base")}</th>
154@@ -326,7 +326,7 @@
155 </tr>
156 <tr>
157 <th style="width:20%;">${_("Bank account")}</th>
158- <td style="width:30%;text-align:left;">${ inv_bank and inv_bank.acc_number or '-' }</td>
159+ <td style="width:50%;text-align:left;">${ inv_bank and inv_bank.acc_number or '-' }</td>
160 <th style="width:20%;">${_("Our VAT No")}</th>
161 <td style="width:30%;" class="vat">${inv.company_id.partner_id.vat or '-'}</td>
162 </tr>

Subscribers

People subscribed via source and target branches