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

[Guewen Baconnier @ Camptocamp]

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

Also added the .pot that was missing.

[Pedro Manuel Baeza (pedro.baeza)]

LGTM

review: Approve (code review)

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

LGTM

review: Approve (code review, no tests)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

LGTM

review: Approve (code review, no tests)

=== 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 @@
 #: report:addons/invoice_webkit/report/account_invoice.mako:0
 msgid "Bank account"
 msgstr "Compte bancaire"
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:282
+msgid "Your reference"
+msgstr "Votre référence"

=== 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 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* invoice_webkit
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-24 14:24+0000\n"
+"PO-Revision-Date: 2014-01-24 14:24+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: invoice_webkit
+#: field:account.condition_text,name:0
+#: model:ir.model.fields,field_description:invoice_webkit.field_account_condition_text_name
+msgid "Condition summary"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:426
+msgid "Bank account"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:259
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:405
+msgid "Thank you for your prompt payment"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:417
+msgid "Customer VAT No"
+msgstr ""
+
+#. module: invoice_webkit
+#: field:account.invoice,text_condition2:0
+#: model:ir.model.fields,field_description:invoice_webkit.field_account_invoice_text_condition2
+msgid "Footer condition"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:271
+msgid "Subject : "
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:428
+msgid "Our VAT No"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:263
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:312
+msgid "Unit Price"
+msgstr ""
+
+#. module: invoice_webkit
+#: view:account.invoice:0
+msgid "Your bottom conditions here"
+msgstr ""
+
+#. module: invoice_webkit
+#: field:account.invoice,text_condition1:0
+#: model:ir.model.fields,field_description:invoice_webkit.field_account_invoice_text_condition1
+msgid "Header condition"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:314
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: invoice_webkit
+#: view:account.invoice:0
+msgid "Conditions"
+msgstr ""
+
+#. module: invoice_webkit
+#: help:product.template,purchase_ok:0
+msgid "Specify if the product can be selected in a purchase order line."
+msgstr ""
+
+#. module: invoice_webkit
+#: selection:account.condition_text,type:0
+msgid "Top condition"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:309
+msgid "Description"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:280
+msgid "Our reference"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:255
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:276
+msgid "Invoice Date"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:432
+msgid "BIC"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:364
+msgid "Taxes:"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:389
+msgid "Base"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:355
+msgid "Net :"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:390
+msgid "Tax"
+msgstr ""
+
+#. module: invoice_webkit
+#: field:account.condition_text,type:0
+#: model:ir.model.fields,field_description:invoice_webkit.field_account_condition_text_type
+msgid "type"
+msgstr ""
+
+#. module: invoice_webkit
+#: field:account.condition_text,text:0
+#: model:ir.model.fields,field_description:invoice_webkit.field_account_condition_text_text
+msgid "Condition"
+msgstr ""
+
+#. module: invoice_webkit
+#: view:account.invoice:0
+msgid "Your top conditions here"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:278
+msgid "Responsible"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:282
+msgid "Your reference"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:277
+msgid "Due Date"
+msgstr ""
+
+#. module: invoice_webkit
+#: field:account.invoice,note2:0
+#: model:ir.model.fields,field_description:invoice_webkit.field_account_invoice_note2
+msgid "Footer"
+msgstr ""
+
+#. module: invoice_webkit
+#: model:ir.model.fields,field_description:invoice_webkit.field_product_template_purchase_ok
+#: field:product.template,purchase_ok:0
+msgid "Can be Purchased"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:311
+msgid "UoM"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:313
+msgid "Taxes"
+msgstr ""
+
+#. module: invoice_webkit
+#: model:ir.actions.act_window,name:invoice_webkit.action_invoice_condition_form_webkit
+#: model:ir.actions.act_window,name:invoice_webkit.action_invoice_condition_webkit
+msgid "account.condition_text"
+msgstr ""
+
+#. module: invoice_webkit
+#: model:ir.model,name:invoice_webkit.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:257
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: invoice_webkit
+#: field:account.invoice.line,formatted_note:0
+#: model:ir.model.fields,field_description:invoice_webkit.field_account_invoice_line_formatted_note
+msgid "Formatted Note"
+msgstr ""
+
+#. module: invoice_webkit
+#: model:ir.model,name:invoice_webkit.model_account_condition_text
+msgid "Invoices conditions"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:265
+msgid "Refund"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:373
+msgid "Total:"
+msgstr ""
+
+#. module: invoice_webkit
+#: view:account.condition_text:0
+msgid "Invoice condition text"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:279
+msgid "Payment Term"
+msgstr ""
+
+#. module: invoice_webkit
+#: model:ir.model,name:invoice_webkit.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:310
+msgid "Qty"
+msgstr ""
+
+#. module: invoice_webkit
+#: field:account.invoice,note1:0
+#: model:ir.model.fields,field_description:invoice_webkit.field_account_invoice_note1
+msgid "Header"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:388
+msgid "Rate"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:414
+msgid "Bank"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:261
+#: model:ir.model,name:invoice_webkit.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:267
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: invoice_webkit
+#: report:addons/invoice_webkit/report/account_invoice.mako:315
+msgid "Net Sub Total"
+msgstr ""
+
+#. module: invoice_webkit
+#: selection:account.condition_text,type:0
+msgid "Bottom condition"
+msgstr ""
+

=== 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 @@
             <th style="text-align:center;width:120px;">${_("Responsible")}</td>
             <th style="text-align:center">${_("Payment Term")}</td>
             <th style="text-align:center">${_("Our reference")}</td>
+            %if inv.reference:
+                <th style="text-align:center">${_("Your reference")}</td>
+            %endif
         </tr>
         <tr>
             <td class="date">${formatLang(inv.date_invoice, date=True)}</td>
@@ -285,6 +288,9 @@
             <td style="text-align:center;width:120px;">${inv.user_id and inv.user_id.name or ''}</td>
             <td style="text-align:center">${inv.payment_term and inv.payment_term.note or ''}</td>
             <td style="text-align:center">${inv.origin or ''}</td>
+            %if inv.reference:
+                <td style="text-align:center">${inv.reference}</td>
+            %endif
         </tr>
     </table>