diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot index 748f8bc3f64..50f31d40ce6 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.saas~14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-03-24 15:43+0000\n" +"PO-Revision-Date: 2017-03-24 15:43+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -122,6 +122,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" @@ -137,7 +139,7 @@ msgid "\n" " \n" " \n" " \n" " \n" "
\n" -" \"${user.company_id.name}\"\n" +" \"${company.name}\"\n" "
\n" @@ -163,16 +165,16 @@ msgid "\n" " \n" " \n" " \n" " \n" @@ -508,11 +510,6 @@ msgstr "" msgid "Create a Quotation, the first step of a new sale." msgstr "" -#. module: sale -#: selection:product.template,track_service:0 -msgid "Create a task and track hours" -msgstr "" - #. module: sale #: model:ir.ui.view,arch_db:sale.view_sale_advance_payment_inv msgid "Create and View Invoices" @@ -573,6 +570,7 @@ msgid "Customer Reference" msgstr "" #. module: sale +#: model:ir.model.fields,field_description:sale.field_product_product_taxes_id #: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_deposit_taxes_id msgid "Customer Taxes" msgstr "" @@ -773,6 +771,11 @@ msgstr "" msgid "Email composition wizard" msgstr "" +#. module: sale +#: model:ir.model.fields,field_description:sale.field_product_product_property_account_expense_id +msgid "Expense Account" +msgstr "" + #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order_validity_date msgid "Expiration Date" @@ -841,6 +844,7 @@ msgid "If the sale is locked, you can not modify it anymore. However, you will s msgstr "" #. module: sale +#: model:ir.model.fields,field_description:sale.field_product_product_property_account_income_id #: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_deposit_account_id msgid "Income Account" msgstr "" @@ -1177,6 +1181,8 @@ msgstr "" #. module: sale #: code:addons/sale/models/sale.py:102 +#: code:addons/sale/models/sale.py:253 +#: code:addons/sale/models/sale.py:254 #, python-format msgid "New" msgstr "" @@ -1203,17 +1209,12 @@ msgid "No longer edit orders once confirmed" 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 Sales 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 Sales 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 @@ -2203,6 +2204,16 @@ msgstr "" msgid "This Year" msgstr "" +#. module: sale +#: model:ir.model.fields,help:sale.field_product_product_property_account_expense_id +msgid "This account will be used for invoices instead of the default one to value expenses for the current product." +msgstr "" + +#. module: sale +#: model:ir.model.fields,help:sale.field_product_product_property_account_income_id +msgid "This account will be used for invoices instead of the default one to value sales for the current product." +msgstr "" + #. module: sale #: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale msgid "This adds the choice of a currency on pricelists." @@ -2234,11 +2245,6 @@ msgstr "" msgid "Timesheets" msgstr "" -#. module: sale -#: selection:product.template,track_service:0 -msgid "Timesheets on project" -msgstr "" - #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order_line_qty_to_invoice #: model:ir.ui.view,arch_db:sale.sale_order_view_search_inherit_sale @@ -2374,6 +2380,11 @@ msgstr "" msgid "VAT:" msgstr "" +#. module: sale +#: model:ir.model.fields,field_description:sale.field_product_product_supplier_taxes_id +msgid "Vendor Taxes" +msgstr "" + #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_report_volume msgid "Volume" @@ -2455,17 +2466,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 Sales 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 Sales 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" "