diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index 678b7841529..89f78e8405c 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-12 15:37+0000\n" -"PO-Revision-Date: 2018-03-12 15:37+0000\n" +"POT-Creation-Date: 2018-04-27 14:47+0000\n" +"PO-Revision-Date: 2018-04-27 14:47+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -18,7 +18,6 @@ msgstr "" #. module: account #: model:ir.model.fields,help:account.field_account_invoice_state msgid " * The 'Draft' status is used when a user is encoding a new and unconfirmed Invoice.\n" -" * The 'Pro-forma' status is used when the invoice does not have an invoice number.\n" " * The 'Open' status is used when user creates invoice, an invoice number is generated. It stays in the open status till the user pays the invoice.\n" " * The 'Paid' status is set automatically when the invoice is paid. Its related journal entries may or may not be reconciled.\n" " * The 'Cancelled' status is used when user cancel invoice." @@ -170,7 +169,7 @@ msgstr "" #: model:mail.template,body_html:account.mail_template_data_notification_email_account_invoice msgid "
\n" "% set record = ctx.get('record')\n" -"% set company = record and record.company_id or user.company_id\n" +"% set company = record and record.company_id or ctx.get('company')\n" "\n" "\n" " \n" @@ -1480,6 +1479,21 @@ msgstr "" msgid "Adjustment Tax" msgstr "" +#. module: account +#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_adjustment_type +msgid "Adjustment Type" +msgstr "" + +#. module: account +#: selection:tax.adjustments.wizard,adjustment_type:0 +msgid "Adjustment in favor of the Estate" +msgstr "" + +#. module: account +#: selection:tax.adjustments.wizard,adjustment_type:0 +msgid "Adjustment in your favor" +msgstr "" + #. module: account #: model:ir.ui.view,arch_db:account.view_account_tax_template_form #: model:ir.ui.view,arch_db:account.view_tax_form @@ -5314,7 +5328,6 @@ msgstr "" #: model:ir.ui.view,arch_db:account.portal_my_home_menu_invoice #: model:ir.ui.view,arch_db:account.portal_my_invoices #: model:ir.ui.view,arch_db:account.res_config_settings_view_form -#: model:ir.ui.view,arch_db:account.view_account_invoice_filter #: model:ir.ui.view,arch_db:account.view_account_payment_form #: model:ir.ui.view,arch_db:account.view_account_payment_graph #: model:ir.ui.view,arch_db:account.view_invoice_graph @@ -6532,17 +6545,6 @@ msgstr "" msgid "Normal Text" msgstr "" -#. module: account -#: model:ir.ui.view,arch_db:account.view_account_invoice_filter_inherit_credit_notes -#: model:ir.ui.view,arch_db:account.view_account_invoice_filter_inherit_invoices -msgid "Not Draft" -msgstr "" - -#. module: account -#: model:ir.ui.view,arch_db:account.view_account_invoice_filter -msgid "Not Paid" -msgstr "" - #. module: account #. openerp-web #: code:addons/account/static/src/xml/account_reconciliation.xml:254 @@ -6742,13 +6744,14 @@ msgstr "" #: selection:account.invoice,state:0 #: selection:account.invoice.report,state:0 #: code:addons/account/static/src/xml/account_payment.xml:82 +#: model:ir.ui.view,arch_db:account.view_account_invoice_filter #, python-format msgid "Open" msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:636 +#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:662 #: code:addons/account/static/src/xml/account_reconciliation.xml:131 #, python-format msgid "Open balance" @@ -6933,12 +6936,13 @@ msgstr "" #: selection:account.invoice,state:0 #: selection:account.invoice.report,state:0 #: model:ir.ui.view,arch_db:account.report_overdue_document +#: model:ir.ui.view,arch_db:account.view_account_invoice_filter #: model:mail.message.subtype,name:account.mt_invoice_paid msgid "Paid" msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:411 +#: code:addons/account/models/account_payment.py:426 #, python-format msgid "Paid Invoices" msgstr "" @@ -9667,7 +9671,6 @@ msgid "Total" msgstr "" #. module: account -#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_total #: model:ir.ui.view,arch_db:account.view_move_tree msgid "Total Amount" msgstr "" diff --git a/addons/mrp_repair/i18n/mrp_repair.pot b/addons/mrp_repair/i18n/mrp_repair.pot index fc9bfbbcd9c..64a4b79f9a5 100644 --- a/addons/mrp_repair/i18n/mrp_repair.pot +++ b/addons/mrp_repair/i18n/mrp_repair.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~18\n" +"Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-02 11:27+0000\n" -"PO-Revision-Date: 2017-10-02 11:27+0000\n" +"POT-Creation-Date: 2018-04-27 14:52+0000\n" +"PO-Revision-Date: 2018-04-27 14:52+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -55,7 +55,7 @@ msgid "\n" " (with reference: ${object.origin} )\n" " % endif\n" " % if object.invoice_method != 'none':\n" -" amounting in ${object.amount_total} ${object.pricelist_id.currency_id.name}.\n" +" amounting in ${format_amount(object.amount_total, object.pricelist_id.currency_id)}.\n" " % endif\n" "

\n" "

You can reply to this email if you have any questions.

\n" diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot index 605455c3be7..b90f3386faa 100644 --- a/addons/purchase/i18n/purchase.pot +++ b/addons/purchase/i18n/purchase.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-16 08:08+0000\n" -"PO-Revision-Date: 2017-11-16 08:08+0000\n" +"POT-Creation-Date: 2018-04-27 14:51+0000\n" +"PO-Revision-Date: 2018-04-27 14:51+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -19,7 +19,7 @@ msgstr "" #: model:mail.template,body_html:purchase.email_template_edi_purchase msgid "\n" "

Dear\n" -"% if object.partner_id.is_company and object.child_ids:\n" +"% if object.partner_id.is_company and object.partner_id.child_ids:\n" " ${object.partner_id.child_ids[0].name}\n" "% else :\n" " ${object.partner_id.name}\n" @@ -32,7 +32,7 @@ msgid "\n" "% if object.origin:\n" " (RFQ origin: ${object.origin})\n" "% endif\n" -"amounting in ${object.amount_total} ${object.currency_id.name}\n" +"amounting in ${format_amount(object.amount_total, object.currency_id)}\n" "from ${object.company_id.name}.\n" "

\n" "\n" @@ -49,7 +49,7 @@ msgstr "" #. module: purchase #: model:mail.template,body_html:purchase.email_template_edi_purchase_done msgid "\n" -"

Dear ${object.partner_id.name} \n" +"

Dear ${object.partner_id.name}\n" "% if object.partner_id.parent_id:\n" " (${object.partner_id.parent_id.name})\n" "% endif\n" @@ -62,7 +62,7 @@ msgid "\n" "% if object.origin:\n" " (RFQ origin: ${object.origin})\n" "% endif\n" -"amounting ${object.amount_total} ${object.currency_id.name}\n" +"amounting ${format_amount(object.amount_total, object.currency_id)}\n" "from ${object.company_id.name}.\n" "

\n" "\n" @@ -130,7 +130,7 @@ msgstr "" #: model:mail.template,body_html:purchase.mail_template_data_notification_email_purchase_order msgid "\n" " \n" -" % set company = record and record.company_id or or ctx.get('company')\n" +" % set company = record and record.company_id or ctx.get('company')\n" " \n" "
\n" " \n" diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot index f2d667a71ac..3a2b93bed64 100644 --- a/addons/sale/i18n/sale.pot +++ b/addons/sale/i18n/sale.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-19 13:43+0000\n" -"PO-Revision-Date: 2018-02-19 13:43+0000\n" +"POT-Creation-Date: 2018-04-27 14:48+0000\n" +"PO-Revision-Date: 2018-04-27 14:48+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -40,7 +40,7 @@ msgid "\n" "% if object.origin:\n" "(with reference: ${object.origin} )\n" "% endif\n" -"amounting in ${object.amount_total} ${object.pricelist_id.currency_id.name}\n" +"amounting in ${format_amount(object.amount_total, object.currency_id)}\n" "from ${object.company_id.name}.\n" "

\n" "\n" @@ -129,7 +129,7 @@ msgstr "" msgid "\n" " \n" " % set record = ctx.get('record')\n" -" % set company = record and record.company_id or user.company_id\n" +" % set company = record and record.company_id or ctx.get('company')\n" " \n" "
\n" " \n" @@ -228,11 +228,6 @@ msgstr "" msgid " Problem" msgstr "" -#. module: sale -#: model:ir.ui.view,arch_db:sale.portal_my_orders -msgid " Done" -msgstr "" - #. module: sale #: model:ir.ui.view,arch_db:sale.portal_my_quotations msgid " Expired" @@ -244,11 +239,6 @@ msgstr "" msgid " Cancelled" msgstr "" -#. module: sale -#: model:ir.ui.view,arch_db:sale.portal_order_page -msgid " Done" -msgstr "" - #. module: sale #: model:ir.ui.view,arch_db:sale.portal_order_page msgid " Waiting" @@ -259,11 +249,21 @@ msgstr "" msgid " Invoiced" msgstr "" +#. module: sale +#: model:ir.ui.view,arch_db:sale.portal_my_orders +msgid " Done" +msgstr "" + #. module: sale #: model:ir.ui.view,arch_db:sale.portal_order_page msgid " Paid" msgstr "" +#. module: sale +#: model:ir.ui.view,arch_db:sale.portal_order_page +msgid " Done" +msgstr "" + #. module: sale #: model:ir.ui.view,arch_db:sale.report_saleorder_document msgid "Pro-Forma Invoice # " @@ -286,6 +286,7 @@ msgstr "" #. module: sale #: model:ir.ui.view,arch_db:sale.portal_order_page +#: model:ir.ui.view,arch_db:sale.report_saleorder_document msgid "Expiration Date:" msgstr "" @@ -1378,17 +1379,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 @@ -1610,11 +1606,6 @@ msgstr "" msgid "Payment" msgstr "" -#. module: sale -#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form -msgid "Payment Acquirers" -msgstr "" - #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order_payment_term_id msgid "Payment Terms" @@ -2131,6 +2122,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" @@ -2513,6 +2509,22 @@ msgstr "" msgid "Track Service" msgstr "" +#. module: sale +#: model:ir.model.fields,field_description:sale.field_res_config_settings_module_delivery_ups +msgid "UPS" +msgstr "" + +#. module: sale +#: model:ir.model.fields,field_description:sale.field_res_config_settings_module_delivery_usps +msgid "USPS" +msgstr "" + +#. module: sale +#: code:addons/sale/models/sale.py:570 +#, python-format +msgid "Uncategorized" +msgstr "" + #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order_line_price_unit #: model:ir.ui.view,arch_db:sale.report_invoice_layouted @@ -2656,23 +2668,23 @@ msgid "Your Order has been confirmed." 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 msgid "Your next actions should flow efficiently: confirm the Quotation to a Sales Order, then create the Invoice and collect the Payment." msgstr "" +#. module: sale +#: model:ir.model.fields,field_description:sale.field_res_config_settings_module_delivery_bpost +msgid "bpost" +msgstr "" + #. module: sale #: model:ir.ui.view,arch_db:sale.portal_order_error #: model:ir.ui.view,arch_db:sale.portal_order_success