From 88749790d1259dea8ab4996f8294627298816377 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Mon, 9 May 2016 12:36:39 +0200
Subject: [PATCH] [FIX] sale: outdated .pot file
Was having content of website_quote
---
addons/sale/i18n/sale.pot | 35 ++++++++++++++++++++++++++---------
1 file changed, 26 insertions(+), 9 deletions(-)
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index f5ed25cb7087..d5d9598b47d5 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-21 14:07+0000\n"
-"PO-Revision-Date: 2015-01-21 14:07+0000\n"
+"POT-Creation-Date: 2016-05-09 10:33+0000\n"
+"PO-Revision-Date: 2016-05-09 10:33+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgid "\n"
" <strong>REFERENCES</strong><br />\n"
" Order number: <strong>${object.name}</strong><br />\n"
" Order total: <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong><br />\n"
-" Order date: ${object.date_order}<br />\n"
+" Order date: ${format_tz(object.date_order, tz=user.tz, context={'lang':object.partner_id.lang})} <br />\n"
" % if object.origin:\n"
" Order reference: ${object.origin}<br />\n"
" % endif\n"
@@ -39,17 +39,12 @@ msgid "\n"
" Your contact: <a href=\"mailto:${object.user_id.email or ''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
" % endif\n"
" </p>\n"
-" <p>\n"
-" You can view your quotation online:\n"
-" </p>\n"
-" <a style=\"display:block; width: 150px; height:20px; margin-left: 120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;\"\n"
-" href=\"/quote/${object.id}/${object.access_token}\">View ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'}</a>\n"
"\n"
" % if object.paypal_url:\n"
" <br/>\n"
" <p>It is also possible to directly pay with Paypal:</p>\n"
" <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
-" <img class=\"oe_edi_paypal_button\" src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+" <img class=\"oe_edi_paypal_button\" src=\"/sale/static/img/btn_paynowcc_lg.gif\"/>\n"
" </a>\n"
" % endif\n"
"\n"
@@ -512,6 +507,7 @@ msgid "Confirmation Date"
msgstr ""
#. module: sale
+#: view:sale.order.line:sale.view_sales_order_line_filter
#: selection:sale.order.line,state:0
msgid "Confirmed"
msgstr ""
@@ -704,6 +700,16 @@ msgstr ""
msgid "Discount on lines"
msgstr ""
+#. module: sale
+#: field:sale.advance.payment.inv,display_name:0
+#: field:sale.make.invoice,display_name:0
+#: field:sale.order,display_name:0
+#: field:sale.order.line,display_name:0
+#: field:sale.order.line.make.invoice,display_name:0
+#: field:sale.report,display_name:0
+msgid "Display Name"
+msgstr ""
+
#. module: sale
#: field:sale.config.settings,module_sale_margin:0
msgid "Display margins on sales orders"
@@ -1060,6 +1066,16 @@ msgstr ""
msgid "Last Message Date"
msgstr ""
+#. module: sale
+#: field:sale.advance.payment.inv,__last_update:0
+#: field:sale.make.invoice,__last_update:0
+#: field:sale.order,__last_update:0
+#: field:sale.order.line,__last_update:0
+#: field:sale.order.line.make.invoice,__last_update:0
+#: field:sale.report,__last_update:0
+msgid "Last Modified on"
+msgstr ""
+
#. module: sale
#: field:sale.advance.payment.inv,write_uid:0
#: field:sale.make.invoice,write_uid:0
@@ -1419,6 +1435,7 @@ msgstr ""
#. module: sale
#: selection:sale.order,state:0
+#: selection:sale.report,state:0
msgid "Quotation Sent"
msgstr ""
--
GitLab