Account - Invoicing Reports

Merge lp:~camptocamp/account-invoice-report/7.0-invoice-webkit-add-reference into lp:~account-core-editors/account-invoice-report/7.0

  1. 7.0-invoice-webkit-add-reference
  2. Merge into 7.0
Proposed by Guewen Baconnier @ Camptocamp
Status: Merged
Approved by: Yannick Vaucher @ Camptocamp
Approved revision: 45
Merged at revision: 48
Proposed branch: lp:~camptocamp/account-invoice-report/7.0-invoice-webkit-add-reference
Merge into: lp:~account-core-editors/account-invoice-report/7.0
Diff against target: 333 lines (+304/-0)
3 files modified
invoice_webkit/i18n/fr.po (+5/-0)
invoice_webkit/i18n/invoice_webkit.pot (+293/-0)
invoice_webkit/report/account_invoice.mako (+6/-0)
To merge this branch: bzr merge lp:~camptocamp/account-invoice-report/7.0-invoice-webkit-add-reference
Reviewer Review Type Date Requested Status
Yannick Vaucher @ Camptocamp code review, no tests Approve
Joël Grand-Guillaume @ camptocamp code review, no tests Approve
Pedro Manuel Baeza code review Approve
Review via email: mp+203085@code.launchpad.net

Description of the change

Adds the field reference on the invoice report, when it contains a value.

Also added the .pot that was missing.

To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

LGTM

review: Approve (code review)
Revision history for this message
Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c) wrote :

LGTM

review: Approve (code review, no tests)
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

LGTM

review: Approve (code review, no tests)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'invoice_webkit/i18n/fr.po'
--- invoice_webkit/i18n/fr.po 2013-04-08 07:50:45 +0000
+++ invoice_webkit/i18n/fr.po 2014-01-24 14:32:14 +0000
@@ -326,3 +326,8 @@
326#: report:addons/invoice_webkit/report/account_invoice.mako:0326#: report:addons/invoice_webkit/report/account_invoice.mako:0
327msgid "Bank account"327msgid "Bank account"
328msgstr "Compte bancaire"328msgstr "Compte bancaire"
329
330#. module: invoice_webkit
331#: report:addons/invoice_webkit/report/account_invoice.mako:282
332msgid "Your reference"
333msgstr "Votre référence"
329334
=== added file 'invoice_webkit/i18n/invoice_webkit.pot'
--- invoice_webkit/i18n/invoice_webkit.pot 1970-01-01 00:00:00 +0000
+++ invoice_webkit/i18n/invoice_webkit.pot 2014-01-24 14:32:14 +0000
@@ -0,0 +1,293 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * invoice_webkit
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 7.0\n"
8"Report-Msgid-Bugs-To: \n"
9"POT-Creation-Date: 2014-01-24 14:24+0000\n"
10"PO-Revision-Date: 2014-01-24 14:24+0000\n"
11"Last-Translator: <>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: \n"
16"Plural-Forms: \n"
17
18#. module: invoice_webkit
19#: field:account.condition_text,name:0
20#: model:ir.model.fields,field_description:invoice_webkit.field_account_condition_text_name
21msgid "Condition summary"
22msgstr ""
23
24#. module: invoice_webkit
25#: report:addons/invoice_webkit/report/account_invoice.mako:426
26msgid "Bank account"
27msgstr ""
28
29#. module: invoice_webkit
30#: report:addons/invoice_webkit/report/account_invoice.mako:259
31msgid "Cancelled Invoice"
32msgstr ""
33
34#. module: invoice_webkit
35#: report:addons/invoice_webkit/report/account_invoice.mako:405
36msgid "Thank you for your prompt payment"
37msgstr ""
38
39#. module: invoice_webkit
40#: report:addons/invoice_webkit/report/account_invoice.mako:417
41msgid "Customer VAT No"
42msgstr ""
43
44#. module: invoice_webkit
45#: field:account.invoice,text_condition2:0
46#: model:ir.model.fields,field_description:invoice_webkit.field_account_invoice_text_condition2
47msgid "Footer condition"
48msgstr ""
49
50#. module: invoice_webkit
51#: report:addons/invoice_webkit/report/account_invoice.mako:271
52msgid "Subject : "
53msgstr ""
54
55#. module: invoice_webkit
56#: report:addons/invoice_webkit/report/account_invoice.mako:428
57msgid "Our VAT No"
58msgstr ""
59
60#. module: invoice_webkit
61#: report:addons/invoice_webkit/report/account_invoice.mako:263
62msgid "Supplier Invoice"
63msgstr ""
64
65#. module: invoice_webkit
66#: report:addons/invoice_webkit/report/account_invoice.mako:312
67msgid "Unit Price"
68msgstr ""
69
70#. module: invoice_webkit
71#: view:account.invoice:0
72msgid "Your bottom conditions here"
73msgstr ""
74
75#. module: invoice_webkit
76#: field:account.invoice,text_condition1:0
77#: model:ir.model.fields,field_description:invoice_webkit.field_account_invoice_text_condition1
78msgid "Header condition"
79msgstr ""
80
81#. module: invoice_webkit
82#: report:addons/invoice_webkit/report/account_invoice.mako:314
83msgid "Disc.(%)"
84msgstr ""
85
86#. module: invoice_webkit
87#: view:account.invoice:0
88msgid "Conditions"
89msgstr ""
90
91#. module: invoice_webkit
92#: help:product.template,purchase_ok:0
93msgid "Specify if the product can be selected in a purchase order line."
94msgstr ""
95
96#. module: invoice_webkit
97#: selection:account.condition_text,type:0
98msgid "Top condition"
99msgstr ""
100
101#. module: invoice_webkit
102#: report:addons/invoice_webkit/report/account_invoice.mako:309
103msgid "Description"
104msgstr ""
105
106#. module: invoice_webkit
107#: report:addons/invoice_webkit/report/account_invoice.mako:280
108msgid "Our reference"
109msgstr ""
110
111#. module: invoice_webkit
112#: report:addons/invoice_webkit/report/account_invoice.mako:255
113msgid "PRO-FORMA"
114msgstr ""
115
116#. module: invoice_webkit
117#: report:addons/invoice_webkit/report/account_invoice.mako:276
118msgid "Invoice Date"
119msgstr ""
120
121#. module: invoice_webkit
122#: report:addons/invoice_webkit/report/account_invoice.mako:432
123msgid "BIC"
124msgstr ""
125
126#. module: invoice_webkit
127#: report:addons/invoice_webkit/report/account_invoice.mako:364
128msgid "Taxes:"
129msgstr ""
130
131#. module: invoice_webkit
132#: report:addons/invoice_webkit/report/account_invoice.mako:389
133msgid "Base"
134msgstr ""
135
136#. module: invoice_webkit
137#: report:addons/invoice_webkit/report/account_invoice.mako:355
138msgid "Net :"
139msgstr ""
140
141#. module: invoice_webkit
142#: report:addons/invoice_webkit/report/account_invoice.mako:390
143msgid "Tax"
144msgstr ""
145
146#. module: invoice_webkit
147#: field:account.condition_text,type:0
148#: model:ir.model.fields,field_description:invoice_webkit.field_account_condition_text_type
149msgid "type"
150msgstr ""
151
152#. module: invoice_webkit
153#: field:account.condition_text,text:0
154#: model:ir.model.fields,field_description:invoice_webkit.field_account_condition_text_text
155msgid "Condition"
156msgstr ""
157
158#. module: invoice_webkit
159#: view:account.invoice:0
160msgid "Your top conditions here"
161msgstr ""
162
163#. module: invoice_webkit
164#: report:addons/invoice_webkit/report/account_invoice.mako:278
165msgid "Responsible"
166msgstr ""
167
168#. module: invoice_webkit
169#: report:addons/invoice_webkit/report/account_invoice.mako:282
170msgid "Your reference"
171msgstr ""
172
173#. module: invoice_webkit
174#: report:addons/invoice_webkit/report/account_invoice.mako:277
175msgid "Due Date"
176msgstr ""
177
178#. module: invoice_webkit
179#: field:account.invoice,note2:0
180#: model:ir.model.fields,field_description:invoice_webkit.field_account_invoice_note2
181msgid "Footer"
182msgstr ""
183
184#. module: invoice_webkit
185#: model:ir.model.fields,field_description:invoice_webkit.field_product_template_purchase_ok
186#: field:product.template,purchase_ok:0
187msgid "Can be Purchased"
188msgstr ""
189
190#. module: invoice_webkit
191#: report:addons/invoice_webkit/report/account_invoice.mako:311
192msgid "UoM"
193msgstr ""
194
195#. module: invoice_webkit
196#: report:addons/invoice_webkit/report/account_invoice.mako:313
197msgid "Taxes"
198msgstr ""
199
200#. module: invoice_webkit
201#: model:ir.actions.act_window,name:invoice_webkit.action_invoice_condition_form_webkit
202#: model:ir.actions.act_window,name:invoice_webkit.action_invoice_condition_webkit
203msgid "account.condition_text"
204msgstr ""
205
206#. module: invoice_webkit
207#: model:ir.model,name:invoice_webkit.model_product_template
208msgid "Product Template"
209msgstr ""
210
211#. module: invoice_webkit
212#: report:addons/invoice_webkit/report/account_invoice.mako:257
213msgid "Draft Invoice"
214msgstr ""
215
216#. module: invoice_webkit
217#: field:account.invoice.line,formatted_note:0
218#: model:ir.model.fields,field_description:invoice_webkit.field_account_invoice_line_formatted_note
219msgid "Formatted Note"
220msgstr ""
221
222#. module: invoice_webkit
223#: model:ir.model,name:invoice_webkit.model_account_condition_text
224msgid "Invoices conditions"
225msgstr ""
226
227#. module: invoice_webkit
228#: report:addons/invoice_webkit/report/account_invoice.mako:265
229msgid "Refund"
230msgstr ""
231
232#. module: invoice_webkit
233#: report:addons/invoice_webkit/report/account_invoice.mako:373
234msgid "Total:"
235msgstr ""
236
237#. module: invoice_webkit
238#: view:account.condition_text:0
239msgid "Invoice condition text"
240msgstr ""
241
242#. module: invoice_webkit
243#: report:addons/invoice_webkit/report/account_invoice.mako:279
244msgid "Payment Term"
245msgstr ""
246
247#. module: invoice_webkit
248#: model:ir.model,name:invoice_webkit.model_account_invoice_line
249msgid "Invoice Line"
250msgstr ""
251
252#. module: invoice_webkit
253#: report:addons/invoice_webkit/report/account_invoice.mako:310
254msgid "Qty"
255msgstr ""
256
257#. module: invoice_webkit
258#: field:account.invoice,note1:0
259#: model:ir.model.fields,field_description:invoice_webkit.field_account_invoice_note1
260msgid "Header"
261msgstr ""
262
263#. module: invoice_webkit
264#: report:addons/invoice_webkit/report/account_invoice.mako:388
265msgid "Rate"
266msgstr ""
267
268#. module: invoice_webkit
269#: report:addons/invoice_webkit/report/account_invoice.mako:414
270msgid "Bank"
271msgstr ""
272
273#. module: invoice_webkit
274#: report:addons/invoice_webkit/report/account_invoice.mako:261
275#: model:ir.model,name:invoice_webkit.model_account_invoice
276msgid "Invoice"
277msgstr ""
278
279#. module: invoice_webkit
280#: report:addons/invoice_webkit/report/account_invoice.mako:267
281msgid "Supplier Refund"
282msgstr ""
283
284#. module: invoice_webkit
285#: report:addons/invoice_webkit/report/account_invoice.mako:315
286msgid "Net Sub Total"
287msgstr ""
288
289#. module: invoice_webkit
290#: selection:account.condition_text,type:0
291msgid "Bottom condition"
292msgstr ""
293
0294
=== modified file 'invoice_webkit/report/account_invoice.mako'
--- invoice_webkit/report/account_invoice.mako 2013-11-21 14:53:04 +0000
+++ invoice_webkit/report/account_invoice.mako 2014-01-24 14:32:14 +0000
@@ -278,6 +278,9 @@
278 <th style="text-align:center;width:120px;">${_("Responsible")}</td>278 <th style="text-align:center;width:120px;">${_("Responsible")}</td>
279 <th style="text-align:center">${_("Payment Term")}</td>279 <th style="text-align:center">${_("Payment Term")}</td>
280 <th style="text-align:center">${_("Our reference")}</td>280 <th style="text-align:center">${_("Our reference")}</td>
281 %if inv.reference:
282 <th style="text-align:center">${_("Your reference")}</td>
283 %endif
281 </tr>284 </tr>
282 <tr>285 <tr>
283 <td class="date">${formatLang(inv.date_invoice, date=True)}</td>286 <td class="date">${formatLang(inv.date_invoice, date=True)}</td>
@@ -285,6 +288,9 @@
285 <td style="text-align:center;width:120px;">${inv.user_id and inv.user_id.name or ''}</td>288 <td style="text-align:center;width:120px;">${inv.user_id and inv.user_id.name or ''}</td>
286 <td style="text-align:center">${inv.payment_term and inv.payment_term.note or ''}</td>289 <td style="text-align:center">${inv.payment_term and inv.payment_term.note or ''}</td>
287 <td style="text-align:center">${inv.origin or ''}</td>290 <td style="text-align:center">${inv.origin or ''}</td>
291 %if inv.reference:
292 <td style="text-align:center">${inv.reference}</td>
293 %endif
288 </tr>294 </tr>
289 </table>295 </table>
290296

Subscribers

People subscribed via source and target branches