diff --git a/addons/sale/data/mail_data.xml b/addons/sale/data/mail_data.xml index ce8dcc651a1..134ebd7b7b7 100644 --- a/addons/sale/data/mail_data.xml +++ b/addons/sale/data/mail_data.xml @@ -69,7 +69,7 @@ % set is_online = access_action and access_action['type'] == 'ir.actions.act_url' % set doc_name = 'quotation' if object.state in ('draft', 'sent') else 'order confirmation' % set pay_sign_name = object.get_portal_confirmation_action() -% set access_name = is_online and object.state in ('draft', 'sent') and pay_sign_name in ('pay', 'sign') and 'Accept and %s online' % pay_sign_name or 'View %s' % doc_name +% set access_name = is_online and object.state in ('draft', 'sent') and pay_sign_name == 'pay' and 'Accept and pay online' or pay_sign_name == 'sign' and 'Accept and sign online' or 'View %s' % doc_name % set access_url = is_online and object.get_mail_url() or '' % if object.partner_id.parent_id: diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot index 9863dacf0b8..9ec564202ad 100644 --- a/addons/sale/i18n/sale.pot +++ b/addons/sale/i18n/sale.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-25 08:14+0000\n" -"PO-Revision-Date: 2018-06-25 08:14+0000\n" +"POT-Creation-Date: 2018-06-27 10:38+0000\n" +"PO-Revision-Date: 2018-06-27 10:38+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ msgid "\n" "% set is_online = access_action and access_action['type'] == 'ir.actions.act_url'\n" "% set doc_name = 'quotation' if object.state in ('draft', 'sent') else 'order confirmation'\n" "% set pay_sign_name = object.get_portal_confirmation_action()\n" -"% set access_name = is_online and object.state in ('draft', 'sent') and pay_sign_name in ('pay', 'sign') and 'Accept and %s online' % pay_sign_name or 'View %s' % doc_name\n" +"% set access_name = is_online and object.state in ('draft', 'sent') and pay_sign_name == 'pay' and 'Accept and pay online' or pay_sign_name == 'sign' and 'Accept and sign online' or 'View %s' % doc_name\n" "% set access_url = is_online and object.get_mail_url() or ''\n" "\n" "% if object.partner_id.parent_id:\n" @@ -741,6 +741,12 @@ msgstr "" msgid "Delivery address for current sales order." msgstr "" +#. module: sale +#: model:product.product,name:sale.advance_product_0 +#: model:product.template,name:sale.advance_product_0_product_template +msgid "Deposit" +msgstr "" + #. module: sale #: model:ir.model.fields,field_description:sale.field_res_config_settings__deposit_default_product_id msgid "Deposit Product" @@ -2216,6 +2222,11 @@ msgstr "" msgid "Sell and purchase products in different units of measure" msgstr "" +#. module: sale +#: model:ir.model.fields,field_description:sale.field_res_config_settings__module_website_sale_digital +msgid "Sell digital products - provide downloadable content on your customer portal" +msgstr "" + #. module: sale #: model:ir.ui.view,arch_db:sale.res_config_settings_view_form msgid "Sell products by multiple of unit # per package"