From 5280fda72f139b3fb1fb96c505a2371f62236ce7 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 26 May 2017 11:22:58 +0200 Subject: [PATCH] [I18N] sale: update source terms Recent changes in mail.templates not reflected --- addons/sale/i18n/sale.pot | 78 ++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 33 deletions(-) diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot index f3602b49c9b..2e2a0ae47e0 100644 --- a/addons/sale/i18n/sale.pot +++ b/addons/sale/i18n/sale.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-14 15:53+0000\n" -"PO-Revision-Date: 2016-11-14 15:53+0000\n" +"POT-Creation-Date: 2017-05-26 09:19+0000\n" +"PO-Revision-Date: 2017-05-26 09:19+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -19,11 +19,11 @@ msgstr "" #: model:mail.template,body_html:sale.email_template_edi_sale msgid "\n" "

Dear ${object.partner_id.name}\n" -"% set access_action = object.get_access_action()\n" +"% set access_action = object.with_context(force_website=True).get_access_action()\n" "% set doc_name = 'quotation' if object.state in ('draft', 'sent') else 'order confirmation'\n" "% set is_online = access_action and access_action['type'] == 'ir.actions.act_url'\n" -"% set access_name = is_online and object.template_id and 'Accept and pay %s online' % doc_name or 'View %s' % doc_name\n" -"% set access_url = is_online and access_action['url'] or object.get_signup_url()\n" +"% set access_name = is_online and object.template_id and doc_name == 'quotation' and 'Accept and pay %s online' % doc_name or 'View %s' % doc_name\n" +"% set access_url = is_online and access_action['url'] or None\n" "\n" "% if object.partner_id.parent_id:\n" " (${object.partner_id.parent_id.name})\n" @@ -87,6 +87,7 @@ msgstr "" #. module: sale #: model:ir.model.fields,field_description:sale.field_res_partner_sale_order_count +#: model:ir.model.fields,field_description:sale.field_res_users_sale_order_count msgid "# of Sales Order" msgstr "" @@ -127,6 +128,8 @@ msgstr "" #: model:mail.template,body_html:sale.mail_template_data_notification_email_sale_order msgid "\n" " \n" +" % set record = ctx.get('record')\n" +" % set company = record and record.company_id or user.company_id\n" " \n" " \n" " \n" @@ -142,7 +145,7 @@ msgid "\n" " \n" " \n" " \n" " \n" "
\n" -" \"${user.company_id.name}\"\n" +" \"${company.name}\"\n" "
\n" @@ -168,16 +171,16 @@ msgid "\n" " \n" " \n" " \n" " \n" @@ -618,7 +621,9 @@ msgid "Delivered" msgstr "" #. module: sale +#: code:addons/sale/models/sale.py:715 #: model:ir.ui.view,arch_db:sale.view_order_form +#, python-format msgid "Delivered Quantity" msgstr "" @@ -773,11 +778,6 @@ msgstr "" msgid "Email composition wizard" msgstr "" -#. module: sale -#: model:ir.model,name:sale.model_survey_mail_compose_message -msgid "Email composition wizard for Survey" -msgstr "" - #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order_validity_date msgid "Expiration Date" @@ -788,6 +788,12 @@ msgstr "" msgid "Extended Filters" msgstr "" +#. module: sale +#: code:addons/sale/models/sale.py:688 +#, python-format +msgid "Extra line with %s " +msgstr "" + #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order_fiscal_position_id msgid "Fiscal Position" @@ -945,7 +951,9 @@ msgid "Invoiced" msgstr "" #. module: sale +#: code:addons/sale/models/sale.py:716 #: model:ir.ui.view,arch_db:sale.view_order_form +#, python-format msgid "Invoiced Quantity" msgstr "" @@ -1105,6 +1113,7 @@ msgstr "" #. module: sale #: model:ir.model.fields,field_description:sale.field_res_partner_sale_warn_msg +#: model:ir.model.fields,field_description:sale.field_res_users_sale_warn_msg msgid "Message for Sales Order" msgstr "" @@ -1141,7 +1150,9 @@ msgid "Never allow to modify a confirmed sales order" msgstr "" #. module: sale -#: code:addons/sale/models/sale.py:102 +#: code:addons/sale/models/sale.py:110 +#: code:addons/sale/models/sale.py:261 +#: code:addons/sale/models/sale.py:262 #, python-format msgid "New" msgstr "" @@ -1178,17 +1189,12 @@ msgid "No variants on products" msgstr "" #. module: sale +#: model:ir.actions.act_window,help:sale.action_quotations #: model:ir.actions.act_window,help:sale.action_quotations_salesteams msgid "Note that once a Quotation becomes a Sale Order, it will be moved\n" " from the Quotations list to the Sales Order list." msgstr "" -#. module: sale -#: model:ir.actions.act_window,help:sale.action_quotations -msgid "Note that once a Quotation becomes a Sale Order, it will be moved\n" -" from the Quotations list to the Sales Order list." -msgstr "" - #. module: sale #: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order #: model:ir.actions.act_window,help:sale.action_orders_salesteams @@ -1283,7 +1289,9 @@ msgid "Ordered Qty" msgstr "" #. module: sale +#: code:addons/sale/models/sale.py:713 #: model:ir.ui.view,arch_db:sale.view_order_form +#, python-format msgid "Ordered Quantity" msgstr "" @@ -1700,6 +1708,8 @@ msgstr "" #: model:ir.model,name:sale.model_sale_order #: model:ir.model.fields,field_description:sale.field_res_partner_sale_order_ids #: model:ir.model.fields,field_description:sale.field_res_partner_sale_warn +#: model:ir.model.fields,field_description:sale.field_res_users_sale_order_ids +#: model:ir.model.fields,field_description:sale.field_res_users_sale_warn #: model:ir.ui.view,arch_db:sale.view_order_form #: model:ir.ui.view,arch_db:sale.view_sales_order_filter #: model:res.request.link,name:sale.req_link_sale_order @@ -1823,6 +1833,7 @@ msgstr "" #: model:ir.model.fields,help:sale.field_product_product_sale_line_warn #: model:ir.model.fields,help:sale.field_product_template_sale_line_warn #: model:ir.model.fields,help:sale.field_res_partner_sale_warn +#: model:ir.model.fields,help:sale.field_res_users_sale_warn msgid "Selecting the \"Warning\" option will notify user with the message, Selecting \"Blocking Message\" will throw an exception with the message and block the flow. The Message has to be written in the next field." msgstr "" @@ -2004,19 +2015,25 @@ msgstr "" msgid "The analytic account related to a sales order." msgstr "" +#. module: sale +#: code:addons/sale/models/sale.py:709 +#, python-format +msgid "The ordered quantity has been decreased. Do not forget to take it into account on your invoices and delivery orders." +msgstr "" + #. module: sale #: model:ir.model.fields,help:sale.field_sale_config_settings_group_display_incoterm msgid "The printed reports will display the incoterms for the sales orders and the related invoices" msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_make_invoice_advance.py:147 +#: code:addons/sale/wizard/sale_make_invoice_advance.py:148 #, python-format msgid "The product used to invoice a down payment should be of type 'Service'. Please use another product or update this product." msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_make_invoice_advance.py:145 +#: code:addons/sale/wizard/sale_make_invoice_advance.py:146 #, python-format msgid "The product used to invoice a down payment should have an invoice policy set to \"Ordered quantities\". Please update your deposit product to be able to create a deposit invoice." msgstr "" @@ -2255,17 +2272,12 @@ msgid "You will find here all orders that are ready to be invoiced." msgstr "" #. module: sale +#: model:ir.actions.act_window,help:sale.action_quotations #: model:ir.actions.act_window,help:sale.action_quotations_salesteams msgid "Your next actions should flow efficiently: confirm the Quotation\n" " to a Sale Order, then create the Invoice and collect the Payment." msgstr "" -#. module: sale -#: model:ir.actions.act_window,help:sale.action_quotations -msgid "Your next actions should flow efficiently: confirm the Quotation\n" -" to a Sale Order, then create the Invoice and collect the Payment." -msgstr "" - #. module: sale #: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order #: model:ir.actions.act_window,help:sale.action_orders_salesteams
\n" -" ${user.company_id.name}
\n" -" ${user.company_id.phone or ''}\n" +" ${company.name}
\n" +" ${company.phone or ''}\n" " 		\n" -" % if user.company_id.email:\n" -" ${user.company_id.email}
\n" +" % if company.email:\n" +" ${company.email}
\n" " % endif\n" -" % if user.company_id.website:\n" -" \n" -" ${user.company_id.website}\n" +" % if company.website:\n" +" \n" +" ${company.website}\n" " \n" " % endif\n" "