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: 20
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: 68 lines (+20/-0)
4 files modified
invoice_webkit/i18n/de.po (+6/-0)
invoice_webkit/i18n/en.po (+6/-0)
invoice_webkit/i18n/fr.po (+6/-0)
invoice_webkit/report/account_invoice.mako (+2/-0)
To merge this branch: bzr merge lp:~camptocamp/account-invoice-report/account_invoice_report_VRE
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp code review, no test Approve
Review via email: mp+147367@code.launchpad.net

Description of the change

Add Responsible field in report + translationa

To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

LGTM

review: Approve (code review, no test)
lp:~camptocamp/account-invoice-report/account_invoice_report_VRE updated
20. By Vincent Renaville@camptocamp

[MRG] Add Responsible field in report + translation

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-05 12:39:43 +0000
3+++ invoice_webkit/i18n/de.po 2013-02-08 13:51:22 +0000
4@@ -177,6 +177,12 @@
5 msgstr "Zahlbar bis"
6
7 #. module: invoice_webkit
8+#: report:addons/invoice_webkit/report/account_invoice.mako:211
9+msgid "Responsible"
10+msgstr "Verantwortlich"
11+
12+
13+#. module: invoice_webkit
14 #: selection:account.condition_text_webkit,type:0
15 #: field:account.invoice,note2_webkit:0
16 #: field:account.invoice,text_condition2_webkit:0
17
18=== modified file 'invoice_webkit/i18n/en.po'
19--- invoice_webkit/i18n/en.po 2013-02-05 12:00:28 +0000
20+++ invoice_webkit/i18n/en.po 2013-02-08 13:51:22 +0000
21@@ -235,6 +235,12 @@
22 msgstr "Refund"
23
24 #. module: invoice_webkit
25+#: report:addons/invoice_webkit/report/account_invoice.mako:211
26+msgid "Responsible"
27+msgstr "Responsible"
28+
29+
30+#. module: invoice_webkit
31 #: model:ir.actions.act_window,name:invoice_webkit.action_invoice_condition_form_webkit
32 #: model:ir.actions.act_window,name:invoice_webkit.action_invoice_condition_webkit
33 msgid "account.condition_text"
34
35=== modified file 'invoice_webkit/i18n/fr.po'
36--- invoice_webkit/i18n/fr.po 2013-02-05 15:24:27 +0000
37+++ invoice_webkit/i18n/fr.po 2013-02-08 13:51:22 +0000
38@@ -62,6 +62,12 @@
39 msgstr "Ligne de Facturation"
40
41 #. module: invoice_webkit
42+#: report:addons/invoice_webkit/report/account_invoice.mako:211
43+msgid "Responsible"
44+msgstr "Responsable"
45+
46+
47+#. module: invoice_webkit
48 #: model:ir.actions.act_window,name:invoice_webkit.action_invoice_condition_form_webkit
49 #: model:ir.actions.act_window,name:invoice_webkit.action_invoice_condition_webkit
50 msgid "account.condition_text"
51
52=== modified file 'invoice_webkit/report/account_invoice.mako'
53--- invoice_webkit/report/account_invoice.mako 2013-02-07 09:52:05 +0000
54+++ invoice_webkit/report/account_invoice.mako 2013-02-08 13:51:22 +0000
55@@ -211,11 +211,13 @@
56 <tr>
57 <th class="date">${_("Invoice Date")}</td>
58 <th class="date">${_("Due Date")}</td>
59+ <th style="text-align:left; width: 120px;">${_("Responsible")}</td>
60 <th style="text-align:left;">${_("Our Ref.")}</td>
61 </tr>
62 <tr>
63 <td class="date">${formatLang(inv.date_invoice, date=True)}</td>
64 <td class="date">${formatLang(inv.date_due, date=True)}</td>
65+ <td style="text-align:left; width: 120px;">${inv.user_id and inv.user_id.name or ''}</td>
66 <td style="text-align:left;">${inv.origin or ''}</td>
67 </tr>
68 </table>

Subscribers

People subscribed via source and target branches