summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
Diffstat (limited to 'addons')
-rw-r--r--addons/account/i18n/account.pot3910
-rw-r--r--addons/account_asset/i18n/account_asset.pot51
-rw-r--r--addons/account_bank_statement_import/i18n/account_bank_statement_import.pot26
-rw-r--r--addons/account_check_printing/i18n/account_check_printing.pot26
-rw-r--r--addons/account_payment/i18n/account_payment.pot53
-rw-r--r--addons/account_voucher/i18n/account_voucher.pot28
-rw-r--r--addons/analytic/i18n/analytic.pot19
-rw-r--r--addons/auth_ldap/i18n/auth_ldap.pot12
-rw-r--r--addons/auth_signup/i18n/auth_signup.pot423
-rw-r--r--addons/base_automation/i18n/base_automation.pot56
-rw-r--r--addons/base_gengo/i18n/base_gengo.pot26
-rw-r--r--addons/base_import/i18n/base_import.pot297
-rw-r--r--addons/base_setup/i18n/base_setup.pot48
-rw-r--r--addons/board/i18n/board.pot17
-rw-r--r--addons/calendar/i18n/calendar.pot536
-rw-r--r--addons/crm/i18n/crm.pot345
-rw-r--r--addons/delivery/i18n/delivery.pot93
-rw-r--r--addons/digest/i18n/digest.pot525
-rw-r--r--addons/event/i18n/event.pot88
-rw-r--r--addons/event_sale/i18n/event_sale.pot31
-rw-r--r--addons/fleet/i18n/fleet.pot33
-rw-r--r--addons/gamification/i18n/gamification.pot18
-rw-r--r--addons/google_calendar/i18n/google_calendar.pot21
-rw-r--r--addons/google_drive/i18n/google_drive.pot10
-rw-r--r--addons/hr/i18n/hr.pot53
-rw-r--r--addons/hr_attendance/i18n/hr_attendance.pot143
-rw-r--r--addons/hr_contract/i18n/hr_contract.pot11
-rw-r--r--addons/hr_expense/i18n/hr_expense.pot142
-rw-r--r--addons/hr_holidays/i18n/hr_holidays.pot106
-rw-r--r--addons/hr_org_chart/i18n/hr_org_chart.pot20
-rw-r--r--addons/hr_payroll/i18n/hr_payroll.pot40
-rw-r--r--addons/hr_recruitment/i18n/hr_recruitment.pot665
-rw-r--r--addons/hr_timesheet/i18n/hr_timesheet.pot146
-rw-r--r--addons/im_livechat/i18n/im_livechat.pot70
-rw-r--r--addons/im_livechat_mail_bot/i18n/im_livechat_mail_bot.pot90
-rw-r--r--addons/iot/i18n/iot.pot210
-rw-r--r--addons/lunch/i18n/lunch.pot207
-rw-r--r--addons/mail/i18n/mail.pot1271
-rw-r--r--addons/mail_bot/i18n/mail_bot.pot253
-rw-r--r--addons/maintenance/i18n/maintenance.pot37
-rw-r--r--addons/mass_mailing/i18n/mass_mailing.pot370
-rw-r--r--addons/mass_mailing_crm/i18n/mass_mailing_crm.pot47
-rw-r--r--addons/mass_mailing_event/i18n/mass_mailing_event.pot11
-rw-r--r--addons/mass_mailing_sale/i18n/mass_mailing_sale.pot42
-rw-r--r--addons/membership/i18n/membership.pot14
-rw-r--r--addons/mrp/i18n/mrp.pot602
-rw-r--r--addons/note/i18n/note.pot38
-rw-r--r--addons/pad/i18n/pad.pot13
-rw-r--r--addons/payment/i18n/payment.pot288
-rw-r--r--addons/point_of_sale/i18n/point_of_sale.pot743
-rw-r--r--addons/portal/i18n/portal.pot313
-rw-r--r--addons/pos_restaurant/i18n/pos_restaurant.pot167
-rw-r--r--addons/pos_sale/i18n/pos_sale.pot83
-rw-r--r--addons/product/i18n/product.pot129
-rw-r--r--addons/product_email_template/i18n/product_email_template.pot14
-rw-r--r--addons/product_expiry/i18n/product_expiry.pot29
-rw-r--r--addons/project/i18n/project.pot412
-rw-r--r--addons/purchase/i18n/purchase.pot228
-rw-r--r--addons/purchase_mrp/i18n/purchase_mrp.pot11
-rw-r--r--addons/purchase_requisition/i18n/purchase_requisition.pot29
-rw-r--r--addons/purchase_stock/i18n/purchase_stock.pot83
-rw-r--r--addons/rating/i18n/rating.pot11
-rw-r--r--addons/repair/i18n/repair.pot82
-rw-r--r--addons/sale/i18n/sale.pot1456
-rw-r--r--addons/sale_crm/i18n/sale_crm.pot8
-rw-r--r--addons/sale_expense/i18n/sale_expense.pot21
-rw-r--r--addons/sale_management/i18n/sale_management.pot606
-rw-r--r--addons/sale_purchase/i18n/sale_purchase.pot165
-rw-r--r--addons/sale_quotation_builder/i18n/sale_quotation_builder.pot151
-rw-r--r--addons/sale_stock/i18n/sale_stock.pot122
-rw-r--r--addons/sale_timesheet/i18n/sale_timesheet.pot278
-rw-r--r--addons/sales_team/i18n/sales_team.pot73
-rw-r--r--addons/sms/i18n/sms.pot21
-rw-r--r--addons/snailmail/i18n/snailmail.pot256
-rw-r--r--addons/snailmail_account/i18n/snailmail_account.pot83
-rw-r--r--addons/stock/i18n/stock.pot1254
-rw-r--r--addons/stock_account/i18n/stock_account.pot99
-rw-r--r--addons/stock_dropshipping/i18n/stock_dropshipping.pot23
-rw-r--r--addons/stock_landed_costs/i18n/stock_landed_costs.pot56
-rw-r--r--addons/stock_picking_batch/i18n/stock_picking_batch.pot77
-rw-r--r--addons/stock_zebra/i18n/stock_zebra.pot44
-rw-r--r--addons/survey/i18n/survey.pot117
-rw-r--r--addons/uom/i18n/uom.pot41
-rw-r--r--addons/web/i18n/web.pot1435
-rw-r--r--addons/web_editor/i18n/web_editor.pot602
-rw-r--r--addons/web_settings_dashboard/i18n/web_settings_dashboard.pot138
-rw-r--r--addons/web_tour/i18n/web_tour.pot25
-rw-r--r--addons/web_unsplash/i18n/web_unsplash.pot136
-rw-r--r--addons/website/i18n/website.pot1633
-rw-r--r--addons/website_blog/i18n/website_blog.pot205
-rw-r--r--addons/website_crm/i18n/website_crm.pot40
-rw-r--r--addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot212
-rw-r--r--addons/website_customer/i18n/website_customer.pot18
-rw-r--r--addons/website_event/i18n/website_event.pot95
-rw-r--r--addons/website_event_sale/i18n/website_event_sale.pot21
-rw-r--r--addons/website_event_track/i18n/website_event_track.pot23
-rw-r--r--addons/website_form/i18n/website_form.pot21
-rw-r--r--addons/website_forum/i18n/website_forum.pot345
-rw-r--r--addons/website_forum_doc/i18n/website_forum_doc.pot21
-rw-r--r--addons/website_hr/i18n/website_hr.pot24
-rw-r--r--addons/website_hr_recruitment/i18n/website_hr_recruitment.pot127
-rw-r--r--addons/website_links/i18n/website_links.pot27
-rw-r--r--addons/website_livechat/i18n/website_livechat.pot33
-rw-r--r--addons/website_mail_channel/i18n/website_mail_channel.pot255
-rw-r--r--addons/website_mass_mailing/i18n/website_mass_mailing.pot59
-rw-r--r--addons/website_membership/i18n/website_membership.pot21
-rw-r--r--addons/website_partner/i18n/website_partner.pot26
-rw-r--r--addons/website_rating/i18n/website_rating.pot55
-rw-r--r--addons/website_sale/i18n/website_sale.pot704
-rw-r--r--addons/website_sale_comparison/i18n/website_sale_comparison.pot28
-rw-r--r--addons/website_sale_delivery/i18n/website_sale_delivery.pot34
-rw-r--r--addons/website_sale_digital/i18n/website_sale_digital.pot22
-rw-r--r--addons/website_sale_link_tracker/i18n/website_sale_link_tracker.pot24
-rw-r--r--addons/website_sale_options/i18n/website_sale_options.pot41
-rw-r--r--addons/website_sale_stock/i18n/website_sale_stock.pot31
-rw-r--r--addons/website_sale_wishlist/i18n/website_sale_wishlist.pot32
-rw-r--r--addons/website_slides/i18n/website_slides.pot252
-rw-r--r--addons/website_twitter/i18n/website_twitter.pot102
118 files changed, 18117 insertions, 7616 deletions
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index bb00f638d27..bda9a93613f 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:10+0000\n"
-"PO-Revision-Date: 2018-03-22 14:10+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -19,13 +19,13 @@ msgstr ""
#: 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 '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 'In Payment' status is used when payments have been registered for the entirety of the invoice in a journal configured to post entries at bank reconciliation only, and some of them haven't been reconciled with a bank statement line yet.\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."
msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_chart_template__code_digits
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__code_digits
msgid "# of Digits"
msgstr ""
@@ -45,27 +45,23 @@ msgid "${object.company_id.name} Payment Receipt (Ref ${object.name or 'n/a' })"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:463
-#, python-format
-msgid "%d transactions were automatically reconciled."
-msgstr ""
-
-#. module: account
-#: code:addons/account/models/account.py:832
+#: code:addons/account/models/account.py:926
#, python-format
msgid "%s (Copy)"
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:210
-#: code:addons/account/models/account.py:518
-#: code:addons/account/models/account.py:519
+#: code:addons/account/models/account.py:240
+#: code:addons/account/models/account.py:244
+#: code:addons/account/models/account.py:246
+#: code:addons/account/models/account.py:588
+#: code:addons/account/models/account.py:589
#, python-format
msgid "%s (copy)"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:243
+#: code:addons/account/models/account_move.py:399
#, python-format
msgid "%sreversal of: "
msgstr ""
@@ -76,8 +72,8 @@ msgid "&amp;nbsp;<span>on</span>"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.invoice_supplier_form
-msgid "- First Number:"
+#: model:ir.ui.view,arch_db:account.portal_invoice_chatter
+msgid "&amp;times;"
msgstr ""
#. module: account
@@ -91,9 +87,13 @@ msgid "-> View partially reconciled entries"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:464
-#, python-format
-msgid "1 transaction was automatically reconciled."
+#: model:ir.ui.view,arch_db:account.account_dashboard_onboarding_panel
+msgid "/account/static/src/img/account_dashboard_onboarding_bg.jpg"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.account_invoice_onboarding_panel
+msgid "/account/static/src/img/account_invoice_onboarding_bg.jpg"
msgstr ""
#. module: account
@@ -122,7 +122,7 @@ msgid ": General ledger"
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:588
+#: code:addons/account/models/account.py:678
#, python-format
msgid ": Refund"
msgstr ""
@@ -135,78 +135,151 @@ msgstr ""
#. module: account
#: model:mail.template,body_html:account.mail_template_data_payment_receipt
msgid "<?xml version=\"1.0\"?>\n"
-"<data><p>Dear ${object.partner_id.name},</p>\n"
-"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${format_amount(object.amount, object.currency_id)}</strong> from ${object.company_id.name}.</p>\n"
-"<p>If you have any questions, please do not hesitate to contact us.</p>\n"
-"<p>Best regards,\n"
-"% if user and user.signature:\n"
-"${user.signature | safe}\n"
-"% endif\n"
-"</p>\n"
-"</data>"
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+" Dear ${object.partner_id.name}<br/><br/>\n"
+" Thank you for your payment.\n"
+" Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting\n"
+" to <strong>${format_amount(object.amount, object.currency_id)}</strong> from ${object.company_id.name}.\n"
+" <br/><br/>\n"
+" Do not hesitate to contact us if you have any question.\n"
+" <br/><br/>\n"
+" Best regards,<br/>\n"
+" % if user and user.signature:\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </p>\n"
+"</div>\n"
+""
msgstr ""
#. module: account
#: model:mail.template,body_html:account.email_template_edi_invoice
-msgid "<div>\n"
-"<p>Dear ${object.partner_id.name}\n"
-"% set access_action = object.with_context(force_website=True).get_access_action()\n"
-"% set is_online = access_action and access_action['type'] == 'ir.actions.act_url'\n"
-"% set access_url = object.get_mail_url()\n"
-"\n"
-"% if object.partner_id.parent_id:\n"
-" (<i>${object.partner_id.parent_id.name}</i>)\n"
-"% endif\n"
-",</p>\n"
-"<p>Here is, in attachment, your \n"
-"% if object.number:\n"
-"invoice <strong>${object.number}</strong>\n"
-"% else:\n"
-"invoice\n"
-"% endif\n"
-"% if object.origin:\n"
-"(with reference: ${object.origin})\n"
-"% endif\n"
-"amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
-"from ${object.company_id.name}.\n"
-"</p>\n"
-"\n"
-"% if is_online:\n"
-" <br/><br/>\n"
-" <center>\n"
-" <a href=\"${access_url}\" style=\"background-color: #1abc9c; padding: 20px; text-decoration: none; color: #fff; border-radius: 5px; font-size: 16px;\" class=\"o_default_snippet_text\">View Invoice</a>\n"
-" </center>\n"
-"% endif\n"
-" <br/><br/>\n"
-"\n"
-"% if object.state=='paid':\n"
-" <p>This invoice is already paid.</p>\n"
-"% else:\n"
-" <p>Please remit payment at your earliest convenience.</p>\n"
-"% endif\n"
-"\n"
-"<p>Thank you,</p>\n"
-"<p style=\"color:#888888\">\n"
-"% if object.user_id and object.user_id.signature:\n"
-" ${object.user_id.signature | safe}\n"
-"% endif\n"
-"</p>\n"
-"</div>"
+msgid "<div style=\"margin: 0px; padding: 0px;\">\n"
+" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+" Dear ${object.partner_id.name}\n"
+" % if object.partner_id.parent_id:\n"
+" (${object.partner_id.parent_id.name})\n"
+" % endif\n"
+" <br/><br/>\n"
+" Here is your \n"
+" % if object.number:\n"
+" invoice <strong>${object.number}</strong>\n"
+" % else:\n"
+" invoice\n"
+" %endif\n"
+" % if object.origin:\n"
+" (with reference: ${object.origin})\n"
+" % endif\n"
+" amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
+" from ${object.company_id.name}.\n"
+" % if object.state=='paid':\n"
+" This invoice is already paid.\n"
+" % else:\n"
+" Please remit payment at your earliest convenience.\n"
+" % endif\n"
+" <br/><br/>\n"
+" Do not hesitate to contact us if you have any question.\n"
+" </p>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.portal_invoice_page
+msgid "<i class=\"fa fa-download\"/> Download"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_journal_form
+msgid "<i class=\"fa fa-fw o_button_icon fa-arrow-right\"/> Configure Email Servers"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.portal_invoice_page
+msgid "<i class=\"fa fa-print\"/> Print"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_invoice.py:697
+#, python-format
+msgid "<p>You can control the invoice from your vendor based on what you purchased or received.</p>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.account_invoice_send_wizard_form
+msgid "<span attrs=\"{'invisible': [('composition_mode', '!=', 'mass_mail')]}\">\n"
+" <strong>Email mass mailing</strong> on\n"
+" <span>the selected records</span>\n"
+" </span>\n"
+" <span>Followers of the document and</span>"
msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.portal_my_invoices
-msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-check\"/><span class=\"hidden-xs\"> Paid</span></span>"
+msgid "<span class=\"badge badge-info\"><i class=\"fa fa-fw fa-clock-o\" aria-label=\"Opened\" title=\"Opened\" role=\"img\"/><span class=\"d-none d-md-inline\"> Waiting for Payment</span></span>"
msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.portal_my_invoices
-msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/><span class=\"hidden-xs\"> Cancelled</span></span>"
+msgid "<span class=\"badge badge-secondary\"><i class=\"fa fa-fw fa-check\" aria-label=\"Paid\" title=\"Paid\" role=\"img\"/><span class=\"d-none d-md-inline\"> Paid</span></span>"
msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.portal_my_invoices
-msgid "<span class=\"label label-info\"><i class=\"fa fa-fw fa-clock-o\"/><span class=\"hidden-xs\"> Waiting for Payment</span></span>"
+msgid "<span class=\"badge badge-secondary\"><i class=\"fa fa-fw fa-remove\" aria-label=\"Cancelled\" title=\"Cancelled\" role=\"img\"/><span class=\"d-none d-md-inline\"> Cancelled</span></span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.invoice_supplier_form
+msgid "<span class=\"o_form_label\" attrs=\"{'invisible': ['|',('state','!=','draft'), ('type','!=','in_invoice')]}\">Draft Bill</span>\n"
+" <span class=\"o_form_label\" attrs=\"{'invisible': [('sequence_number_next_prefix','=',False)]}\">- First Number:</span>\n"
+" <span class=\"o_form_label\" attrs=\"{'invisible': ['|',('state','!=','draft'), ('type','!=','in_refund')]}\">Draft Credit Note</span>\n"
+" <span class=\"o_form_label\" attrs=\"{'invisible': ['|',('state', '=', 'draft'), ('type','!=','in_invoice')]}\">Bill </span>\n"
+" <span class=\"o_form_label\" attrs=\"{'invisible': ['|',('state', '=', 'draft'), ('type','!=','in_refund')]}\">Credit Note </span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.invoice_form
+msgid "<span class=\"o_form_label\" attrs=\"{'invisible': ['|',('state','=','draft'), ('type','!=','out_refund')]}\">Credit Note</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.account_aged_balance_view
+msgid "<span class=\"o_form_label\">Aged Partner Balance is a more detailed report of your receivables by intervals. Odoo calculates a table of credit balance by start Date. So if you request an interval of 30 days Odoo generates an analysis of creditors for the past month, past two months, and so on. </span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.validate_account_move_view
+msgid "<span class=\"o_form_label\">All selected journal entries will be validated and posted. You won't be able to modify them afterwards.</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "<span class=\"o_form_label\">Default Taxes</span>\n"
+" <span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-specific.\" aria-label=\"Values set here are company-specific.\" groups=\"base.group_multi_company\" role=\"img\"/>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "<span class=\"o_form_label\">Fiscal Localization</span>\n"
+" <span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-specific.\" aria-label=\"Values set here are company-specific.\" groups=\"base.group_multi_company\" role=\"img\"/>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "<span class=\"o_form_label\">Main Currency</span>\n"
+" <span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-specific.\" aria-label=\"Values set here are company-specific.\" groups=\"base.group_multi_company\" role=\"img\"/>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "<span class=\"o_form_label\">Rounding Method</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.view_payment_term_line_form
+msgid "<span class=\"o_form_label\">of the month</span>"
msgstr ""
#. module: account
@@ -215,8 +288,39 @@ msgid "<span class=\"o_stat_text\">Invoiced</span>"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.setup_bank_account_wizard
+msgid "<span class=\"text-muted\">Only journals not yet linked to a bank account are proposed</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.report_invoice_document
+msgid "<span groups=\"account.group_show_line_subtotals_tax_excluded\">Amount</span>\n"
+" <span groups=\"account.group_show_line_subtotals_tax_included\">Total Price</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+msgid "<span name=\"button_import_placeholder\"/> Statements"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-msgid "<span title=\"Balance in Odoo\">Balance in GL</span>"
+msgid "<span role=\"separator\">New</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+msgid "<span role=\"separator\">Reconciliation</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+msgid "<span role=\"separator\">View</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+msgid "<span title=\"Balance in Odoo\">Balance in General Ledger</span>"
msgstr ""
#. module: account
@@ -235,11 +339,62 @@ msgid "<span> To </span>"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.report_payment_receipt_document
+msgid "<span>Amount Paid</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.report_financial
+#: model:ir.ui.view,arch_db:account.report_payment_receipt_document
+msgid "<span>Balance</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.report_financial
+msgid "<span>Credit</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.report_financial
+msgid "<span>Debit</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.report_invoice_document
+msgid "<span>Description</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.report_invoice_document
+msgid "<span>Disc.(%)</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+msgid "<span>Import Bills</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.report_payment_receipt_document
+msgid "<span>Invoice Date</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.report_payment_receipt_document
+msgid "<span>Invoice Number</span>"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
msgid "<span>Journal Entries</span>"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.report_financial
+msgid "<span>Name</span>"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
msgid "<span>New Bill</span>"
msgstr ""
@@ -265,8 +420,18 @@ msgid "<span>Operations</span>"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-msgid "<span>Reconciliation</span>"
+#: model:ir.ui.view,arch_db:account.report_payment_receipt_document
+msgid "<span>Original Amount</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.report_agedpartnerbalance
+msgid "<span>Partners</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.report_invoice_document
+msgid "<span>Quantity</span>"
msgstr ""
#. module: account
@@ -275,11 +440,41 @@ msgid "<span>Reporting</span>"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.report_invoice_document
+msgid "<span>Source Document</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.report_invoice_document
+msgid "<span>Taxes</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.report_agedpartnerbalance
+msgid "<span>Total</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.report_invoice_document
+msgid "<span>Unit Price</span>"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
msgid "<span>View</span>"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.report_invoice_document
+msgid "<strong class=\"text-center\">Scan me with your banking app.</strong><br/><br/>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.report_invoice_document
+msgid "<strong class=\"text-center\">The SEPA QR Code informations are not set correctly.</strong><br/>"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.report_invoice_document_with_payments
msgid "<strong>Amount Due</strong>"
msgstr ""
@@ -296,18 +491,12 @@ msgid "<strong>Company:</strong>"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.portal_invoice_report
-msgid "<strong>Customer Address</strong>"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.view,arch_db:account.portal_invoice_report
#: model:ir.ui.view,arch_db:account.report_invoice_document
msgid "<strong>Customer Code:</strong>"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.report_payment_receipt
+#: model:ir.ui.view,arch_db:account.report_payment_receipt_document
msgid "<strong>Customer: </strong>"
msgstr ""
@@ -328,7 +517,6 @@ msgid "<strong>Date to :</strong>"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.portal_invoice_report
#: model:ir.ui.view,arch_db:account.report_invoice_document
msgid "<strong>Description:</strong>"
msgstr ""
@@ -344,7 +532,6 @@ msgid "<strong>Display Account</strong>"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.portal_invoice_report
#: model:ir.ui.view,arch_db:account.report_invoice_document
msgid "<strong>Due Date:</strong>"
msgstr ""
@@ -365,7 +552,6 @@ msgid "<strong>From</strong>"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.portal_invoice_report
#: model:ir.ui.view,arch_db:account.report_invoice_document
msgid "<strong>Invoice Date:</strong>"
msgstr ""
@@ -381,7 +567,7 @@ msgid "<strong>Journals:</strong>"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.report_payment_receipt
+#: model:ir.ui.view,arch_db:account.report_payment_receipt_document
msgid "<strong>Memo: </strong>"
msgstr ""
@@ -391,17 +577,17 @@ msgid "<strong>Partner's:</strong>"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.report_payment_receipt
+#: model:ir.ui.view,arch_db:account.report_payment_receipt_document
msgid "<strong>Payment Amount: </strong>"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.report_payment_receipt
+#: model:ir.ui.view,arch_db:account.report_payment_receipt_document
msgid "<strong>Payment Date: </strong>"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.report_payment_receipt
+#: model:ir.ui.view,arch_db:account.report_payment_receipt_document
msgid "<strong>Payment Method: </strong>"
msgstr ""
@@ -416,7 +602,6 @@ msgid "<strong>Purchase</strong>"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.portal_invoice_report
#: model:ir.ui.view,arch_db:account.report_invoice_document
msgid "<strong>Reference:</strong>"
msgstr ""
@@ -427,7 +612,6 @@ msgid "<strong>Sorted By:</strong>"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.portal_invoice_report
#: model:ir.ui.view,arch_db:account.report_invoice_document
msgid "<strong>Source:</strong>"
msgstr ""
@@ -443,7 +627,11 @@ msgid "<strong>Subtotal :</strong>"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.portal_invoice_report
+#: model:ir.ui.view,arch_db:account.report_invoice_document
+msgid "<strong>Subtotal:</strong>"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.report_invoice_document
msgid "<strong>Subtotal</strong>"
msgstr ""
@@ -464,7 +652,6 @@ msgid "<strong>There is nothing due with this customer.</strong>"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.portal_invoice_report
#: model:ir.ui.view,arch_db:account.report_invoice_document
#: model:ir.ui.view,arch_db:account.report_journal
msgid "<strong>Total</strong>"
@@ -476,11 +663,16 @@ msgid "<strong>Type: </strong>"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.report_payment_receipt
+#: model:ir.ui.view,arch_db:account.report_payment_receipt_document
msgid "<strong>Vendor: </strong>"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.portal_invoice_page
+msgid "<strong>Your Contact:</strong>"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.report_tax
msgid "<strong>to </strong>"
msgstr ""
@@ -495,27 +687,20 @@ msgid "A Cash Register allows you to manage cash entries in your cash\n"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:384
-#, python-format
-msgid "A Cash transaction can't have a 0 amount."
-msgstr ""
-
-#. module: account
-#: code:addons/account/models/account_invoice.py:1704
+#: code:addons/account/models/account_invoice.py:1881
#, python-format
-msgid "A Payment Terms should have its last line of type Balance."
+msgid "A Payment Term should have only one line of type Balance."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1707
+#: code:addons/account/models/account.py:844
#, python-format
-msgid "A Payment Terms should have only one line of type Balance."
+msgid "A bank account can belong to only one journal."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:758
-#, python-format
-msgid "A bank account can only belong to one journal."
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "A bank journal must be set to use the SEPA QR code"
msgstr ""
#. module: account
@@ -543,7 +728,13 @@ msgid "A journal is used to record transactions of all accounting data\n"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:916
+#: code:addons/account/models/account_move.py:324
+#, python-format
+msgid "A payment journal entry generated in a journal configured to post entries only when payments are reconciled with a bank statement cannot be manually posted. Those will be posted automatically after performing the bank reconciliation."
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/reconciliation_widget.py:876
#, python-format
msgid "A reconciliation must involve at least 2 move lines."
msgstr ""
@@ -554,14 +745,14 @@ msgid "A rounding per line is advised if your prices are tax-included. That way,
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:887
-#: code:addons/account/models/account_bank_statement.py:890
+#: code:addons/account/models/account_bank_statement.py:527
+#: code:addons/account/models/account_bank_statement.py:530
#, python-format
msgid "A selected move line was already reconciled."
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:898
+#: code:addons/account/models/account_bank_statement.py:538
#, python-format
msgid "A selected statement line was already reconciled with an account move."
msgstr ""
@@ -572,17 +763,23 @@ msgid "A tax fiscal position could be defined only once time on same taxes."
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_res_users__has_group_warning_account
#: model:res.groups,name:account.group_warning_account
msgid "A warning can be set on a partner (Account)"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice__access_warning
+msgid "Access warning"
+msgstr ""
+
+#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:526
-#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:528
-#: code:addons/account/static/src/xml/account_reconciliation.xml:170
-#: code:addons/account/static/src/xml/account_reconciliation.xml:232
-#: code:addons/account/static/src/xml/account_reconciliation.xml:257
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:550
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:552
+#: code:addons/account/static/src/xml/account_reconciliation.xml:174
+#: code:addons/account/static/src/xml/account_reconciliation.xml:270
+#: code:addons/account/static/src/xml/account_reconciliation.xml:295
#: model:ir.model,name:account.model_account_account
#: model:ir.model.fields,field_description:account.field_account_cash_rounding__account_id
#: model:ir.model.fields,field_description:account.field_account_invoice__account_id
@@ -604,6 +801,12 @@ msgid "Account"
msgstr ""
#. module: account
+#: code:addons/account/models/account_move.py:913
+#, python-format
+msgid "Account %s (%s) does not allow reconciliation. First change the configuration of this account to allow it."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_accountant
msgid "Account Accountant"
msgstr ""
@@ -646,7 +849,6 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_account__currency_id
#: model:ir.model.fields,field_description:account.field_account_account_template__currency_id
-#: model:ir.model.fields,field_description:account.field_account_bank_accounts_wizard__currency_id
msgid "Account Currency"
msgstr ""
@@ -673,6 +875,18 @@ msgid "Account Groups"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_journal__company_partner_id
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__partner_id
+msgid "Account Holder"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__acc_holder_name
+msgid "Account Holder Name"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__journal_id
#: model:ir.model.fields,field_description:account.field_res_partner_bank__journal_id
#: model:ir.ui.view,arch_db:account.view_account_bank_journal_tree
#: model:ir.ui.view,arch_db:account.view_account_journal_form
@@ -698,12 +912,8 @@ msgid "Account Move Reversal"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_bank_accounts_wizard__acc_name
-msgid "Account Name."
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_journal__bank_acc_number
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__acc_number
msgid "Account Number"
msgstr ""
@@ -778,6 +988,7 @@ msgid "Account Tags"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.account_tax_view_tree
#: model:ir.ui.view,arch_db:account.view_tax_form
#: model:ir.ui.view,arch_db:account.view_tax_tree
msgid "Account Tax"
@@ -822,7 +1033,7 @@ msgstr ""
#: selection:account.financial.report,type:0
#: model:ir.model,name:account.model_account_account_type
#: model:ir.model.fields,field_description:account.field_account_account_type__name
-#: model:ir.model.fields,field_description:account.field_account_bank_accounts_wizard__account_type
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__related_acc_type
#: model:ir.ui.view,arch_db:account.view_account_search
#: model:ir.ui.view,arch_db:account.view_account_template_search
#: model:ir.ui.view,arch_db:account.view_account_type_form
@@ -864,13 +1075,8 @@ msgid "Account groups"
msgstr ""
#. module: account
-#: model:ir.model,name:account.model_account_move_line_reconcile
-msgid "Account move line reconcile"
-msgstr ""
-
-#. module: account
-#: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
-msgid "Account move line reconcile (writeoff)"
+#: model:ir.model.fields,help:account.field_account_setup_bank_manual_config__acc_holder_name
+msgid "Account holder name, in case it is different than the name of the Account Holder"
msgstr ""
#. module: account
@@ -906,13 +1112,19 @@ msgid "Account that will be set on invoice tax lines for refunds. Leave empty to
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_tax__cash_basis_base_account_id
+#: model:ir.model.fields,help:account.field_account_tax_template__cash_basis_base_account_id
+msgid "Account that will be set on lines created in cash basis journal entry and used to keep track of the tax base amount."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_account__account_dest_id
msgid "Account to Use Instead"
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_account_tax__cash_basis_account
-#: model:ir.model.fields,help:account.field_account_tax_template__cash_basis_account
+#: model:ir.model.fields,help:account.field_account_tax__cash_basis_account_id
+#: model:ir.model.fields,help:account.field_account_tax_template__cash_basis_account_id
msgid "Account used as counterpart for the journal entry, for taxes eligible based on payments."
msgstr ""
@@ -925,19 +1137,20 @@ msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.account_account_menu
+#: model:ir.ui.menu,name:account.menu_finance_entries
#: model:ir.ui.view,arch_db:account.product_template_form_view
#: model:ir.ui.view,arch_db:account.view_account_analytic_line_form_inherit_account
msgid "Accounting"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.view_account_journal_form
-msgid "Accounting App Options"
+#: model:ir.model.fields,field_description:account.field_res_users__group_account_user
+msgid "Accounting & Finance"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.view_wizard_multi_chart
-msgid "Accounting Application Configuration"
+#: model:ir.ui.view,arch_db:account.view_account_journal_form
+msgid "Accounting App Options"
msgstr ""
#. module: account
@@ -946,6 +1159,7 @@ msgid "Accounting Dashboard"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_bank_statement__accounting_date
#: model:ir.model.fields,field_description:account.field_account_invoice__date
#: model:ir.model.fields,field_description:account.field_account_invoice_refund__date
msgid "Accounting Date"
@@ -997,6 +1211,13 @@ msgid "Accounts Mapping"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,field_description:account.field_account_invoice__message_needaction
+#: model:ir.model.fields,field_description:account.field_account_payment__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: account
#: model:ir.ui.menu,name:account.menu_finance_entries_actions
msgid "Actions"
msgstr ""
@@ -1009,6 +1230,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_account_tag__active
#: model:ir.model.fields,field_description:account.field_account_fiscal_position__active
+#: model:ir.model.fields,field_description:account.field_account_incoterms__active
#: model:ir.model.fields,field_description:account.field_account_journal__active
#: model:ir.model.fields,field_description:account.field_account_payment_term__active
#: model:ir.model.fields,field_description:account.field_account_tax__active
@@ -1018,6 +1240,21 @@ msgid "Active"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__active_domain
+msgid "Active domain"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: account
#. openerp-web
#: code:addons/account/static/src/xml/account_payment.xml:17
#, python-format
@@ -1031,11 +1268,26 @@ msgid "Add Credit Note"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__add_sign
+msgid "Add Sign"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.onboarding_bank_account_step
+msgid "Add a bank"
+msgstr ""
+
+#. module: account
#: model:ir.actions.act_window,help:account.action_account_journal_form
msgid "Add a journal"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.invoice_form
+msgid "Add a line"
+msgstr ""
+
+#. module: account
#: model:ir.actions.act_window,help:account.action_account_form
msgid "Add a new account"
msgstr ""
@@ -1046,6 +1298,16 @@ msgid "Add a new tag"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.invoice_form
+msgid "Add a note"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Add a payment QR code to your invoices"
+msgstr ""
+
+#. module: account
#: selection:account.cash.rounding,strategy:0
msgid "Add a rounding line"
msgstr ""
@@ -1058,12 +1320,32 @@ msgid "Add a second line"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.invoice_form
+msgid "Add a section"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Add an EPC QR code to your invoices so that your customers can pay instantly with their mobile banking application. EPC QR codes are used by many European banks to process SEPA payments."
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_move_form
#: model:ir.ui.view,arch_db:account.view_move_line_form
msgid "Add an internal note..."
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.account_invoice_send_wizard_form
+msgid "Add contacts to notify..."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__partner_ids
+msgid "Additional Contacts"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice__comment
msgid "Additional Information"
msgstr ""
@@ -1085,6 +1367,11 @@ 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
#: model:ir.ui.view,arch_db:account.view_account_tax_template_form
#: model:ir.ui.view,arch_db:account.view_tax_form
msgid "Advanced Options"
@@ -1096,11 +1383,6 @@ msgid "Advanced Settings"
msgstr ""
#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_entries
-msgid "Adviser"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_tax__include_base_amount
msgid "Affect Base of Subsequent Taxes"
msgstr ""
@@ -1120,8 +1402,18 @@ msgid "Aged Partner Balance"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.account_aged_balance_view
-msgid "Aged Partner Balance is a more detailed report of your receivables by intervals. Odoo calculates a table of credit balance by start Date. So if you request an interval of 30 days Odoo generates an analysis of creditors for the past month, past two months, and so on."
+#: model:ir.model.fields,field_description:account.field_account_journal__alias_id
+msgid "Alias"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_journal__alias_name
+msgid "Alias Name for Vendor Bills"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_journal__alias_domain
+msgid "Alias domain"
msgstr ""
#. module: account
@@ -1153,11 +1445,6 @@ msgid "All Entries"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_all_partner_invoices
-msgid "All Invoices"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_bank_statement__all_lines_reconciled
msgid "All Lines Reconciled"
msgstr ""
@@ -1195,7 +1482,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:47
+#: code:addons/account/static/src/xml/account_reconciliation.xml:50
#, python-format
msgid "All invoices and payments have been matched, your accounts' balances are clean."
msgstr ""
@@ -1206,12 +1493,7 @@ msgid "All manually created new journal entries are usually in the status 'Unpos
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.validate_account_move_view
-msgid "All selected journal entries will be validated and posted. You won't be able to modify them afterwards."
-msgstr ""
-
-#. module: account
-#: code:addons/account/models/account_bank_statement.py:241
+#: code:addons/account/models/account_bank_statement.py:243
#, python-format
msgid "All the account entries lines must be processed in order to close the statement."
msgstr ""
@@ -1242,6 +1524,7 @@ msgid "Allow check printing and deposits"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_res_users__has_group_cash_rounding
#: model:res.groups,name:account.group_cash_rounding
msgid "Allow the cash rounding management"
msgstr ""
@@ -1252,6 +1535,11 @@ msgid "Allow to configure taxes using cash basis"
msgstr ""
#. module: account
+#: model:res.groups,name:account.group_fiscal_year
+msgid "Allow to define fiscal years of more or less than a year"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
msgid "Allows to tag analytic entries and to manage analytic distributions"
msgstr ""
@@ -1263,9 +1551,9 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:197
-#: code:addons/account/static/src/xml/account_reconciliation.xml:239
-#: code:addons/account/static/src/xml/account_reconciliation.xml:256
+#: code:addons/account/static/src/xml/account_reconciliation.xml:201
+#: code:addons/account/static/src/xml/account_reconciliation.xml:277
+#: code:addons/account/static/src/xml/account_reconciliation.xml:294
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line__amount
#: model:ir.model.fields,field_description:account.field_account_move__amount
#: model:ir.model.fields,field_description:account.field_account_partial_reconcile__amount
@@ -1277,8 +1565,6 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_cash_box_out__amount
#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard__amount
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
-#: model:ir.ui.view,arch_db:account.portal_invoice_report
-#: model:ir.ui.view,arch_db:account.report_invoice_document
#: model:ir.ui.view,arch_db:account.view_account_payment_tree
#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
#: model:ir.ui.view,arch_db:account.view_account_supplier_payment_tree
@@ -1328,11 +1614,6 @@ msgid "Amount Due in Invoice Currency"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.report_payment_receipt
-msgid "Amount Paid"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_line__price_subtotal_signed
msgid "Amount Signed"
msgstr ""
@@ -1401,7 +1682,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:178
+#: code:addons/account/static/src/xml/account_reconciliation.xml:182
#, python-format
msgid "Analytic Acc."
msgstr ""
@@ -1410,7 +1691,6 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_invoice_line__account_analytic_id
#: model:ir.model.fields,field_description:account.field_account_invoice_report__account_analytic_id
#: model:ir.model.fields,field_description:account.field_account_move_line__analytic_account_id
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff__analytic_id
#: model:ir.model.fields,field_description:account.field_account_reconcile_model__analytic_account_id
#: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
@@ -1444,7 +1724,7 @@ msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_action_analytic_lines_tree
-msgid "Analytic Entries"
+msgid "Analytic Items"
msgstr ""
#. module: account
@@ -1470,7 +1750,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:182
+#: code:addons/account/static/src/xml/account_reconciliation.xml:186
#, python-format
msgid "Analytic Tags."
msgstr ""
@@ -1491,6 +1771,11 @@ msgid "Analytics"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_send__no_auto_thread
+msgid "Answers do not go in the original document discussion thread. This has an impact on the generated message-id."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_move_line__tax_exigible
msgid "Appears in VAT report"
msgstr ""
@@ -1501,6 +1786,23 @@ msgid "Applicability"
msgstr ""
#. module: account
+#: selection:tax.adjustments.wizard,adjustment_type:0
+msgid "Applied on credit journal item"
+msgstr ""
+
+#. module: account
+#: selection:tax.adjustments.wizard,adjustment_type:0
+msgid "Applied on debit journal item"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.account_invoice_onboarding_invoice_layout_form
+#: model:ir.ui.view,arch_db:account.account_invoice_onboarding_sale_tax_form
+#: model:ir.ui.view,arch_db:account.setup_financial_year_opening_form
+msgid "Apply"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_fiscal_position__auto_apply
#: model:ir.model.fields,help:account.field_account_fiscal_position_template__auto_apply
msgid "Apply automatically this fiscal position."
@@ -1535,6 +1837,7 @@ msgid "April"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.account_incoterms_view_search
#: model:ir.ui.view,arch_db:account.view_account_journal_search
#: model:ir.ui.view,arch_db:account.view_account_position_filter
msgid "Archived"
@@ -1546,7 +1849,13 @@ msgid "Ask for a Credit Note"
msgstr ""
#. module: account
+#: selection:account.account.type,internal_group:0
+msgid "Asset"
+msgstr ""
+
+#. module: account
#: model:account.financial.report,name:account.account_financial_report_assets0
+#: model:ir.ui.view,arch_db:account.view_account_search
msgid "Assets"
msgstr ""
@@ -1571,11 +1880,51 @@ msgid "At Least One Outbound"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.account_invoice_send_wizard_form
+msgid "Attach a file"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__attachment_ids
+msgid "Attachments"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_send__attachment_ids
+msgid "Attachments are linked to a document through model / res_id and to the message through this field."
+msgstr ""
+
+#. module: account
#: selection:res.company,fiscalyear_last_month:0
msgid "August"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__author_id
+msgid "Author"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_send__author_id
+msgid "Author of the message. If not set, email_from may hold an email address that did not match any partner."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__author_avatar
+msgid "Author's avatar"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.invoice_supplier_form
+msgid "Auto-Complete"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice__vendor_bill_id
+msgid "Auto-complete from a past bill."
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
msgid "Auto-detect"
msgstr ""
@@ -1591,14 +1940,13 @@ msgid "Automated Entries"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:243
+#: code:addons/account/models/account_move.py:399
#, python-format
msgid "Automatic "
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:348
-#: code:addons/account/wizard/setup_wizards.py:79
+#: code:addons/account/models/company.py:410
#, python-format
msgid "Automatic Balancing Line"
msgstr ""
@@ -1619,19 +1967,6 @@ msgid "Automatic formatting"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:24
-#, python-format
-msgid "Automatic reconciliation"
-msgstr ""
-
-#. module: account
-#: code:addons/account/models/account_bank_statement.py:469
-#, python-format
-msgid "Automatically reconciled items"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_report__price_average
msgid "Average Price"
msgstr ""
@@ -1642,7 +1977,7 @@ msgid "Average Price in Currency"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:194
+#: code:addons/account/models/chart_template.py:410
#, python-format
msgid "BILL"
msgstr ""
@@ -1655,10 +1990,8 @@ msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: model:ir.model.fields,field_description:account.field_account_move_line__balance
-#: model:ir.ui.view,arch_db:account.report_financial
#: model:ir.ui.view,arch_db:account.report_generalledger
#: model:ir.ui.view,arch_db:account.report_partnerledger
-#: model:ir.ui.view,arch_db:account.report_payment_receipt
#: model:ir.ui.view,arch_db:account.report_trialbalance
msgid "Balance"
msgstr ""
@@ -1682,10 +2015,10 @@ msgid "Balance as calculated based on Opening Balance and transaction lines"
msgstr ""
#. module: account
-#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.journal,type:0
-#: code:addons/account/models/chart_template.py:756
+#: code:addons/account/models/chart_template.py:340
#: model:ir.model.fields,field_description:account.field_account_journal__bank_id
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__bank_id
#: model:ir.model.fields,field_description:account.field_res_partner__bank_account_count
#: model:ir.model.fields,field_description:account.field_res_users__bank_account_count
#, python-format
@@ -1698,15 +2031,14 @@ msgid "Bank &amp; Cash"
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:163
-#: model:ir.model.fields,field_description:account.field_account_bank_accounts_wizard__bank_account_id
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line__bank_account_id
#: model:ir.model.fields,field_description:account.field_account_invoice__partner_bank_id
#: model:ir.model.fields,field_description:account.field_account_invoice_report__partner_bank_id
#: model:ir.model.fields,field_description:account.field_account_journal__bank_account_id
+#: model:ir.ui.view,arch_db:account.invoice_supplier_form
+#: model:ir.ui.view,arch_db:account.onboarding_bank_account_step
#: model:ir.ui.view,arch_db:account.view_account_bank_journal_form
#: model:ir.ui.view,arch_db:account.view_account_journal_form
-#, python-format
msgid "Bank Account"
msgstr ""
@@ -1716,28 +2048,31 @@ msgid "Bank Account Name"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_bank_statement_line__account_number
+msgid "Bank Account Number"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_invoice__partner_bank_id
msgid "Bank Account Number to which the invoice will be paid. A Company bank account if this is a Customer Invoice or Vendor Credit Note, otherwise a Partner bank account number."
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:25
#: model:ir.actions.act_window,name:account.action_account_bank_journal_form
#: model:ir.model,name:account.model_res_partner_bank
#: model:ir.ui.menu,name:account.menu_action_account_bank_journal_form
-#, python-format
+#: model:ir.ui.view,arch_db:account.view_partner_property_form
msgid "Bank Accounts"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__bank_account_code_prefix
-msgid "Bank Accounts Prefix"
+#: model:ir.model.fields,field_description:account.field_account_journal__bank_statements_source
+msgid "Bank Feeds"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_journal__bank_statements_source
-msgid "Bank Feeds"
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__bank_bic
+msgid "Bank Identifier Code"
msgstr ""
#. module: account
@@ -1756,6 +2091,13 @@ msgid "Bank Operations"
msgstr ""
#. module: account
+#. openerp-web
+#: code:addons/account/static/src/js/reconciliation/reconciliation_action.js:16
+#, python-format
+msgid "Bank Reconciliation"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_tree
msgid "Bank Reconciliation Move Presets"
msgstr ""
@@ -1766,8 +2108,9 @@ msgid "Bank Reconciliation Move preset"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_res_company__account_setup_bank_data_done
-msgid "Bank Setup Marked As Done"
+#: model:ir.model.fields,field_description:account.field_res_company__account_bank_reconciliation_start
+#: model:ir.model.fields,field_description:account.field_res_config_settings__account_bank_reconciliation_start
+msgid "Bank Reconciliation Threshold"
msgstr ""
#. module: account
@@ -1778,6 +2121,12 @@ msgid "Bank Statement"
msgstr ""
#. module: account
+#: code:addons/account/models/account_bank_statement.py:591
+#, python-format
+msgid "Bank Statement %s"
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_bank_statement_line
msgid "Bank Statement Line"
msgstr ""
@@ -1789,31 +2138,23 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#: model:ir.ui.view,arch_db:account.view_account_bank_journal_form
msgid "Bank Statements"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.partner_view_buttons
-msgid "Bank account(s)"
-msgstr ""
-
-#. module: account
-#: model:account.account.type,name:account.data_account_type_liquidity
-msgid "Bank and Cash"
+#: model:ir.model.fields,help:account.field_account_bank_statement_line__bank_account_id
+msgid "Bank account that was used in this transaction."
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_action.js:15
-#, python-format
-msgid "Bank reconciliation"
+#: model:ir.model.fields,help:account.field_account_setup_bank_manual_config__acc_type
+msgid "Bank account type: Normal or IBAN. Inferred from the bank account number."
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_journal__account_setup_bank_data_done
-msgid "Bank setup marked as done"
+#: model:account.account.type,name:account.data_account_type_liquidity
+msgid "Bank and Cash"
msgstr ""
#. module: account
@@ -1827,14 +2168,13 @@ msgid "Bank statements"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:39
+#: code:addons/account/models/account_journal_dashboard.py:36
#, python-format
msgid "Bank: Balance"
msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_tax__base
-#: model:ir.ui.view,arch_db:account.portal_invoice_report
msgid "Base"
msgstr ""
@@ -1845,12 +2185,30 @@ msgid "Base Amount"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_tax__cash_basis_base_account_id
+#: model:ir.model.fields,field_description:account.field_account_tax_template__cash_basis_base_account_id
+msgid "Base Tax Received Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/company.py:19
+#, python-format
+msgid "Based on Customer"
+msgstr ""
+
+#. module: account
#: selection:account.tax,tax_exigibility:0
#: selection:account.tax.template,tax_exigibility:0
msgid "Based on Invoice"
msgstr ""
#. module: account
+#: code:addons/account/models/company.py:19
+#, python-format
+msgid "Based on Invoice Number"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_tax__tax_exigibility
#: model:ir.model.fields,help:account.field_account_tax_template__tax_exigibility
msgid "Based on Invoice: the tax is due as soon as the invoice is validated.\n"
@@ -1865,7 +2223,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
-msgid "Batch Deposits"
+msgid "Batch Payments"
msgstr ""
#. module: account
@@ -1901,6 +2259,8 @@ msgid "Billing Manager"
msgstr ""
#. module: account
+#: model:ir.actions.server,name:account.action_invoice_tree2
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree2
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
msgid "Bills"
msgstr ""
@@ -1912,11 +2272,16 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+msgid "Bills to Pay"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
msgid "Bills to Validate"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:181
+#: code:addons/account/models/account_journal_dashboard.py:178
#, python-format
msgid "Bills to pay"
msgstr ""
@@ -1984,8 +2349,13 @@ msgid "By unchecking the active field, you may hide a fiscal position without de
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:173
-#: code:addons/account/models/chart_template.py:197
+#: model:ir.model.fields,help:account.field_account_incoterms__active
+msgid "By unchecking the active field, you may hide an INCOTERM you will not use."
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/chart_template.py:389
+#: code:addons/account/models/chart_template.py:413
#, python-format
msgid "CABA"
msgstr ""
@@ -1996,6 +2366,26 @@ msgid "CAMT Import"
msgstr ""
#. module: account
+#: model:account.incoterms,name:account.incoterm_CIP
+msgid "CARRIAGE AND INSURANCE PAID TO"
+msgstr ""
+
+#. module: account
+#: model:account.incoterms,name:account.incoterm_CPT
+msgid "CARRIAGE PAID TO"
+msgstr ""
+
+#. module: account
+#: model:account.incoterms,name:account.incoterm_CFR
+msgid "COST AND FREIGHT"
+msgstr ""
+
+#. module: account
+#: model:account.incoterms,name:account.incoterm_CIF
+msgid "COST, INSURANCE AND FREIGHT"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
msgid "CSV Import"
msgstr ""
@@ -2009,16 +2399,19 @@ msgstr ""
#: model:ir.ui.view,arch_db:account.account_aged_balance_view
#: model:ir.ui.view,arch_db:account.account_common_report_view
#: model:ir.ui.view,arch_db:account.account_invoice_confirm_view
-#: model:ir.ui.view,arch_db:account.account_move_line_reconcile_writeoff
+#: model:ir.ui.view,arch_db:account.account_invoice_import_wizard_form_view
+#: model:ir.ui.view,arch_db:account.account_invoice_onboarding_sale_tax_form
+#: model:ir.ui.view,arch_db:account.account_invoice_send_wizard_form
#: model:ir.ui.view,arch_db:account.account_unreconcile_view
#: model:ir.ui.view,arch_db:account.cash_box_in_form
#: model:ir.ui.view,arch_db:account.cash_box_out_form
+#: model:ir.ui.view,arch_db:account.setup_bank_account_wizard
+#: model:ir.ui.view,arch_db:account.setup_financial_year_opening_form
#: model:ir.ui.view,arch_db:account.tax_adjustments_wizard
#: model:ir.ui.view,arch_db:account.validate_account_move_view
#: model:ir.ui.view,arch_db:account.view_account_bnk_stmt_cashbox
#: model:ir.ui.view,arch_db:account.view_account_bnk_stmt_check
#: model:ir.ui.view,arch_db:account.view_account_invoice_refund
-#: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full
#: model:ir.ui.view,arch_db:account.view_account_move_reversal
#: model:ir.ui.view,arch_db:account.view_account_payment_from_invoices
#: model:ir.ui.view,arch_db:account.view_account_payment_invoice_form
@@ -2038,7 +2431,6 @@ msgid "Cancelled"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.portal_invoice_page
#: model:ir.ui.view,arch_db:account.report_invoice_document
msgid "Cancelled Invoice"
msgstr ""
@@ -2056,50 +2448,45 @@ msgid "Cannot create credit note for the draft/cancelled invoice."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:202
+#: code:addons/account/models/account_move.py:358
#, python-format
msgid "Cannot create moves for different companies."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:234
+#: code:addons/account/models/account_move.py:390
#, python-format
msgid "Cannot create unbalanced journal entry."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:648
+#: code:addons/account/models/account_invoice.py:755
#, python-format
msgid "Cannot find a chart of accounts for this company, You should configure it. \n"
"Please go to Account Configuration."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:630
+#: code:addons/account/models/account.py:111
+#: code:addons/account/models/chart_template.py:151
#, python-format
msgid "Cannot generate an unused account code."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:660
+#: code:addons/account/models/account.py:746
#, python-format
msgid "Cannot generate an unused journal code. Please fill the 'Shortcode' field."
msgstr ""
#. module: account
-#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.journal,type:0
-#: code:addons/account/models/chart_template.py:756
+#: code:addons/account/models/chart_template.py:340
#, python-format
msgid "Cash"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__cash_account_code_prefix
-msgid "Cash Accounts Prefix"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_res_config_settings__tax_exigibility
msgid "Cash Basis"
msgstr ""
@@ -2110,13 +2497,13 @@ msgid "Cash Basis Journal"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:197
+#: code:addons/account/models/chart_template.py:413
#, python-format
msgid "Cash Basis Tax Journal"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:210
+#: code:addons/account/models/account_bank_statement.py:212
#: model:ir.actions.act_window,name:account.action_view_account_bnk_stmt_cashbox
#, python-format
msgid "Cash Control"
@@ -2150,23 +2537,13 @@ msgid "Cash Roundings"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-msgid "Cash Statements"
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__bank_account_ids
-msgid "Cash and Banks"
-msgstr ""
-
-#. module: account
-#: code:addons/account/models/account_bank_statement.py:185
+#: code:addons/account/models/account_bank_statement.py:187
#, python-format
msgid "Cash difference observed during the counting (%s)"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:37
+#: code:addons/account/models/account_journal_dashboard.py:34
#, python-format
msgid "Cash: Balance"
msgstr ""
@@ -2197,29 +2574,41 @@ msgid "Category of Income Account"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_abstract_payment__writeoff_label
#: model:ir.model.fields,help:account.field_account_payment__writeoff_label
+#: model:ir.model.fields,help:account.field_account_register_payments__writeoff_label
msgid "Change label of the counterpart that will hold the payment difference"
msgstr ""
#. module: account
-#: code:addons/account/controllers/portal.py:146
+#: code:addons/account/controllers/portal.py:132
#, python-format
msgid "Changing VAT number is not allowed once invoices have been issued for your account. Please contact us directly for this operation."
msgstr ""
#. module: account
-#: code:addons/account/controllers/portal.py:149
+#: code:addons/account/controllers/portal.py:138
+#, python-format
+msgid "Changing your company name is not allowed once invoices have been issued for your account. Please contact us directly for this operation."
+msgstr ""
+
+#. module: account
+#: code:addons/account/controllers/portal.py:135
#, python-format
msgid "Changing your name is not allowed once invoices have been issued for your account. Please contact us directly for this operation."
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__channel_ids
+msgid "Channels"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_account_template__chart_template_id
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template__chart_template_id
#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template__chart_template_id
#: model:ir.model.fields,field_description:account.field_account_tax_template__chart_template_id
#: model:ir.model.fields,field_description:account.field_res_company__chart_template_id
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__chart_template_id
msgid "Chart Template"
msgstr ""
@@ -2229,16 +2618,10 @@ msgid "Chart Templates"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_res_company__account_setup_coa_done
-msgid "Chart of Account Checked"
-msgstr ""
-
-#. module: account
-#. openerp-web
-#: code:addons/account/models/company.py:215
-#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:15
+#: code:addons/account/models/company.py:323
#: model:ir.actions.act_window,name:account.action_account_form
#: model:ir.ui.menu,name:account.menu_action_account_form
+#: model:ir.ui.view,arch_db:account.onboarding_chart_of_account_step
#, python-format
msgid "Chart of Accounts"
msgstr ""
@@ -2255,6 +2638,11 @@ msgid "Chart of Accounts Templates"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.onboarding_chart_of_account_step
+msgid "Chart of account set."
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_account_list
msgid "Chart of accounts"
msgstr ""
@@ -2301,6 +2689,11 @@ msgid "Checks"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__child_ids
+msgid "Child Messages"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_tax__children_tax_ids
#: model:ir.model.fields,field_description:account.field_account_tax_template__children_tax_ids
#: model:ir.ui.view,arch_db:account.view_account_tax_template_form
@@ -2309,34 +2702,83 @@ msgid "Children Taxes"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:155
-#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
+#: code:addons/account/models/chart_template.py:349
#, python-format
msgid "Choose Accounting Template"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.account_invoice_onboarding_sale_tax_form
+#: model:ir.ui.view,arch_db:account.onboarding_sale_tax_step
+msgid "Choose a default sales tax for your products."
+msgstr ""
+
+#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:131
+#: code:addons/account/static/src/xml/account_reconciliation.xml:134
+#, python-format
+msgid "Choose counterpart or Create Write-off"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_refund__filter_refund
+msgid "Choose how you want to credit this invoice. You cannot Modify and Cancel if the invoice is already reconciled"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.actions_account_fiscal_year
+msgid "Click here to create a new fiscal year."
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/js/tour.js:19
+#, python-format
+msgid "Click to <b>send the invoice by email.</b>"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/js/tour.js:23
#, python-format
-msgid "Choose counterpart"
+msgid "Click to <b>send the invoice.</b>"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:264
+#: code:addons/account/static/src/js/tour.js:14
+#, python-format
+msgid "Click to <b>validate your invoice.</b> A reference will be assigned to this invoice and you will not be able to modify it anymore."
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:17
+#, python-format
+msgid "Click to Rename"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:302
#, python-format
msgid "Close"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:60
+#: code:addons/account/static/src/xml/account_reconciliation.xml:63
#, python-format
msgid "Close statement"
msgstr ""
#. module: account
+#: selection:res.company,account_dashboard_onboarding_state:0
+#: selection:res.company,account_invoice_onboarding_state:0
+msgid "Closed"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_bank_statement__date_done
msgid "Closed On"
msgstr ""
@@ -2346,9 +2788,11 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_account__code
#: model:ir.model.fields,field_description:account.field_account_account_template__code
#: model:ir.model.fields,field_description:account.field_account_analytic_line__code
+#: model:ir.model.fields,field_description:account.field_account_incoterms__code
#: model:ir.model.fields,field_description:account.field_account_payment__payment_method_code
#: model:ir.model.fields,field_description:account.field_account_payment_method__code
#: model:ir.model.fields,field_description:account.field_account_register_payments__payment_method_code
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__new_journal_code
#: model:ir.ui.view,arch_db:account.report_trialbalance
msgid "Code"
msgstr ""
@@ -2365,7 +2809,12 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
-msgid "Collect customer payments in one-click using Euro SEPA Service."
+msgid "Collect customer payments in one-click using Euro SEPA Service"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Collect information and produce statistics on the trade in goods in Europe with intrastat."
msgstr ""
#. module: account
@@ -2380,22 +2829,24 @@ msgid "Column Label"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff__comment
-msgid "Comment"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice__commercial_partner_id
#: model:ir.model.fields,help:account.field_account_invoice_report__commercial_partner_id
msgid "Commercial Entity"
msgstr ""
#. module: account
+#: code:addons/account/models/account_invoice.py:519
+#, python-format
+msgid "Commercial partner and vendor account owners must be identical."
+msgstr ""
+
+#. module: account
#: model:ir.actions.act_window,name:account.action_account_common_menu
msgid "Common Report"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_res_config_settings__invoice_reference_type
#: model:ir.ui.view,arch_db:account.report_overdue_document
msgid "Communication"
msgstr ""
@@ -2412,19 +2863,18 @@ msgid "Companies that refers to partner"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_abstract_payment__company_id
#: model:ir.model.fields,field_description:account.field_account_account__company_id
#: model:ir.model.fields,field_description:account.field_account_aged_trial_balance__company_id
#: model:ir.model.fields,field_description:account.field_account_balance_report__company_id
#: model:ir.model.fields,field_description:account.field_account_bank_statement__company_id
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line__company_id
-#: model:ir.model.fields,field_description:account.field_account_chart_template__company_id
#: model:ir.model.fields,field_description:account.field_account_common_account_report__company_id
#: model:ir.model.fields,field_description:account.field_account_common_journal_report__company_id
#: model:ir.model.fields,field_description:account.field_account_common_partner_report__company_id
#: model:ir.model.fields,field_description:account.field_account_common_report__company_id
#: model:ir.model.fields,field_description:account.field_account_financial_year_op__company_id
#: model:ir.model.fields,field_description:account.field_account_fiscal_position__company_id
+#: model:ir.model.fields,field_description:account.field_account_fiscal_year__company_id
#: model:ir.model.fields,field_description:account.field_account_invoice__company_id
#: model:ir.model.fields,field_description:account.field_account_invoice_line__company_id
#: model:ir.model.fields,field_description:account.field_account_invoice_report__company_id
@@ -2432,21 +2882,17 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_journal__company_id
#: model:ir.model.fields,field_description:account.field_account_move__company_id
#: model:ir.model.fields,field_description:account.field_account_move_line__company_id
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile__company_id
-#: model:ir.model.fields,field_description:account.field_account_opening__company_id
#: model:ir.model.fields,field_description:account.field_account_partial_reconcile__company_id
#: model:ir.model.fields,field_description:account.field_account_payment__company_id
#: model:ir.model.fields,field_description:account.field_account_payment_term__company_id
#: model:ir.model.fields,field_description:account.field_account_print_journal__company_id
#: model:ir.model.fields,field_description:account.field_account_reconcile_model__company_id
-#: model:ir.model.fields,field_description:account.field_account_register_payments__company_id
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger__company_id
#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger__company_id
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__company_id
#: model:ir.model.fields,field_description:account.field_account_tax__company_id
#: model:ir.model.fields,field_description:account.field_account_tax_report__company_id
-#: model:ir.model.fields,field_description:account.field_account_tax_template__company_id
#: model:ir.model.fields,field_description:account.field_accounting_report__company_id
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__company_id
#: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
#: model:ir.ui.view,arch_db:account.view_account_payment_search
#: model:ir.ui.view,arch_db:account.view_account_tax_search
@@ -2463,54 +2909,37 @@ msgid "Company Currency"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/models/company.py:147
-#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:30
-#, python-format
-msgid "Company Data"
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,field_description:account.field_res_company__account_setup_company_data_done
-msgid "Company Setup Marked As Done"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_res_config_settings__has_chart_of_accounts
msgid "Company has a chart of accounts"
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_account_abstract_payment__company_id
#: model:ir.model.fields,help:account.field_account_bank_statement__company_id
#: model:ir.model.fields,help:account.field_account_bank_statement_line__company_id
#: model:ir.model.fields,help:account.field_account_journal__company_id
#: model:ir.model.fields,help:account.field_account_move__company_id
#: model:ir.model.fields,help:account.field_account_payment__company_id
-#: model:ir.model.fields,help:account.field_account_register_payments__company_id
msgid "Company related to this journal"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
-msgid "Compare actual revenues &amp; costs with budgets"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.accounting_report_view
msgid "Comparison"
msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_chart_template__complete_tax_set
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__complete_tax_set
msgid "Complete Set of Taxes"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:576
-#, python-format
-msgid "Compose Email"
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__composer_id
+msgid "Composer"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__composition_mode
+msgid "Composition mode"
msgstr ""
#. module: account
@@ -2534,38 +2963,14 @@ msgid "Configuration"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:615
-#: code:addons/account/models/account_payment.py:617
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:34
-#, python-format
-msgid "Configuration Steps"
-msgstr ""
-
-#. module: account
-#: code:addons/account/models/account_invoice.py:466
-#, python-format
-msgid "Configuration error!\n"
-"Could not find any account to create the invoice, are you sure you have a chart of account installed?"
-msgstr ""
-
-#. module: account
-#: code:addons/account/models/account.py:477
-#, python-format
-msgid "Configuration error!\n"
-"The currency of the journal should be the same than the default credit account."
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+#: model:ir.ui.view,arch_db:account.onboarding_fiscal_year_step
+msgid "Configure"
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:479
-#, python-format
-msgid "Configuration error!\n"
-"The currency of the journal should be the same than the default debit account."
+#: model:ir.actions.act_window,name:account.action_open_account_onboarding_invoice_layout
+msgid "Configure your document layout"
msgstr ""
#. module: account
@@ -2608,25 +3013,35 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:52
+#: code:addons/account/static/src/xml/account_reconciliation.xml:55
#, python-format
msgid "Congrats, you're all done!"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.account_invoice_onboarding_panel
+msgid "Congratulations! You are all set."
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_res_partner
+#: model:ir.ui.view,arch_db:account.portal_invoice_page
msgid "Contact"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.portal_invoice_page
+msgid "Contact us"
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_abstract_payment
msgid "Contains the logic shared between models which allows to register payments"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_res_partner__contract_ids
-#: model:ir.model.fields,field_description:account.field_res_users__contract_ids
-msgid "Contracts"
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__body
+msgid "Contents"
msgstr ""
#. module: account
@@ -2641,14 +3056,20 @@ msgid "Control-Access"
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:103
+#, python-format
+msgid "Correction of <a href=# data-oe-model=account.invoice data-oe-id=%d>%s</a><br>Reason: %s"
+msgstr ""
+
+#. module: account
#: model:account.account.type,name:account.data_account_type_direct_costs
msgid "Cost of Revenue"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:871
+#: code:addons/account/models/chart_template.py:192
#, python-format
-msgid "Could not install new chart of account as there are already accounting entries existing"
+msgid "Could not install new chart of account as there are already accounting entries existing."
msgstr ""
#. module: account
@@ -2679,10 +3100,20 @@ msgid "Country of the Partner Company"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:131
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+#: model:ir.ui.view,arch_db:account.setup_bank_account_wizard
+msgid "Create"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__create_or_link_option
+msgid "Create Or Link Option"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/company.py:279
#, python-format
-msgid "Create Write-off"
+msgid "Create a Bank Account"
msgstr ""
#. module: account
@@ -2727,6 +3158,11 @@ msgid "Create a new fiscal position"
msgstr ""
#. module: account
+#: model:ir.actions.act_window,help:account.action_incoterms_tree
+msgid "Create a new incoterm"
+msgstr ""
+
+#. module: account
#: model:ir.actions.act_window,help:account.product_product_action_purchasable
msgid "Create a new purchasable product"
msgstr ""
@@ -2775,12 +3211,17 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:163
+#: code:addons/account/static/src/xml/account_reconciliation.xml:167
#, python-format
msgid "Create model"
msgstr ""
#. module: account
+#: selection:account.setup.bank.manual.config,create_or_link_option:0
+msgid "Create new journal"
+msgstr ""
+
+#. module: account
#: model:ir.actions.act_window,help:account.rounding_list_action
msgid "Create the first cash rounding"
msgstr ""
@@ -2792,7 +3233,6 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_account_type__create_uid
#: model:ir.model.fields,field_description:account.field_account_aged_trial_balance__create_uid
#: model:ir.model.fields,field_description:account.field_account_balance_report__create_uid
-#: model:ir.model.fields,field_description:account.field_account_bank_accounts_wizard__create_uid
#: model:ir.model.fields,field_description:account.field_account_bank_statement__create_uid
#: model:ir.model.fields,field_description:account.field_account_bank_statement_cashbox__create_uid
#: model:ir.model.fields,field_description:account.field_account_bank_statement_closebalance__create_uid
@@ -2812,20 +3252,21 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax__create_uid
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_template__create_uid
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template__create_uid
+#: model:ir.model.fields,field_description:account.field_account_fiscal_year__create_uid
#: model:ir.model.fields,field_description:account.field_account_full_reconcile__create_uid
#: model:ir.model.fields,field_description:account.field_account_group__create_uid
+#: model:ir.model.fields,field_description:account.field_account_incoterms__create_uid
#: model:ir.model.fields,field_description:account.field_account_invoice__create_uid
#: model:ir.model.fields,field_description:account.field_account_invoice_confirm__create_uid
+#: model:ir.model.fields,field_description:account.field_account_invoice_import_wizard__create_uid
#: model:ir.model.fields,field_description:account.field_account_invoice_line__create_uid
#: model:ir.model.fields,field_description:account.field_account_invoice_refund__create_uid
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__create_uid
#: model:ir.model.fields,field_description:account.field_account_invoice_tax__create_uid
#: model:ir.model.fields,field_description:account.field_account_journal__create_uid
#: model:ir.model.fields,field_description:account.field_account_move__create_uid
#: model:ir.model.fields,field_description:account.field_account_move_line__create_uid
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile__create_uid
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff__create_uid
#: model:ir.model.fields,field_description:account.field_account_move_reversal__create_uid
-#: model:ir.model.fields,field_description:account.field_account_opening__create_uid
#: model:ir.model.fields,field_description:account.field_account_partial_reconcile__create_uid
#: model:ir.model.fields,field_description:account.field_account_payment__create_uid
#: model:ir.model.fields,field_description:account.field_account_payment_method__create_uid
@@ -2837,6 +3278,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_register_payments__create_uid
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger__create_uid
#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger__create_uid
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__create_uid
#: model:ir.model.fields,field_description:account.field_account_tax__create_uid
#: model:ir.model.fields,field_description:account.field_account_tax_group__create_uid
#: model:ir.model.fields,field_description:account.field_account_tax_report__create_uid
@@ -2847,7 +3289,6 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_cash_box_out__create_uid
#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard__create_uid
#: model:ir.model.fields,field_description:account.field_validate_account_move__create_uid
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__create_uid
msgid "Created by"
msgstr ""
@@ -2858,7 +3299,6 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_account_type__create_date
#: model:ir.model.fields,field_description:account.field_account_aged_trial_balance__create_date
#: model:ir.model.fields,field_description:account.field_account_balance_report__create_date
-#: model:ir.model.fields,field_description:account.field_account_bank_accounts_wizard__create_date
#: model:ir.model.fields,field_description:account.field_account_bank_statement__create_date
#: model:ir.model.fields,field_description:account.field_account_bank_statement_cashbox__create_date
#: model:ir.model.fields,field_description:account.field_account_bank_statement_closebalance__create_date
@@ -2878,20 +3318,21 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax__create_date
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_template__create_date
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template__create_date
+#: model:ir.model.fields,field_description:account.field_account_fiscal_year__create_date
#: model:ir.model.fields,field_description:account.field_account_full_reconcile__create_date
#: model:ir.model.fields,field_description:account.field_account_group__create_date
+#: model:ir.model.fields,field_description:account.field_account_incoterms__create_date
#: model:ir.model.fields,field_description:account.field_account_invoice__create_date
#: model:ir.model.fields,field_description:account.field_account_invoice_confirm__create_date
+#: model:ir.model.fields,field_description:account.field_account_invoice_import_wizard__create_date
#: model:ir.model.fields,field_description:account.field_account_invoice_line__create_date
#: model:ir.model.fields,field_description:account.field_account_invoice_refund__create_date
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__create_date
#: model:ir.model.fields,field_description:account.field_account_invoice_tax__create_date
#: model:ir.model.fields,field_description:account.field_account_journal__create_date
#: model:ir.model.fields,field_description:account.field_account_move__create_date
#: model:ir.model.fields,field_description:account.field_account_move_line__create_date
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile__create_date
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff__create_date
#: model:ir.model.fields,field_description:account.field_account_move_reversal__create_date
-#: model:ir.model.fields,field_description:account.field_account_opening__create_date
#: model:ir.model.fields,field_description:account.field_account_partial_reconcile__create_date
#: model:ir.model.fields,field_description:account.field_account_payment__create_date
#: model:ir.model.fields,field_description:account.field_account_payment_method__create_date
@@ -2903,6 +3344,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_register_payments__create_date
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger__create_date
#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger__create_date
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__create_date
#: model:ir.model.fields,field_description:account.field_account_tax__create_date
#: model:ir.model.fields,field_description:account.field_account_tax_group__create_date
#: model:ir.model.fields,field_description:account.field_account_tax_report__create_date
@@ -2913,13 +3355,11 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_cash_box_out__create_date
#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard__create_date
#: model:ir.model.fields,field_description:account.field_validate_account_move__create_date
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__create_date
msgid "Created on"
msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_move_line__credit
-#: model:ir.ui.view,arch_db:account.report_financial
#: model:ir.ui.view,arch_db:account.report_generalledger
#: model:ir.ui.view,arch_db:account.report_journal
#: model:ir.ui.view,arch_db:account.report_partnerledger
@@ -2938,20 +3378,21 @@ msgid "Credit Cash Basis"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_refund__filter_refund
+msgid "Credit Method"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_partial_reconcile__credit_move_id
msgid "Credit Move"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:445
-#: code:addons/account/models/account_invoice.py:1224
-#: code:addons/account/wizard/account_invoice_refund.py:111
+#: code:addons/account/models/account_invoice.py:486
+#: code:addons/account/models/account_invoice.py:1317
#: model:ir.actions.act_window,name:account.action_account_invoice_refund
#: model:ir.model,name:account.model_account_invoice_refund
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-#: model:ir.ui.view,arch_db:account.invoice_form
-#: model:ir.ui.view,arch_db:account.invoice_supplier_form
-#: model:ir.ui.view,arch_db:account.portal_invoice_page
#: model:ir.ui.view,arch_db:account.report_invoice_document
#: model:ir.ui.view,arch_db:account.view_account_invoice_refund
#: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
@@ -2960,7 +3401,7 @@ msgid "Credit Note"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:446
+#: code:addons/account/models/account_invoice.py:487
#, python-format
msgid "Credit Note - %s"
msgstr ""
@@ -2981,6 +3422,8 @@ msgid "Credit Note Entry Sequence"
msgstr ""
#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_out_refund
+#: model:ir.ui.menu,name:account.menu_action_invoice_out_refund
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
msgid "Credit Notes"
msgstr ""
@@ -2996,11 +3439,6 @@ msgid "Credit account"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile__credit
-msgid "Credit amount"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,help:account.field_account_move_line__matched_credit_ids
msgid "Credit journal items that are matched with this journal item."
msgstr ""
@@ -3023,14 +3461,13 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_journal__currency_id
#: model:ir.model.fields,field_description:account.field_account_move__currency_id
#: model:ir.model.fields,field_description:account.field_account_move_line__currency_id
-#: model:ir.model.fields,field_description:account.field_account_opening__currency_id
#: model:ir.model.fields,field_description:account.field_account_partial_reconcile__currency_id
#: model:ir.model.fields,field_description:account.field_account_payment__currency_id
#: model:ir.model.fields,field_description:account.field_account_register_payments__currency_id
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__currency_id
#: model:ir.model.fields,field_description:account.field_res_config_settings__currency_id
#: model:ir.model.fields,field_description:account.field_res_partner__currency_id
#: model:ir.model.fields,field_description:account.field_res_users__currency_id
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__currency_id
#: model:ir.ui.view,arch_db:account.report_generalledger
#: model:ir.ui.view,arch_db:account.report_journal
#: model:ir.ui.view,arch_db:account.report_partnerledger
@@ -3045,13 +3482,8 @@ msgid "Currency Rate"
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_wizard_multi_charts_accounts__currency_id
-msgid "Currency as per company's country."
-msgstr ""
-
-#. module: account
-#: code:addons/account/models/account_move.py:1671
-#: code:addons/account/models/account_move.py:1683
+#: code:addons/account/models/account_move.py:1428
+#: code:addons/account/models/account_move.py:1440
#, python-format
msgid "Currency exchange rate difference"
msgstr ""
@@ -3073,6 +3505,11 @@ msgid "Current Year Earnings"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_send__starred
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
+#. module: account
#: selection:account.abstract.payment,partner_type:0
#: selection:account.payment,partner_type:0
#: selection:account.register.payments,partner_type:0
@@ -3086,33 +3523,26 @@ msgstr ""
#. module: account
#: selection:account.invoice,type:0
#: selection:account.invoice.report,type:0
-#: code:addons/account/models/account_payment.py:650
+#: code:addons/account/models/account_payment.py:770
#, python-format
msgid "Customer Credit Note"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_out_refund
-#: model:ir.ui.menu,name:account.menu_action_invoice_out_refund
-msgid "Customer Credit Notes"
-msgstr ""
-
-#. module: account
#: selection:account.invoice,type:0
#: selection:account.invoice.report,type:0
msgid "Customer Invoice"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:193
-#: model:ir.actions.act_window,name:account.action_invoice_tree1
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
+#: code:addons/account/models/chart_template.py:409
#, python-format
msgid "Customer Invoices"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:648
+#: code:addons/account/models/account_payment.py:768
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#, python-format
msgid "Customer Payment"
msgstr ""
@@ -3124,11 +3554,18 @@ msgid "Customer Payment Terms"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+#: model:ir.ui.view,arch_db:account.view_account_payment_search
msgid "Customer Payments"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice__access_url
+msgid "Customer Portal URL"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_product_product__taxes_id
#: model:ir.model.fields,field_description:account.field_product_template__taxes_id
msgid "Customer Taxes"
@@ -3141,19 +3578,62 @@ msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_account_customer
+#: model:ir.ui.menu,name:account.menu_finance_receivables
msgid "Customers"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.onboarding_invoice_layout_step
+msgid "Customize"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.onboarding_invoice_layout_step
+msgid "Customize the look of your invoices."
+msgstr ""
+
+#. module: account
+#: model:account.incoterms,name:account.incoterm_DAF
+msgid "DELIVERED AT FRONTIER"
+msgstr ""
+
+#. module: account
+#: model:account.incoterms,name:account.incoterm_DAP
+msgid "DELIVERED AT PLACE"
+msgstr ""
+
+#. module: account
+#: model:account.incoterms,name:account.incoterm_DAT
+msgid "DELIVERED AT TERMINAL"
+msgstr ""
+
+#. module: account
+#: model:account.incoterms,name:account.incoterm_DDP
+msgid "DELIVERED DUTY PAID"
+msgstr ""
+
+#. module: account
+#: model:account.incoterms,name:account.incoterm_DDU
+msgid "DELIVERED DUTY UNPAID"
+msgstr ""
+
+#. module: account
+#: model:account.incoterms,name:account.incoterm_DEQ
+msgid "DELIVERED EX QUAY"
+msgstr ""
+
+#. module: account
+#: model:account.incoterms,name:account.incoterm_DES
+msgid "DELIVERED EX SHIP"
+msgstr ""
+
+#. module: account
#: selection:account.cash.rounding,rounding_method:0
msgid "DOWN"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/js/account_dashboard_setup_bar.js:214
#: model:ir.ui.menu,name:account.menu_board_journal_1
-#, python-format
msgid "Dashboard"
msgstr ""
@@ -3162,14 +3642,14 @@ msgstr ""
#: selection:account.print.journal,sort_selection:0
#: selection:account.report.general.ledger,sortby:0
#: selection:accounting.report,filter_cmp:0
-#: code:addons/account/static/src/xml/account_reconciliation.xml:237
-#: code:addons/account/static/src/xml/account_reconciliation.xml:252
+#: code:addons/account/static/src/xml/account_reconciliation.xml:275
+#: code:addons/account/static/src/xml/account_reconciliation.xml:290
#: model:ir.model.fields,field_description:account.field_account_bank_statement__date
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line__date
#: model:ir.model.fields,field_description:account.field_account_invoice_report__date
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__date
#: model:ir.model.fields,field_description:account.field_account_move__date
#: model:ir.model.fields,field_description:account.field_account_move_line__date
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff__date_p
#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard__date
#: model:ir.ui.view,arch_db:account.report_generalledger
#: model:ir.ui.view,arch_db:account.report_journal
@@ -3223,12 +3703,7 @@ msgid "Day of the month on which the invoice must come to its term. If zero or n
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
-msgid "Deactivate the \"Configuration Steps\" bar on the dashboard"
-msgstr ""
-
-#. module: account
-#: code:addons/account/models/company.py:44
+#: code:addons/account/models/company.py:51
#, python-format
msgid "Dear Sir/Madam,\n"
"\n"
@@ -3242,7 +3717,6 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_move_line__debit
-#: model:ir.ui.view,arch_db:account.report_financial
#: model:ir.ui.view,arch_db:account.report_generalledger
#: model:ir.ui.view,arch_db:account.report_journal
#: model:ir.ui.view,arch_db:account.report_partnerledger
@@ -3256,11 +3730,6 @@ msgid "Debit Cash Basis"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_journal__inbound_payment_method_ids
-msgid "Debit Methods"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_partial_reconcile__debit_move_id
msgid "Debit Move"
msgstr ""
@@ -3271,11 +3740,6 @@ msgid "Debit account"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile__debit
-msgid "Debit amount"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,help:account.field_account_move_line__matched_debit_ids
msgid "Debit journal items that are matched with this journal item."
msgstr ""
@@ -3291,6 +3755,11 @@ msgid "Dedicated Credit Note Sequence"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_res_company__invoice_reference_type
+msgid "Default Communication Type"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_journal__default_credit_account_id
msgid "Default Credit Account"
msgstr ""
@@ -3303,31 +3772,44 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_res_company__account_purchase_tax_id
#: model:ir.model.fields,field_description:account.field_res_config_settings__purchase_tax_id
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__purchase_tax_id
msgid "Default Purchase Tax"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_res_config_settings__invoice_reference_type
+msgid "Default Reference Type on Invoices."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_res_company__account_sale_tax_id
#: model:ir.model.fields,field_description:account.field_res_config_settings__sale_tax_id
msgid "Default Sale Tax"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__sale_tax_id
-msgid "Default Sales Tax"
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Default Sending Options"
msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_account__tax_ids
#: model:ir.model.fields,field_description:account.field_account_account_template__tax_ids
-#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
#: model:ir.ui.view,arch_db:account.view_account_chart_template_form
#: model:ir.ui.view,arch_db:account.view_account_template_form
msgid "Default Taxes"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_res_company__incoterm_id
+msgid "Default incoterm"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Default payment communication on customer invoices"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
msgid "Default taxes applied to local transactions"
msgstr ""
@@ -3348,6 +3830,16 @@ msgid "Define the smallest coinage of the currency used to pay by cash."
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.onboarding_fiscal_year_step
+msgid "Define your fiscal years opening &amp; closing dates."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_journal__bank_statements_source
+msgid "Defines how the bank statements will be registered"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_invoice__cash_rounding_id
msgid "Defines the smallest coinage of the currency that can be used to pay by cash."
msgstr ""
@@ -3365,6 +3857,21 @@ msgid "Degree of trust you have in this debtor"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__auto_delete
+msgid "Delete Emails"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__auto_delete_message
+msgid "Delete Message Copy"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_send__auto_delete
+msgid "Delete sent emails (mass mailing only)"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_account__deprecated
msgid "Deprecated"
msgstr ""
@@ -3382,13 +3889,12 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:255
+#: code:addons/account/static/src/xml/account_reconciliation.xml:293
#: model:ir.model.fields,field_description:account.field_account_account_type__note
#: model:ir.model.fields,field_description:account.field_account_invoice_line__name
-#: model:ir.ui.view,arch_db:account.portal_invoice_report
-#: model:ir.ui.view,arch_db:account.report_invoice_document
#: model:ir.ui.view,arch_db:account.view_account_payment_search
#: model:ir.ui.view,arch_db:account.view_account_type_form
+#: model:ir.ui.view,arch_db:account.view_invoice_line_form
#, python-format
msgid "Description"
msgstr ""
@@ -3421,7 +3927,9 @@ msgid "Difference"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_abstract_payment__writeoff_account_id
#: model:ir.model.fields,field_description:account.field_account_payment__writeoff_account_id
+#: model:ir.model.fields,field_description:account.field_account_register_payments__writeoff_account_id
msgid "Difference Account"
msgstr ""
@@ -3431,14 +3939,8 @@ msgid "Difference between the computed ending balance and the specified ending b
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.portal_invoice_report
-#: model:ir.ui.view,arch_db:account.report_invoice_document
-msgid "Disc.(%)"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.view,arch_db:account.setup_opening_move_wizard_form
-msgid "Discard"
+#: model:ir.model,name:account.model_digest_digest
+msgid "Digest"
msgstr ""
#. module: account
@@ -3466,7 +3968,6 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_account_type__display_name
#: model:ir.model.fields,field_description:account.field_account_aged_trial_balance__display_name
#: model:ir.model.fields,field_description:account.field_account_balance_report__display_name
-#: model:ir.model.fields,field_description:account.field_account_bank_accounts_wizard__display_name
#: model:ir.model.fields,field_description:account.field_account_bank_statement__display_name
#: model:ir.model.fields,field_description:account.field_account_bank_statement_cashbox__display_name
#: model:ir.model.fields,field_description:account.field_account_bank_statement_closebalance__display_name
@@ -3486,21 +3987,22 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax__display_name
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_template__display_name
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template__display_name
+#: model:ir.model.fields,field_description:account.field_account_fiscal_year__display_name
#: model:ir.model.fields,field_description:account.field_account_full_reconcile__display_name
#: model:ir.model.fields,field_description:account.field_account_group__display_name
+#: model:ir.model.fields,field_description:account.field_account_incoterms__display_name
#: model:ir.model.fields,field_description:account.field_account_invoice__display_name
#: model:ir.model.fields,field_description:account.field_account_invoice_confirm__display_name
+#: model:ir.model.fields,field_description:account.field_account_invoice_import_wizard__display_name
#: model:ir.model.fields,field_description:account.field_account_invoice_line__display_name
#: model:ir.model.fields,field_description:account.field_account_invoice_refund__display_name
#: model:ir.model.fields,field_description:account.field_account_invoice_report__display_name
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__display_name
#: model:ir.model.fields,field_description:account.field_account_invoice_tax__display_name
#: model:ir.model.fields,field_description:account.field_account_journal__display_name
#: model:ir.model.fields,field_description:account.field_account_move__display_name
#: model:ir.model.fields,field_description:account.field_account_move_line__display_name
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile__display_name
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff__display_name
#: model:ir.model.fields,field_description:account.field_account_move_reversal__display_name
-#: model:ir.model.fields,field_description:account.field_account_opening__display_name
#: model:ir.model.fields,field_description:account.field_account_partial_reconcile__display_name
#: model:ir.model.fields,field_description:account.field_account_payment__display_name
#: model:ir.model.fields,field_description:account.field_account_payment_method__display_name
@@ -3509,9 +4011,11 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_print_journal__display_name
#: model:ir.model.fields,field_description:account.field_account_reconcile_model__display_name
#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template__display_name
+#: model:ir.model.fields,field_description:account.field_account_reconciliation_widget__display_name
#: model:ir.model.fields,field_description:account.field_account_register_payments__display_name
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger__display_name
#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger__display_name
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__display_name
#: model:ir.model.fields,field_description:account.field_account_tax__display_name
#: model:ir.model.fields,field_description:account.field_account_tax_group__display_name
#: model:ir.model.fields,field_description:account.field_account_tax_report__display_name
@@ -3523,6 +4027,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_report_account_report_agedpartnerbalance__display_name
#: model:ir.model.fields,field_description:account.field_report_account_report_financial__display_name
#: model:ir.model.fields,field_description:account.field_report_account_report_generalledger__display_name
+#: model:ir.model.fields,field_description:account.field_report_account_report_invoice_with_payments__display_name
#: model:ir.model.fields,field_description:account.field_report_account_report_journal__display_name
#: model:ir.model.fields,field_description:account.field_report_account_report_overdue__display_name
#: model:ir.model.fields,field_description:account.field_report_account_report_partnerledger__display_name
@@ -3530,11 +4035,21 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_report_account_report_trialbalance__display_name
#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard__display_name
#: model:ir.model.fields,field_description:account.field_validate_account_move__display_name
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__display_name
msgid "Display Name"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_res_company__qr_code
+#: model:ir.model.fields,field_description:account.field_res_config_settings__qr_code
+msgid "Display SEPA QR code"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_line__display_type
+msgid "Display Type"
+msgstr ""
+
+#. module: account
#: selection:account.financial.report,display_detail:0
msgid "Display children flat"
msgstr ""
@@ -3555,6 +4070,17 @@ msgid "Display on Invoices"
msgstr ""
#. module: account
+#: code:addons/account/models/digest.py:16
+#, python-format
+msgid "Do not have access, skip this data for user's digest email"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_send__auto_delete_message
+msgid "Do not keep a copy of the email in the document communication history (mass mailing only)"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_res_config_settings__module_print_docsaway
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
msgid "Docsaway"
@@ -3567,9 +4093,16 @@ msgid "Document: Customer account statement<br/>\n"
msgstr ""
#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_payables_documents
-#: model:ir.ui.menu,name:account.menu_finance_receivables_documents
-msgid "Documents"
+#: model:ir.ui.view,arch_db:account.account_invoice_send_wizard_form
+#: selection:res.company,account_dashboard_onboarding_state:0
+#: selection:res.company,account_invoice_onboarding_state:0
+#: selection:res.company,account_onboarding_invoice_layout_state:0
+#: selection:res.company,account_onboarding_sale_tax_state:0
+#: selection:res.company,account_onboarding_sample_invoice_state:0
+#: selection:res.company,account_setup_bank_data_state:0
+#: selection:res.company,account_setup_coa_state:0
+#: selection:res.company,account_setup_fy_data_state:0
+msgid "Done"
msgstr ""
#. module: account
@@ -3588,20 +4121,13 @@ msgid "Draft"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.invoice_supplier_form
-msgid "Draft Bill"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.invoice_form
-#: model:ir.ui.view,arch_db:account.invoice_supplier_form
msgid "Draft Credit Note"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:443
+#: code:addons/account/models/account_invoice.py:484
#: model:ir.ui.view,arch_db:account.invoice_form
-#: model:ir.ui.view,arch_db:account.portal_invoice_page
#: model:ir.ui.view,arch_db:account.report_invoice_document
#, python-format
msgid "Draft Invoice"
@@ -3630,13 +4156,14 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/controllers/portal.py:71
-#: code:addons/account/static/src/xml/account_reconciliation.xml:238
+#: code:addons/account/controllers/portal.py:45
+#: code:addons/account/static/src/xml/account_reconciliation.xml:276
#: model:ir.model.fields,field_description:account.field_account_invoice__date_due
#: model:ir.model.fields,field_description:account.field_account_invoice_report__date_due
#: model:ir.ui.view,arch_db:account.portal_my_invoices
#: model:ir.ui.view,arch_db:account.report_overdue_document
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
+#: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
#, python-format
msgid "Due Date"
msgstr ""
@@ -3647,11 +4174,6 @@ msgid "Due Date Computation"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
-msgid "Due Month"
-msgstr ""
-
-#. module: account
#: model:ir.actions.report,name:account.action_report_print_overdue
msgid "Due Payments"
msgstr ""
@@ -3672,7 +4194,7 @@ msgid "Due the"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1184
+#: code:addons/account/models/account_invoice.py:1272
#, python-format
msgid "Duplicated vendor reference detected. You probably encoded twice the same vendor bill/credit note."
msgstr ""
@@ -3688,20 +4210,50 @@ msgid "EU Digital Goods VAT"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:171
-#: code:addons/account/models/chart_template.py:186
-#: code:addons/account/models/chart_template.py:196
+#: model:account.incoterms,name:account.incoterm_EXW
+msgid "EX WORKS"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/chart_template.py:387
+#: code:addons/account/models/chart_template.py:402
+#: code:addons/account/models/chart_template.py:412
#, python-format
msgid "EXCH"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1090
+#: code:addons/account/models/account_move.py:973
#, python-format
msgid "Either pass both debit and credit or none."
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__is_email
+msgid "Email"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_journal_form
+msgid "Email Alias"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_send__email_from
+msgid "Email address of the sender. This field is set when no matching partner is found and replaces the author_id field in the chatter."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_company__invoice_is_email
+msgid "Email by default"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_journal_form
+msgid "Email your Vendor Bills"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_accounting_report__enable_filter
msgid "Enable Comparison"
msgstr ""
@@ -3713,6 +4265,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_common_journal_report__date_to
#: model:ir.model.fields,field_description:account.field_account_common_partner_report__date_to
#: model:ir.model.fields,field_description:account.field_account_common_report__date_to
+#: model:ir.model.fields,field_description:account.field_account_fiscal_year__date_to
#: model:ir.model.fields,field_description:account.field_account_print_journal__date_to
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger__date_to
#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger__date_to
@@ -3737,6 +4290,11 @@ msgid "Ending Cashbox"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_fiscal_year__date_to
+msgid "Ending Date, included in the fiscal year."
+msgstr ""
+
+#. module: account
#: model:ir.actions.act_window,name:account.action_move_line_form
msgid "Entries"
msgstr ""
@@ -3747,9 +4305,9 @@ msgid "Entries Sorted by"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1055
+#: code:addons/account/models/account_move.py:911
#, python-format
-msgid "Entries are not of the same account!"
+msgid "Entries are not from the same account."
msgstr ""
#. module: account
@@ -3779,19 +4337,21 @@ msgid "Entry lines"
msgstr ""
#. module: account
+#: selection:account.account.type,internal_group:0
#: model:account.account.type,name:account.data_account_type_equity
#: model:ir.ui.view,arch_db:account.view_account_form
+#: model:ir.ui.view,arch_db:account.view_account_search
msgid "Equity"
msgstr ""
#. module: account
-#: code:addons/account/models/res_config_settings.py:114
+#: code:addons/account/models/res_config_settings.py:144
#, python-format
msgid "Error!"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:196
+#: code:addons/account/models/chart_template.py:412
#, python-format
msgid "Exchange Difference"
msgstr ""
@@ -3813,6 +4373,7 @@ msgid "Expects a Chart of Accounts"
msgstr ""
#. module: account
+#: selection:account.account.type,internal_group:0
#: model:account.financial.report,name:account.account_financial_report_expense0
msgid "Expense"
msgstr ""
@@ -3833,6 +4394,7 @@ msgstr ""
#. module: account
#: model:account.account.type,name:account.data_account_type_expenses
#: model:ir.ui.view,arch_db:account.view_account_form
+#: model:ir.ui.view,arch_db:account.view_account_search
msgid "Expenses"
msgstr ""
@@ -3842,6 +4404,33 @@ msgid "External Reference"
msgstr ""
#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:308
+#, python-format
+msgid "External link"
+msgstr ""
+
+#. module: account
+#: model:account.incoterms,name:account.incoterm_FAS
+msgid "FREE ALONGSIDE SHIP"
+msgstr ""
+
+#. module: account
+#: model:account.incoterms,name:account.incoterm_FCA
+msgid "FREE CARRIER"
+msgstr ""
+
+#. module: account
+#: model:account.incoterms,name:account.incoterm_FOB
+msgid "FREE ON BOARD"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__starred_partner_ids
+msgid "Favorited By"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_account_journal_search
msgid "Favorites"
msgstr ""
@@ -3858,8 +4447,8 @@ msgid "Federal States"
msgstr ""
#. module: account
-#: selection:account.journal,bank_statements_source:0
-msgid "File Import"
+#: model:ir.model.fields,field_description:account.field_account_invoice_import_wizard__attachment_ids
+msgid "Files"
msgstr ""
#. module: account
@@ -3874,7 +4463,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:141
+#: code:addons/account/static/src/xml/account_reconciliation.xml:144
#, python-format
msgid "Filter..."
msgstr ""
@@ -3898,21 +4487,11 @@ msgid "Financial Reports"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_res_company__account_setup_fy_data_done
-msgid "Financial Year Setup Marked As Done"
-msgstr ""
-
-#. module: account
#: model:ir.actions.report,name:account.action_report_financial
msgid "Financial report"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_financial_year_op__account_setup_fy_data_done
-msgid "Financial year setup marked as done"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.view_partner_property_form
msgid "Fiscal Information"
msgstr ""
@@ -3964,14 +4543,25 @@ msgid "Fiscal Positions"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/models/company.py:188
-#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:20
+#: code:addons/account/models/company.py:296
+#: model:ir.model,name:account.model_account_fiscal_year
+#: model:ir.ui.view,arch_db:account.onboarding_fiscal_year_step
#, python-format
msgid "Fiscal Year"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.action_account_fiscal_year_form
+msgid "Fiscal Year 2018"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.actions_account_fiscal_year
+#: model:ir.model.fields,field_description:account.field_res_config_settings__group_fiscal_year
+msgid "Fiscal Years"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_financial_year_op__fiscalyear_last_day
#: model:ir.model.fields,field_description:account.field_res_company__fiscalyear_last_day
msgid "Fiscalyear Last Day"
@@ -4012,13 +4602,39 @@ msgid "Fixed amount will count as a debit if it is negative, as a credit if it i
msgstr ""
#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_receivables_follow_up
-msgid "Follow-up"
+#: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_reports_followup
+msgid "Follow-up Levels"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_reports_followup
-msgid "Follow-up Levels"
+#: model:ir.model.fields,field_description:account.field_account_bank_statement__message_follower_ids
+#: model:ir.model.fields,field_description:account.field_account_invoice__message_follower_ids
+#: model:ir.model.fields,field_description:account.field_account_payment__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_bank_statement__message_channel_ids
+#: model:ir.model.fields,field_description:account.field_account_invoice__message_channel_ids
+#: model:ir.model.fields,field_description:account.field_account_payment__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_bank_statement__message_partner_ids
+#: model:ir.model.fields,field_description:account.field_account_invoice__message_partner_ids
+#: model:ir.model.fields,field_description:account.field_account_payment__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_journal__inbound_payment_method_ids
+msgid "For Incoming Payments"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_journal__outbound_payment_method_ids
+msgid "For Outgoing Payments"
msgstr ""
#. module: account
@@ -4032,22 +4648,38 @@ msgid "For percent enter a ratio between 0-100."
msgstr ""
#. module: account
+#: sql_constraint:account.invoice.line:0
+msgid "Forbidden unit price, account and quantity on non-accountable invoice line"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_reconcile_model__force_second_tax_included
+#: model:ir.model.fields,help:account.field_account_reconcile_model_template__force_second_tax_included
+msgid "Force the second tax to be managed as a price included tax."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_reconcile_model__force_tax_included
+#: model:ir.model.fields,help:account.field_account_reconcile_model_template__force_tax_included
+msgid "Force the tax to be managed as a price included tax."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_account__currency_id
msgid "Forces all moves for this account to have this account currency."
msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_account_account_template__currency_id
-#: model:ir.model.fields,help:account.field_account_bank_accounts_wizard__currency_id
msgid "Forces all moves for this account to have this secondary currency."
msgstr ""
#. module: account
-#: code:addons/account/report/account_aged_partner_balance.py:205
+#: code:addons/account/report/account_aged_partner_balance.py:217
#: code:addons/account/report/account_balance.py:64
#: code:addons/account/report/account_general_ledger.py:114
#: code:addons/account/report/account_journal.py:100
-#: code:addons/account/report/account_partner_ledger.py:74
+#: code:addons/account/report/account_partner_ledger.py:72
#: code:addons/account/report/account_report_financial.py:149
#: code:addons/account/report/account_tax.py:13
#, python-format
@@ -4055,9 +4687,8 @@ msgid "Form content is missing, this report cannot be printed."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:100
-#, python-format
-msgid "Free Reference"
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__email_from
+msgid "From"
msgstr ""
#. module: account
@@ -4081,13 +4712,19 @@ msgid "From this report, you can have an overview of the amount invoiced to your
msgstr ""
#. module: account
+#: code:addons/account/models/account_invoice.py:385
+#, python-format
+msgid "From: "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_full_reconcile
#: model:ir.model.fields,field_description:account.field_account_partial_reconcile__full_reconcile_id
msgid "Full Reconcile"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:105
+#: code:addons/account/models/account_journal_dashboard.py:102
#, python-format
msgid "Future"
msgstr ""
@@ -4162,25 +4799,32 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:57
+#: code:addons/account/static/src/xml/account_reconciliation.xml:60
#, python-format
msgid "Go to bank statement(s)"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:649
+#: code:addons/account/models/account_invoice.py:756
+#: code:addons/account/models/company.py:524
#, python-format
msgid "Go to the configuration panel"
msgstr ""
#. module: account
+#: code:addons/account/models/company.py:462
+#, python-format
+msgid "Go to the journal configuration"
+msgstr ""
+
+#. module: account
#: selection:res.partner,trust:0
msgid "Good Debtor"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:46
+#: code:addons/account/static/src/xml/account_reconciliation.xml:49
#, python-format
msgid "Good Job!"
msgstr ""
@@ -4211,6 +4855,11 @@ msgid "Group Invoice Lines"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_register_payments__group_invoices
+msgid "Group Invoices"
+msgstr ""
+
+#. module: account
#: selection:account.tax,amount_type:0
#: selection:account.tax.template,amount_type:0
msgid "Group of Taxes"
@@ -4218,7 +4867,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
-msgid "Group received checks before depositing them to the bank"
+msgid "Group payments into a single batch to ease the reconciliation process"
msgstr ""
#. module: account
@@ -4248,6 +4897,19 @@ msgid "Has Unreconciled Entries"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__qr_code_valid
+#: model:ir.model.fields,field_description:account.field_res_company__qr_code_valid
+#: model:ir.model.fields,field_description:account.field_res_config_settings__qr_code_valid
+msgid "Has all required arguments"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__has_error
+#: model:ir.model.fields,help:account.field_account_invoice_send__has_error
+msgid "Has error"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_abstract_payment__hide_payment_method
#: model:ir.model.fields,field_description:account.field_account_payment__hide_payment_method
#: model:ir.model.fields,field_description:account.field_account_register_payments__hide_payment_method
@@ -4255,18 +4917,13 @@ msgid "Hide Payment Method"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_res_config_settings__account_hide_setup_bar
-msgid "Hide Setup Bar"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_tax__hide_tax_exigibility
msgid "Hide Use Cash Basis Option"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
-msgid "Hide the Configuration Steps bar"
+#: model:ir.ui.view,arch_db:account.portal_invoice_chatter
+msgid "History"
msgstr ""
#. module: account
@@ -4287,7 +4944,6 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_account_type__id
#: model:ir.model.fields,field_description:account.field_account_aged_trial_balance__id
#: model:ir.model.fields,field_description:account.field_account_balance_report__id
-#: model:ir.model.fields,field_description:account.field_account_bank_accounts_wizard__id
#: model:ir.model.fields,field_description:account.field_account_bank_statement__id
#: model:ir.model.fields,field_description:account.field_account_bank_statement_cashbox__id
#: model:ir.model.fields,field_description:account.field_account_bank_statement_closebalance__id
@@ -4307,21 +4963,22 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax__id
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_template__id
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template__id
+#: model:ir.model.fields,field_description:account.field_account_fiscal_year__id
#: model:ir.model.fields,field_description:account.field_account_full_reconcile__id
#: model:ir.model.fields,field_description:account.field_account_group__id
+#: model:ir.model.fields,field_description:account.field_account_incoterms__id
#: model:ir.model.fields,field_description:account.field_account_invoice__id
#: model:ir.model.fields,field_description:account.field_account_invoice_confirm__id
+#: model:ir.model.fields,field_description:account.field_account_invoice_import_wizard__id
#: model:ir.model.fields,field_description:account.field_account_invoice_line__id
#: model:ir.model.fields,field_description:account.field_account_invoice_refund__id
#: model:ir.model.fields,field_description:account.field_account_invoice_report__id
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__id
#: model:ir.model.fields,field_description:account.field_account_invoice_tax__id
#: model:ir.model.fields,field_description:account.field_account_journal__id
#: model:ir.model.fields,field_description:account.field_account_move__id
#: model:ir.model.fields,field_description:account.field_account_move_line__id
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile__id
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff__id
#: model:ir.model.fields,field_description:account.field_account_move_reversal__id
-#: model:ir.model.fields,field_description:account.field_account_opening__id
#: model:ir.model.fields,field_description:account.field_account_partial_reconcile__id
#: model:ir.model.fields,field_description:account.field_account_payment__id
#: model:ir.model.fields,field_description:account.field_account_payment_method__id
@@ -4330,9 +4987,11 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_print_journal__id
#: model:ir.model.fields,field_description:account.field_account_reconcile_model__id
#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template__id
+#: model:ir.model.fields,field_description:account.field_account_reconciliation_widget__id
#: model:ir.model.fields,field_description:account.field_account_register_payments__id
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger__id
#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger__id
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__id
#: model:ir.model.fields,field_description:account.field_account_tax__id
#: model:ir.model.fields,field_description:account.field_account_tax_group__id
#: model:ir.model.fields,field_description:account.field_account_tax_report__id
@@ -4344,6 +5003,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_report_account_report_agedpartnerbalance__id
#: model:ir.model.fields,field_description:account.field_report_account_report_financial__id
#: model:ir.model.fields,field_description:account.field_report_account_report_generalledger__id
+#: model:ir.model.fields,field_description:account.field_report_account_report_invoice_with_payments__id
#: model:ir.model.fields,field_description:account.field_report_account_report_journal__id
#: model:ir.model.fields,field_description:account.field_report_account_report_overdue__id
#: model:ir.model.fields,field_description:account.field_report_account_report_partnerledger__id
@@ -4351,23 +5011,48 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_report_account_report_trialbalance__id
#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard__id
#: model:ir.model.fields,field_description:account.field_validate_account_move__id
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__id
msgid "ID"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:193
+#: code:addons/account/models/chart_template.py:409
#, python-format
msgid "INV"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:390
+#: code:addons/account/models/account_bank_statement.py:325
#, python-format
msgid "If \"Amount Currency\" is specified, then \"Amount\" must be as well."
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_bank_statement__message_unread
+#: model:ir.model.fields,help:account.field_account_invoice__message_unread
+#: model:ir.model.fields,help:account.field_account_payment__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_res_config_settings__account_sanitize_invoice_ref
+msgid "If checked, customer invoices' and vendor bills' referneces will automatically correct their reference so that they are maximum 140 characters long, consist only of latin characters, contain no '//' sequence, and have no leading or trailing /."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_bank_statement__message_needaction
+#: model:ir.model.fields,help:account.field_account_invoice__message_needaction
+#: model:ir.model.fields,help:account.field_account_payment__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_bank_statement__message_has_error
+#: model:ir.model.fields,help:account.field_account_invoice__message_has_error
+#: model:ir.model.fields,help:account.field_account_payment__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_account_template__nocreate
msgid "If checked, the new chart of accounts will not contain this by default."
msgstr ""
@@ -4378,12 +5063,25 @@ msgid "If empty, uses the journal of the journal entry to be reversed."
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_register_payments__group_invoices
+msgid "If enabled, groups invoices by commercial partner, invoice account,\n"
+" type and recipient bank account in the generated payments. If disabled,\n"
+" a distinct payment will be generated for each invoice."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_tax__include_base_amount
#: model:ir.model.fields,help:account.field_account_tax_template__include_base_amount
msgid "If set, taxes which are computed after this one will be computed based on the price tax included."
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_bank_statement__accounting_date
+msgid "If set, the accounting entries created during the bank statement reconciliation process will be created at this date.\n"
+"This is useful if the accounting period in which the entries should normally be booked is already closed."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_tax__analytic
#: model:ir.model.fields,help:account.field_account_tax_template__analytic
msgid "If set, the amount computed by this tax will be assigned to the same analytic account as the invoice line (if any)"
@@ -4455,11 +5153,26 @@ msgid "Immediate Payment"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.account_invoice_import_wizard_form_view
+msgid "Import"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_bank_statement_import_qif
msgid "Import .qif files"
msgstr ""
#. module: account
+#: model:ir.actions.act_window,name:account.account_invoice_import_wizard_action
+msgid "Import Vendor Bills"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_import_wizard
+msgid "Import Your Vendor Bills from Files."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_bank_statement_import_csv
msgid "Import in .csv format"
msgstr ""
@@ -4500,19 +5213,25 @@ msgid "Import your bank statements in QIF"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:410
+#: selection:account.invoice,state:0
+#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
+msgid "In Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_bank_statement.py:345
#, python-format
msgid "In order to delete a bank statement line, you must first cancel it to delete related journal items."
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:199
+#: code:addons/account/models/account_bank_statement.py:201
#, python-format
msgid "In order to delete a bank statement, you must first cancel it to delete related journal items."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:145
+#: code:addons/account/models/account_payment.py:90
#, python-format
msgid "In order to pay multiple invoices at once, they must use the same currency."
msgstr ""
@@ -4544,9 +5263,11 @@ msgid "Included in Price"
msgstr ""
#. module: account
+#: selection:account.account.type,internal_group:0
#: model:account.account.type,name:account.data_account_type_revenue
#: model:account.financial.report,name:account.account_financial_report_income0
#: model:ir.ui.view,arch_db:account.view_account_form
+#: model:ir.ui.view,arch_db:account.view_account_search
msgid "Income"
msgstr ""
@@ -4565,28 +5286,56 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:717
+#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:747
#, python-format
msgid "Incorrect Operation"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.view_move_line_form
-msgid "Information"
+#: model:ir.model.fields,field_description:account.field_account_invoice__incoterm_id
+msgid "Incoterm"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.account_move_line_reconcile_writeoff
-msgid "Information addendum"
+#: model:ir.model.fields,help:account.field_account_incoterms__code
+msgid "Incoterm Standard Code"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_incoterms_tree
+#: model:ir.model,name:account.model_account_incoterms
+#: model:ir.ui.menu,name:account.menu_action_incoterm_open
+#: model:ir.ui.view,arch_db:account.account_incoterms_form
+#: model:ir.ui.view,arch_db:account.account_incoterms_view_search
+#: model:ir.ui.view,arch_db:account.view_incoterms_tree
+msgid "Incoterms"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_incoterms__name
+msgid "Incoterms are series of sales terms. They are used to divide transaction costs and responsibilities between buyer and seller and reflect state-of-the-art transportation practices."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_incoterms_tree
+msgid "Incoterms are used to divide transaction costs and responsibilities between buyer and seller."
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/models/company.py:233
-#: code:addons/account/models/company.py:248
-#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:10
+#: code:addons/account/static/src/xml/account_payment.xml:25
#, python-format
-msgid "Initial Balances"
+msgid "Info"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.view_move_line_form
+msgid "Information"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_send__parent_id
+msgid "Initial thread message."
msgstr ""
#. module: account
@@ -4606,13 +5355,17 @@ msgid "Inter-Banks Transfer Account"
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_account_chart_template__transfer_account_id
#: model:ir.model.fields,help:account.field_res_company__transfer_account_id
-#: model:ir.model.fields,help:account.field_wizard_multi_charts_accounts__transfer_account_id
msgid "Intermediary account used when moving money from a liquidity account to another"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_account__internal_group
+#: model:ir.model.fields,field_description:account.field_account_account_type__internal_group
+msgid "Internal Group"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_move__narration
msgid "Internal Note"
msgstr ""
@@ -4629,6 +5382,12 @@ msgid "Internal Transfer"
msgstr ""
#. module: account
+#: model:ir.actions.act_window,name:account.action_account_payments_transfer
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+msgid "Internal Transfers"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_account__internal_type
msgid "Internal Type"
msgstr ""
@@ -4639,23 +5398,33 @@ msgid "Internal notes..."
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice__incoterm_id
+#: model:ir.model.fields,help:account.field_res_company__incoterm_id
+msgid "International Commercial Terms are a series of predefined commercial terms used in international transactions."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_intrastat
+msgid "Intrastat"
+msgstr ""
+
+#. module: account
#: code:addons/account/models/partner.py:45
#, python-format
msgid "Invalid \"Zip Range\", please configure it properly."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1222
+#: code:addons/account/models/account_invoice.py:1315
#: model:ir.model,name:account.model_account_invoice
+#: model:ir.model.fields,field_description:account.field_account_invoice_report__invoice_id
#: model:ir.model.fields,field_description:account.field_account_invoice_tax__invoice_id
#: model:ir.model.fields,field_description:account.field_account_move_line__invoice_id
#: model:ir.model.fields,field_description:account.field_res_partner__invoice_warn
#: model:ir.model.fields,field_description:account.field_res_users__invoice_warn
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#: model:ir.ui.view,arch_db:account.invoice_form
-#: model:ir.ui.view,arch_db:account.invoice_supplier_tree
#: model:ir.ui.view,arch_db:account.invoice_tree
-#: model:ir.ui.view,arch_db:account.portal_invoice_page
#: model:ir.ui.view,arch_db:account.report_invoice_document
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
#: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
@@ -4669,7 +5438,7 @@ msgid "Invoice #"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:444
+#: code:addons/account/models/account_invoice.py:485
#, python-format
msgid "Invoice - %s"
msgstr ""
@@ -4681,18 +5450,26 @@ msgid "Invoice Created"
msgstr ""
#. module: account
-#: code:addons/account/controllers/portal.py:70
+#: code:addons/account/controllers/portal.py:44
#: model:ir.model.fields,field_description:account.field_account_invoice__date_invoice
#: model:ir.ui.view,arch_db:account.portal_my_invoices
-#: model:ir.ui.view,arch_db:account.report_payment_receipt
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
#, python-format
msgid "Invoice Date"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice__invoice_icon
+msgid "Invoice Icon"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.onboarding_invoice_layout_step
+msgid "Invoice Layout"
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_invoice_line
-#: model:ir.ui.view,arch_db:account.view_invoice_line_form
#: model:ir.ui.view,arch_db:account.view_invoice_line_tree
msgid "Invoice Line"
msgstr ""
@@ -4704,7 +5481,7 @@ msgid "Invoice Lines"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.report_payment_receipt
+#: model:ir.model.fields,field_description:account.field_account_invoice_report__number
msgid "Invoice Number"
msgstr ""
@@ -4739,25 +5516,25 @@ msgid "Invoice for which this invoice is the credit note"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:760
+#: code:addons/account/models/account_invoice.py:867
#, python-format
msgid "Invoice must be cancelled in order to reset it to draft."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:782
+#: code:addons/account/models/account_invoice.py:891
#, python-format
msgid "Invoice must be in draft state in order to validate it."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:802
+#: code:addons/account/models/account_invoice.py:921
#, python-format
msgid "Invoice must be paid in order to set it to register payment."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:794
+#: code:addons/account/models/account_invoice.py:908
#, python-format
msgid "Invoice must be validated in order to set it to register payment."
msgstr ""
@@ -4768,13 +5545,18 @@ msgid "Invoice paid"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.account_invoice_send_wizard_form
+msgid "Invoice send & Print"
+msgstr ""
+
+#. module: account
#: model:mail.message.subtype,description:account.mt_invoice_validated
msgid "Invoice validated"
msgstr ""
#. module: account
#: model:mail.template,report_name:account.email_template_edi_invoice
-msgid "Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''}"
+msgid "Invoice_${(object.number or '').replace('/','_')}${object.state == 'draft' and '_draft' or ''}"
msgstr ""
#. module: account
@@ -4783,14 +5565,19 @@ msgid "Invoiced"
msgstr ""
#. module: account
+#: code:addons/account/models/account_invoice_import_wizard.py:32
#: model:ir.actions.act_window,name:account.action_invoice_refund_out_tree
#: model:ir.actions.act_window,name:account.action_invoice_tree
+#: model:ir.actions.act_window,name:account.action_invoice_tree1
#: model:ir.actions.report,name:account.account_invoices
+#: model:ir.model.fields,field_description:account.field_account_abstract_payment__invoice_ids
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__invoice_ids
#: model:ir.model.fields,field_description:account.field_account_payment__invoice_ids
#: model:ir.model.fields,field_description:account.field_account_register_payments__invoice_ids
#: model:ir.model.fields,field_description:account.field_res_partner__invoice_ids
#: model:ir.model.fields,field_description:account.field_res_users__invoice_ids
#: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#: model:ir.ui.view,arch_db:account.portal_my_home_invoice
#: model:ir.ui.view,arch_db:account.portal_my_home_menu_invoice
@@ -4801,6 +5588,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:account.view_invoice_graph
#: model:ir.ui.view,arch_db:account.view_invoice_line_calendar
#: model:ir.ui.view,arch_db:account.view_invoice_pivot
+#, python-format
msgid "Invoices"
msgstr ""
@@ -4820,7 +5608,7 @@ msgid "Invoices Statistics"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:181
+#: code:addons/account/models/account_journal_dashboard.py:178
#, python-format
msgid "Invoices owed to you"
msgstr ""
@@ -4831,20 +5619,43 @@ msgid "Invoices to Validate"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_payment__reconciled_invoice_ids
+msgid "Invoices whose journal items have been reconciled with this payment's."
+msgstr ""
+
+#. module: account
#: model:ir.actions.report,name:account.account_invoices_without_payment
msgid "Invoices without Payment"
msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_finance
+#: model:ir.ui.view,arch_db:account.digest_digest_view_form
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
#: model:ir.ui.view,arch_db:account.view_partner_property_form
msgid "Invoicing"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_move_line__is_unaffected_earnings_line
-msgid "Is Unaffected Earnings Line"
+#: model:ir.model.fields,field_description:account.field_account_bank_statement__message_is_follower
+#: model:ir.model.fields,field_description:account.field_account_invoice__message_is_follower
+#: model:ir.model.fields,field_description:account.field_account_payment__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__printed
+msgid "Is Printed"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_reconcile_model__is_second_tax_price_included
+msgid "Is Second Tax Included in Price"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_reconcile_model__is_tax_price_included
+msgid "Is Tax Included in Price"
msgstr ""
#. module: account
@@ -4875,6 +5686,11 @@ msgid "It adds the currency column on report if the currency differs from the co
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_journal__alias_name
+msgid "It creates draft vendor bill by sending an email."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_invoice__reconciled
msgid "It indicates that the invoice has been paid and the journal entry of the invoice has been reconciled with one or several journal entries of payment."
msgstr ""
@@ -4885,13 +5701,13 @@ msgid "It indicates that the invoice has been sent."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1088
+#: code:addons/account/models/account_move.py:971
#, python-format
msgid "It is mandatory to specify an account and a journal to create a write-off."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:465
+#: code:addons/account/models/account_payment.py:586
#, python-format
msgid "It is not allowed to delete a payment that already created a journal entry since it would create a gap in the numbering. You should create the journal entry again and cancel it thanks to a regular revert."
msgstr ""
@@ -4919,8 +5735,8 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:189
-#: code:addons/account/static/src/xml/account_reconciliation.xml:233
+#: code:addons/account/static/src/xml/account_reconciliation.xml:193
+#: code:addons/account/static/src/xml/account_reconciliation.xml:271
#: model:ir.model,name:account.model_account_journal
#: model:ir.model.fields,field_description:account.field_account_bank_statement__journal_id
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line__journal_id
@@ -4928,13 +5744,14 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_invoice_report__journal_id
#: model:ir.model.fields,field_description:account.field_account_move__journal_id
#: model:ir.model.fields,field_description:account.field_account_move_line__journal_id
-#: model:ir.model.fields,field_description:account.field_account_opening__journal_id
#: model:ir.model.fields,field_description:account.field_account_reconcile_model__journal_id
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__linked_journal_id
#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard__journal_id
#: model:ir.ui.view,arch_db:account.report_journal
#: model:ir.ui.view,arch_db:account.view_account_journal_search
#: model:ir.ui.view,arch_db:account.view_account_move_filter
#: model:ir.ui.view,arch_db:account.view_account_move_line_filter
+#: model:ir.ui.view,arch_db:account.view_account_payment_from_invoices
#: model:ir.ui.view,arch_db:account.view_account_payment_invoice_form
#: model:ir.ui.view,arch_db:account.view_account_payment_search
#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
@@ -4949,7 +5766,7 @@ msgid "Journal & Partner"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:255
+#: code:addons/account/models/account_bank_statement.py:256
#: model:ir.actions.act_window,name:account.action_move_journal_line
#: model:ir.actions.act_window,name:account.action_move_select
#: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
@@ -4963,7 +5780,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.view_account_move_filter
-msgid "Journal Entries by Month"
+msgid "Journal Entries by Date"
msgstr ""
#. module: account
@@ -4994,15 +5811,17 @@ msgid "Journal Item"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_abstract_payment__writeoff_label
#: model:ir.model.fields,field_description:account.field_account_payment__writeoff_label
#: model:ir.model.fields,field_description:account.field_account_reconcile_model__label
#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template__label
+#: model:ir.model.fields,field_description:account.field_account_register_payments__writeoff_label
#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
msgid "Journal Item Label"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:414
+#: code:addons/account/models/account_payment.py:530
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
#: model:ir.actions.act_window,name:account.action_account_moves_all_a
@@ -5021,7 +5840,6 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_res_users__journal_item_count
#: model:ir.ui.menu,name:account.menu_action_account_moves_all
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-#: model:ir.ui.view,arch_db:account.setup_opening_move_lines_tree
#: model:ir.ui.view,arch_db:account.view_account_payment_form
#: model:ir.ui.view,arch_db:account.view_move_form
#: model:ir.ui.view,arch_db:account.view_move_line_pivot
@@ -5032,7 +5850,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_action.js:315
+#: code:addons/account/static/src/js/reconciliation/reconciliation_action.js:314
#: model:ir.actions.client,name:account.action_manual_reconcile
#, python-format
msgid "Journal Items to Reconcile"
@@ -5103,6 +5921,18 @@ msgid "June"
msgstr ""
#. module: account
+#: selection:res.company,account_dashboard_onboarding_state:0
+#: selection:res.company,account_invoice_onboarding_state:0
+#: selection:res.company,account_onboarding_invoice_layout_state:0
+#: selection:res.company,account_onboarding_sale_tax_state:0
+#: selection:res.company,account_onboarding_sample_invoice_state:0
+#: selection:res.company,account_setup_bank_data_state:0
+#: selection:res.company,account_setup_coa_state:0
+#: selection:res.company,account_setup_fy_data_state:0
+msgid "Just done"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard__reason
msgid "Justification"
msgstr ""
@@ -5133,7 +5963,9 @@ msgid "Keep empty to use the invoice date."
msgstr ""
#. module: account
+#: selection:account.abstract.payment,payment_difference_handling:0
#: selection:account.payment,payment_difference_handling:0
+#: selection:account.register.payments,payment_difference_handling:0
msgid "Keep open"
msgstr ""
@@ -5144,13 +5976,19 @@ msgid "Keep this field empty to use the default value from the product category.
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_digest_digest__kpi_account_total_revenue_value
+msgid "Kpi Account Total Revenue Value"
+msgstr ""
+
+#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:527
-#: code:addons/account/static/src/xml/account_reconciliation.xml:193
-#: code:addons/account/static/src/xml/account_reconciliation.xml:234
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:551
+#: code:addons/account/static/src/xml/account_reconciliation.xml:197
+#: code:addons/account/static/src/xml/account_reconciliation.xml:272
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line__name
#: model:ir.model.fields,field_description:account.field_account_move_line__name
#: model:ir.ui.view,arch_db:account.report_journal
+#: model:ir.ui.view,arch_db:account.view_account_payment_from_invoices
#: model:ir.ui.view,arch_db:account.view_account_payment_invoice_form
#, python-format
msgid "Label"
@@ -5169,7 +6007,6 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_account_type____last_update
#: model:ir.model.fields,field_description:account.field_account_aged_trial_balance____last_update
#: model:ir.model.fields,field_description:account.field_account_balance_report____last_update
-#: model:ir.model.fields,field_description:account.field_account_bank_accounts_wizard____last_update
#: model:ir.model.fields,field_description:account.field_account_bank_statement____last_update
#: model:ir.model.fields,field_description:account.field_account_bank_statement_cashbox____last_update
#: model:ir.model.fields,field_description:account.field_account_bank_statement_closebalance____last_update
@@ -5189,21 +6026,22 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax____last_update
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_template____last_update
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template____last_update
+#: model:ir.model.fields,field_description:account.field_account_fiscal_year____last_update
#: model:ir.model.fields,field_description:account.field_account_full_reconcile____last_update
#: model:ir.model.fields,field_description:account.field_account_group____last_update
+#: model:ir.model.fields,field_description:account.field_account_incoterms____last_update
#: model:ir.model.fields,field_description:account.field_account_invoice____last_update
#: model:ir.model.fields,field_description:account.field_account_invoice_confirm____last_update
+#: model:ir.model.fields,field_description:account.field_account_invoice_import_wizard____last_update
#: model:ir.model.fields,field_description:account.field_account_invoice_line____last_update
#: model:ir.model.fields,field_description:account.field_account_invoice_refund____last_update
#: model:ir.model.fields,field_description:account.field_account_invoice_report____last_update
+#: model:ir.model.fields,field_description:account.field_account_invoice_send____last_update
#: model:ir.model.fields,field_description:account.field_account_invoice_tax____last_update
#: model:ir.model.fields,field_description:account.field_account_journal____last_update
#: model:ir.model.fields,field_description:account.field_account_move____last_update
#: model:ir.model.fields,field_description:account.field_account_move_line____last_update
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile____last_update
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff____last_update
#: model:ir.model.fields,field_description:account.field_account_move_reversal____last_update
-#: model:ir.model.fields,field_description:account.field_account_opening____last_update
#: model:ir.model.fields,field_description:account.field_account_partial_reconcile____last_update
#: model:ir.model.fields,field_description:account.field_account_payment____last_update
#: model:ir.model.fields,field_description:account.field_account_payment_method____last_update
@@ -5212,9 +6050,11 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_print_journal____last_update
#: model:ir.model.fields,field_description:account.field_account_reconcile_model____last_update
#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template____last_update
+#: model:ir.model.fields,field_description:account.field_account_reconciliation_widget____last_update
#: model:ir.model.fields,field_description:account.field_account_register_payments____last_update
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger____last_update
#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger____last_update
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config____last_update
#: model:ir.model.fields,field_description:account.field_account_tax____last_update
#: model:ir.model.fields,field_description:account.field_account_tax_group____last_update
#: model:ir.model.fields,field_description:account.field_account_tax_report____last_update
@@ -5226,6 +6066,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_report_account_report_agedpartnerbalance____last_update
#: model:ir.model.fields,field_description:account.field_report_account_report_financial____last_update
#: model:ir.model.fields,field_description:account.field_report_account_report_generalledger____last_update
+#: model:ir.model.fields,field_description:account.field_report_account_report_invoice_with_payments____last_update
#: model:ir.model.fields,field_description:account.field_report_account_report_journal____last_update
#: model:ir.model.fields,field_description:account.field_report_account_report_overdue____last_update
#: model:ir.model.fields,field_description:account.field_report_account_report_partnerledger____last_update
@@ -5233,18 +6074,12 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_report_account_report_trialbalance____last_update
#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard____last_update
#: model:ir.model.fields,field_description:account.field_validate_account_move____last_update
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts____last_update
msgid "Last Modified on"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
-msgid "Last Month"
-msgstr ""
-
-#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:119
+#: code:addons/account/static/src/xml/account_reconciliation.xml:122
#, python-format
msgid "Last Reconciliation:"
msgstr ""
@@ -5256,7 +6091,6 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_account_type__write_uid
#: model:ir.model.fields,field_description:account.field_account_aged_trial_balance__write_uid
#: model:ir.model.fields,field_description:account.field_account_balance_report__write_uid
-#: model:ir.model.fields,field_description:account.field_account_bank_accounts_wizard__write_uid
#: model:ir.model.fields,field_description:account.field_account_bank_statement__write_uid
#: model:ir.model.fields,field_description:account.field_account_bank_statement_cashbox__write_uid
#: model:ir.model.fields,field_description:account.field_account_bank_statement_closebalance__write_uid
@@ -5276,20 +6110,21 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax__write_uid
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_template__write_uid
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template__write_uid
+#: model:ir.model.fields,field_description:account.field_account_fiscal_year__write_uid
#: model:ir.model.fields,field_description:account.field_account_full_reconcile__write_uid
#: model:ir.model.fields,field_description:account.field_account_group__write_uid
+#: model:ir.model.fields,field_description:account.field_account_incoterms__write_uid
#: model:ir.model.fields,field_description:account.field_account_invoice__write_uid
#: model:ir.model.fields,field_description:account.field_account_invoice_confirm__write_uid
+#: model:ir.model.fields,field_description:account.field_account_invoice_import_wizard__write_uid
#: model:ir.model.fields,field_description:account.field_account_invoice_line__write_uid
#: model:ir.model.fields,field_description:account.field_account_invoice_refund__write_uid
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__write_uid
#: model:ir.model.fields,field_description:account.field_account_invoice_tax__write_uid
#: model:ir.model.fields,field_description:account.field_account_journal__write_uid
#: model:ir.model.fields,field_description:account.field_account_move__write_uid
#: model:ir.model.fields,field_description:account.field_account_move_line__write_uid
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile__write_uid
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff__write_uid
#: model:ir.model.fields,field_description:account.field_account_move_reversal__write_uid
-#: model:ir.model.fields,field_description:account.field_account_opening__write_uid
#: model:ir.model.fields,field_description:account.field_account_partial_reconcile__write_uid
#: model:ir.model.fields,field_description:account.field_account_payment__write_uid
#: model:ir.model.fields,field_description:account.field_account_payment_method__write_uid
@@ -5301,6 +6136,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_register_payments__write_uid
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger__write_uid
#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger__write_uid
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__write_uid
#: model:ir.model.fields,field_description:account.field_account_tax__write_uid
#: model:ir.model.fields,field_description:account.field_account_tax_group__write_uid
#: model:ir.model.fields,field_description:account.field_account_tax_report__write_uid
@@ -5311,7 +6147,6 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_cash_box_out__write_uid
#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard__write_uid
#: model:ir.model.fields,field_description:account.field_validate_account_move__write_uid
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__write_uid
msgid "Last Updated by"
msgstr ""
@@ -5322,7 +6157,6 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_account_type__write_date
#: model:ir.model.fields,field_description:account.field_account_aged_trial_balance__write_date
#: model:ir.model.fields,field_description:account.field_account_balance_report__write_date
-#: model:ir.model.fields,field_description:account.field_account_bank_accounts_wizard__write_date
#: model:ir.model.fields,field_description:account.field_account_bank_statement__write_date
#: model:ir.model.fields,field_description:account.field_account_bank_statement_cashbox__write_date
#: model:ir.model.fields,field_description:account.field_account_bank_statement_closebalance__write_date
@@ -5342,20 +6176,21 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax__write_date
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_template__write_date
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template__write_date
+#: model:ir.model.fields,field_description:account.field_account_fiscal_year__write_date
#: model:ir.model.fields,field_description:account.field_account_full_reconcile__write_date
#: model:ir.model.fields,field_description:account.field_account_group__write_date
+#: model:ir.model.fields,field_description:account.field_account_incoterms__write_date
#: model:ir.model.fields,field_description:account.field_account_invoice__write_date
#: model:ir.model.fields,field_description:account.field_account_invoice_confirm__write_date
+#: model:ir.model.fields,field_description:account.field_account_invoice_import_wizard__write_date
#: model:ir.model.fields,field_description:account.field_account_invoice_line__write_date
#: model:ir.model.fields,field_description:account.field_account_invoice_refund__write_date
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__write_date
#: model:ir.model.fields,field_description:account.field_account_invoice_tax__write_date
#: model:ir.model.fields,field_description:account.field_account_journal__write_date
#: model:ir.model.fields,field_description:account.field_account_move__write_date
#: model:ir.model.fields,field_description:account.field_account_move_line__write_date
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile__write_date
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff__write_date
#: model:ir.model.fields,field_description:account.field_account_move_reversal__write_date
-#: model:ir.model.fields,field_description:account.field_account_opening__write_date
#: model:ir.model.fields,field_description:account.field_account_partial_reconcile__write_date
#: model:ir.model.fields,field_description:account.field_account_payment__write_date
#: model:ir.model.fields,field_description:account.field_account_payment_method__write_date
@@ -5367,6 +6202,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_register_payments__write_date
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger__write_date
#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger__write_date
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__write_date
#: model:ir.model.fields,field_description:account.field_account_tax__write_date
#: model:ir.model.fields,field_description:account.field_account_tax_group__write_date
#: model:ir.model.fields,field_description:account.field_account_tax_report__write_date
@@ -5377,7 +6213,6 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_cash_box_out__write_date
#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard__write_date
#: model:ir.model.fields,field_description:account.field_validate_account_move__write_date
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__write_date
msgid "Last Updated on"
msgstr ""
@@ -5405,8 +6240,8 @@ msgid "Latest Invoices & Payments Matching Date"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_group__parent_left
-msgid "Left Parent"
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__layout
+msgid "Layout"
msgstr ""
#. module: account
@@ -5420,19 +6255,12 @@ msgid "Legal mentions that have to be printed on the invoices."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:220
+#: code:addons/account/models/account_invoice.py:219
#, python-format
msgid "Less Payment"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:24
-#, python-format
-msgid "Let odoo try to reconcile entries for the user"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
msgid "Let your customers pay their invoices online"
msgstr ""
@@ -5443,8 +6271,10 @@ msgid "Level"
msgstr ""
#. module: account
+#: selection:account.account.type,internal_group:0
#: model:account.financial.report,name:account.account_financial_report_liability0
#: model:account.financial.report,name:account.account_financial_report_liabilitysum0
+#: model:ir.ui.view,arch_db:account.view_account_search
msgid "Liability"
msgstr ""
@@ -5454,6 +6284,21 @@ msgid "Line Count"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_res_config_settings__show_line_subtotals_tax_selection
+msgid "Line Subtotals Tax Display"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Line subtotals tax display"
+msgstr ""
+
+#. module: account
+#: selection:account.setup.bank.manual.config,create_or_link_option:0
+msgid "Link to an existing journal"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_invoice__move_id
msgid "Link to the automatically generated Journal Items."
msgstr ""
@@ -5465,6 +6310,12 @@ msgid "Liquidity"
msgstr ""
#. module: account
+#: code:addons/account/models/chart_template.py:154
+#, python-format
+msgid "Liquidity Transfer"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_chart_template__tax_template_ids
msgid "List of all the taxes that have to be installed by the wizard"
msgstr ""
@@ -5476,12 +6327,19 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:29
+#: code:addons/account/static/src/xml/account_reconciliation.xml:33
#, python-format
msgid "Load more"
msgstr ""
#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:151
+#, python-format
+msgid "Load more... ("
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_res_company__fiscalyear_lock_date
msgid "Lock Date"
msgstr ""
@@ -5492,7 +6350,17 @@ msgid "Lock Date for Non-Advisers"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:173
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__is_log
+msgid "Log an Internal Note"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.onboarding_invoice_layout_step
+msgid "Looks great!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_bank_statement.py:175
#, python-format
msgid "Loss"
msgstr ""
@@ -5509,19 +6377,24 @@ msgid "Loss Exchange Rate Account"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:195
+#: code:addons/account/models/chart_template.py:411
#, python-format
msgid "MISC"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__mail_activity_type_id
+msgid "Mail Activity Type"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
msgid "Mail your invoices in one-click using"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
-msgid "Main Currency"
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__mailing_list_ids
+msgid "Mailing List"
msgstr ""
#. module: account
@@ -5540,6 +6413,11 @@ msgid "Main currency of your company"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Make sure invoice communications only contain authorized characters."
+msgstr ""
+
+#. module: account
#: model:ir.ui.menu,name:account.account_management_menu
#: model:ir.ui.menu,name:account.account_reports_management_menu
#: model:ir.ui.menu,name:account.menu_finance_entries_management
@@ -5560,12 +6438,6 @@ msgid "Manual Invoice Taxes"
msgstr ""
#. module: account
-#: model:ir.actions.client,name:account.action_manual_reconciliation
-#: model:ir.ui.menu,name:account.menu_action_manual_reconciliation
-msgid "Manual Reconciliation"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,help:account.field_account_journal__inbound_payment_method_ids
msgid "Manual: Get paid by cash, check or any other method outside of Odoo.\n"
"Electronic: Get paid automatically through a payment acquirer by requesting a transaction on a card saved by the customer when buying or subscribing online (payment token).\n"
@@ -5579,7 +6451,7 @@ msgstr ""
msgid "Manual: Get paid by cash, check or any other method outside of Odoo.\n"
"Electronic: Get paid automatically through a payment acquirer by requesting a transaction on a card saved by the customer when buying or subscribing online (payment token).\n"
"Check: Pay bill by check and print it from Odoo.\n"
-"Batch Deposit: Encase several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo, you are suggested to reconcile the transaction with the batch deposit.To enable batch deposit,module account_batch_deposit must be installed.\n"
+"Batch Deposit: Encase several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo, you are suggested to reconcile the transaction with the batch deposit.To enable batch deposit, module account_batch_payment must be installed.\n"
"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit to your bank. To enable sepa credit transfer, module account_sepa must be installed "
msgstr ""
@@ -5601,21 +6473,25 @@ msgid "Margin Analysis"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.setup_bank_journal_form
-#: model:ir.ui.view,arch_db:account.setup_financial_year_opening_form
-#: model:ir.ui.view,arch_db:account.setup_view_company_form
-msgid "Mark as done"
+#: selection:account.abstract.payment,payment_difference_handling:0
+#: selection:account.payment,payment_difference_handling:0
+#: selection:account.register.payments,payment_difference_handling:0
+msgid "Mark invoice as fully paid"
msgstr ""
#. module: account
-#: selection:account.payment,payment_difference_handling:0
-msgid "Mark invoice as fully paid"
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__mass_mailing_id
+msgid "Mass Mailing"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__mass_mailing_campaign_id
+msgid "Mass Mailing Campaign"
msgstr ""
#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_payables_master_data
-#: model:ir.ui.menu,name:account.menu_finance_receivables_master_data
-msgid "Master Data"
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__mass_mailing_name
+msgid "Mass Mailing Name"
msgstr ""
#. module: account
@@ -5663,6 +6539,11 @@ msgid "Memo"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_payment_from_invoices
+msgid "Memo will be computed from invoices"
+msgstr ""
+
+#. module: account
#. openerp-web
#: code:addons/account/static/src/xml/account_payment.xml:64
#, python-format
@@ -5670,12 +6551,46 @@ msgid "Memo:"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_bank_statement__message_has_error
+#: model:ir.model.fields,field_description:account.field_account_invoice__message_has_error
+#: model:ir.model.fields,field_description:account.field_account_payment__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__record_name
+msgid "Message Record Name"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_res_partner__invoice_warn_msg
#: model:ir.model.fields,field_description:account.field_res_users__invoice_warn_msg
msgid "Message for Invoice"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_send__message_type
+msgid "Message type: email for email message, notification for system message, comment for other messages such as user replies"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_send__message_id
+msgid "Message unique identifier"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__message_id
+msgid "Message-Id"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_bank_statement__message_ids
+#: model:ir.model.fields,field_description:account.field_account_invoice__message_ids
+#: model:ir.model.fields,field_description:account.field_account_payment__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_account_form
msgid "Minus Cost of Revenue"
msgstr ""
@@ -5707,21 +6622,35 @@ msgstr ""
#. module: account
#: selection:account.journal,type:0
-#: model:ir.ui.view,arch_db:account.view_account_journal_form
#: model:ir.ui.view,arch_db:account.view_account_journal_search
msgid "Miscellaneous"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:195
+#: code:addons/account/models/chart_template.py:411
#: model:ir.ui.view,arch_db:account.view_account_move_filter
#, python-format
msgid "Miscellaneous Operations"
msgstr ""
#. module: account
+#: sql_constraint:account.invoice.line:0
+msgid "Missing required account on accountable invoice line."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__moderator_id
+msgid "Moderated By"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__moderation_status
+msgid "Moderation Status"
+msgstr ""
+
+#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:164
+#: code:addons/account/static/src/xml/account_reconciliation.xml:168
#, python-format
msgid "Modify models"
msgstr ""
@@ -5742,11 +6671,6 @@ msgid "Monitor your product margins from invoices"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.report_generalledger
#: model:ir.ui.view,arch_db:account.report_journal
#: model:ir.ui.view,arch_db:account.view_account_move_filter
@@ -5770,12 +6694,14 @@ msgid "Move Reconciled"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1396
+#: code:addons/account/models/account_move.py:1144
#, python-format
msgid "Move name (id): %s (%s)"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_abstract_payment__multi
+#: model:ir.model.fields,field_description:account.field_account_payment__multi
#: model:ir.model.fields,field_description:account.field_account_register_payments__multi
msgid "Multi"
msgstr ""
@@ -5812,16 +6738,23 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_account_template__name
#: model:ir.model.fields,field_description:account.field_account_cash_rounding__name
#: model:ir.model.fields,field_description:account.field_account_chart_template__name
+#: model:ir.model.fields,field_description:account.field_account_fiscal_year__name
#: model:ir.model.fields,field_description:account.field_account_group__name
+#: model:ir.model.fields,field_description:account.field_account_incoterms__name
#: model:ir.model.fields,field_description:account.field_account_payment__name
#: model:ir.model.fields,field_description:account.field_account_payment_method__name
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__bank_name
#: model:ir.model.fields,field_description:account.field_account_tax_group__name
-#: model:ir.ui.view,arch_db:account.report_financial
#: model:ir.ui.view,arch_db:account.report_journal
msgid "Name"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_send__record_name
+msgid "Name get of the related document."
+msgstr ""
+
+#. module: account
#. openerp-web
#: code:addons/account/static/src/xml/account_payment.xml:52
#, python-format
@@ -5839,6 +6772,17 @@ msgid "Navigate easily through reports and see what is behind the numbers"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__needaction
+#: model:ir.model.fields,help:account.field_account_invoice_send__needaction
+msgid "Need Action"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__need_moderation
+msgid "Need moderation"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.report_tax
msgid "Net"
msgstr ""
@@ -5849,8 +6793,8 @@ msgid "New"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-msgid "New Statement"
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__new_journal_name
+msgid "New Journal Name"
msgstr ""
#. module: account
@@ -5859,12 +6803,27 @@ msgid "New Transactions"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1373
+#: code:addons/account/models/account_move.py:1121
#, python-format
msgid "New expected payment date: "
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice__sequence_number_next
#: model:ir.model.fields,field_description:account.field_account_journal__sequence_number_next
msgid "Next Number"
@@ -5891,9 +6850,17 @@ msgid "No Message"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1370
+#. openerp-web
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:67
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:134
+#, python-format
+msgid "No Title"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_invoice.py:895
#, python-format
-msgid "No appropriate payment method enabled on journal %s"
+msgid "No account was found to create the invoice, be sure you have installed a chart of account."
msgstr ""
#. module: account
@@ -5902,9 +6869,8 @@ msgid "No detail"
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:116
-#, python-format
-msgid "No opening move defined !"
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__no_auto_thread
+msgid "No threading for answers"
msgstr ""
#. module: account
@@ -5914,7 +6880,6 @@ msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_account_chart_template__code_digits
-#: model:ir.model.fields,help:account.field_wizard_multi_charts_accounts__code_digits
msgid "No. of Digits to use for account code"
msgstr ""
@@ -5945,16 +6910,30 @@ msgid "Normal Text"
msgstr ""
#. module: account
+#: selection:res.company,account_dashboard_onboarding_state:0
+#: selection:res.company,account_invoice_onboarding_state:0
+#: selection:res.company,account_onboarding_invoice_layout_state:0
+#: selection:res.company,account_onboarding_sale_tax_state:0
+#: selection:res.company,account_onboarding_sample_invoice_state:0
+#: selection:res.company,account_setup_bank_data_state:0
+#: selection:res.company,account_setup_coa_state:0
+#: selection:res.company,account_setup_fy_data_state:0
+msgid "Not done"
+msgstr ""
+
+#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:258
+#: selection:account.invoice.line,display_type:0
+#: code:addons/account/static/src/xml/account_reconciliation.xml:296
#: model:ir.model.fields,field_description:account.field_account_account_template__note
+#: model:ir.ui.view,arch_db:account.view_invoice_line_form
#, python-format
msgid "Note"
msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_out_refund
-msgid "Note that the easiest way to create a credit note is to do it directly \n"
+msgid "Note that the easiest way to create a credit note is to do it directly\n"
" from the customer invoice."
msgstr ""
@@ -5972,18 +6951,28 @@ msgid "Notes"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-msgid "Nothing to Reconcile"
-msgstr ""
-
-#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:34
+#: code:addons/account/static/src/xml/account_reconciliation.xml:38
#, python-format
msgid "Nothing to do!"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__notification_ids
+msgid "Notifications"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__notify
+msgid "Notify followers"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_send__notify
+msgid "Notify followers of the document (mass post only)"
+msgstr ""
+
+#. module: account
#: selection:res.company,fiscalyear_last_month:0
msgid "November"
msgstr ""
@@ -6001,6 +6990,13 @@ msgid "Number (Move)"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,field_description:account.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,field_description:account.field_account_payment__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_cashbox_line__number
msgid "Number of Coins/Bills"
msgstr ""
@@ -6011,15 +7007,36 @@ msgid "Number of Days"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
-msgid "OFX Import"
+#: model:ir.model.fields,field_description:account.field_account_bank_statement__message_has_error_counter
+#: model:ir.model.fields,field_description:account.field_account_invoice__message_has_error_counter
+#: model:ir.model.fields,field_description:account.field_account_payment__message_has_error_counter
+msgid "Number of error"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:17
-#, python-format
-msgid "OK"
+#: model:ir.model.fields,help:account.field_account_bank_statement__message_needaction_counter
+#: model:ir.model.fields,help:account.field_account_invoice__message_needaction_counter
+#: model:ir.model.fields,help:account.field_account_payment__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_bank_statement__message_has_error_counter
+#: model:ir.model.fields,help:account.field_account_invoice__message_has_error_counter
+#: model:ir.model.fields,help:account.field_account_payment__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,help:account.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,help:account.field_account_payment__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "OFX Import"
msgstr ""
#. module: account
@@ -6028,6 +7045,11 @@ msgid "October"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.portal_invoice_page
+msgid "Odoo"
+msgstr ""
+
+#. module: account
#: model:ir.actions.act_window,help:account.action_bank_statement_line
msgid "Odoo allows you to reconcile a statement line directly with\n"
" the related sale or puchase invoice(s)."
@@ -6040,6 +7062,11 @@ msgid "Odoo allows you to reconcile a statement line directly with\n"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_move_line__tax_line_grouping_key
+msgid "Old Taxes"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_payment_term_line_form
msgid "On the"
msgstr ""
@@ -6064,20 +7091,15 @@ msgid "Online Payment"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__only_one_chart_template
-msgid "Only One Chart Template Available"
-msgstr ""
-
-#. module: account
-#: code:addons/account/models/account_payment.py:479
+#: code:addons/account/models/account_payment.py:600
#, python-format
msgid "Only a draft payment can be posted."
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:864
+#: code:addons/account/models/chart_template.py:185
#, python-format
-msgid "Only administrators can change the settings"
+msgid "Only administrators can load a charf of accounts"
msgstr ""
#. module: account
@@ -6086,26 +7108,22 @@ msgid "Only users with the 'Adviser' role can edit accounts prior to and inclusi
msgstr ""
#. module: account
-#. openerp-web
#: 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:681
-#: code:addons/account/static/src/xml/account_reconciliation.xml:131
+#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:711
+#: code:addons/account/static/src/xml/account_reconciliation.xml:134
#, python-format
msgid "Open balance"
msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_financial_year_op__opening_date
-#: model:ir.model.fields,field_description:account.field_account_opening__date
#: model:ir.model.fields,field_description:account.field_res_company__account_opening_date
msgid "Opening Date"
msgstr ""
@@ -6116,19 +7134,13 @@ msgid "Opening Journal"
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:276
-#: model:ir.model.fields,field_description:account.field_account_opening__opening_move_id
+#: code:addons/account/models/company.py:346
#: model:ir.model.fields,field_description:account.field_res_company__account_opening_move_id
#, python-format
msgid "Opening Journal Entry"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_opening__opening_move_line_ids
-msgid "Opening Journal Items"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_financial_year_op__opening_move_posted
msgid "Opening Move Posted"
msgstr ""
@@ -6139,7 +7151,7 @@ msgid "Opening Unit Numbers"
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:138
+#: code:addons/account/models/account.py:164
#, python-format
msgid "Opening balance"
msgstr ""
@@ -6170,9 +7182,14 @@ msgid "Operation Templates"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:1002
+#: code:addons/account/models/account_bank_statement.py:653
#, python-format
-msgid "Operation not allowed. Since your statement line already received a number, you cannot reconcile it entirely with existing journal entries otherwise it would make a gap in the numbering. You should book an entry and make a regular revert of it in case you want to cancel it."
+msgid "Operation not allowed. Since your statement line already received a number (%s), you cannot reconcile it entirely with existing journal entries otherwise it would make a gap in the numbering. You should book an entry and make a regular revert of it in case you want to cancel it."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+msgid "Operations"
msgstr ""
#. module: account
@@ -6195,8 +7212,21 @@ msgid "Options"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.report_payment_receipt
-msgid "Original Amount"
+#: code:addons/account/models/account_invoice.py:694
+#, python-format
+msgid "Or set an <a data-oe-id=%s data-oe-model=\"account.journal\" href=#id=%s&model=account.journal>email alias</a> to allow draft vendor bills to be created upon reception of an email."
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_invoice.py:690
+#, python-format
+msgid "Or share the email %s to your vendors: bills will be created automatically upon mail reception."
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_invoice.py:692
+#, python-format
+msgid "Or share the emails %s to your vendors: bills will be created automatically upon mail reception."
msgstr ""
#. module: account
@@ -6227,6 +7257,11 @@ msgid "Outbound"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__mail_server_id
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_chart_template__property_stock_account_output_categ_id
#: model:ir.model.fields,field_description:account.field_res_company__property_stock_account_output_categ_id
msgid "Output Account for Stock Valuation"
@@ -6238,18 +7273,19 @@ msgid "Outstanding Credits Debits Widget"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:135
+#: code:addons/account/models/account_invoice.py:133
#, python-format
msgid "Outstanding credits"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:138
+#: code:addons/account/models/account_invoice.py:136
#, python-format
msgid "Outstanding debits"
msgstr ""
#. module: account
+#: selection:account.invoice,activity_state:0
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
msgid "Overdue"
msgstr ""
@@ -6284,7 +7320,7 @@ msgid "Paid"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:426
+#: code:addons/account/models/account_payment.py:546
#, python-format
msgid "Paid Invoices"
msgstr ""
@@ -6314,6 +7350,16 @@ msgid "Parent Chart Template"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__parent_id
+msgid "Parent Message"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_group__parent_path
+msgid "Parent Path"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_account_financial_report_search
msgid "Parent Report"
msgstr ""
@@ -6325,14 +7371,13 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_partial_reconcile
-#: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full
msgid "Partial Reconcile"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:236
-#: code:addons/account/static/src/xml/account_reconciliation.xml:253
+#: code:addons/account/static/src/xml/account_reconciliation.xml:274
+#: code:addons/account/static/src/xml/account_reconciliation.xml:291
#: model:ir.model.fields,field_description:account.field_account_abstract_payment__partner_id
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line__partner_id
#: model:ir.model.fields,field_description:account.field_account_invoice__partner_id
@@ -6360,6 +7405,12 @@ msgid "Partner Company"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_res_partner__contract_ids
+#: model:ir.model.fields,field_description:account.field_res_users__contract_ids
+msgid "Partner Contracts"
+msgstr ""
+
+#. module: account
#: model:ir.actions.act_window,name:account.action_account_partner_ledger_menu
#: model:ir.actions.report,name:account.action_report_partnerledger
#: model:ir.ui.menu,name:account.menu_partner_ledger
@@ -6387,26 +7438,25 @@ msgid "Partner's"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.report_agedpartnerbalance
-msgid "Partners"
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__needaction_partner_ids
+msgid "Partners with Need Action"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:98
+#: code:addons/account/models/account_journal_dashboard.py:95
#, python-format
msgid "Past"
msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
-msgid "Pay your bills in one-click using Euro SEPA service"
+msgid "Pay your bills in one-click using Euro SEPA Service"
msgstr ""
#. module: account
#: model:account.account.type,name:account.data_account_type_payable
#: selection:account.account.type,type:0
#: model:ir.ui.view,arch_db:account.view_account_move_line_filter
-#: model:ir.ui.view,arch_db:account.view_account_payment_search
msgid "Payable"
msgstr ""
@@ -6433,7 +7483,6 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.product_template_form_view
-#: model:ir.ui.view,arch_db:account.view_account_bank_journal_form
msgid "Payables"
msgstr ""
@@ -6452,12 +7501,16 @@ msgid "Payment Date"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_abstract_payment__payment_difference
#: model:ir.model.fields,field_description:account.field_account_payment__payment_difference
+#: model:ir.model.fields,field_description:account.field_account_register_payments__payment_difference
msgid "Payment Difference"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_abstract_payment__payment_difference_handling
#: model:ir.model.fields,field_description:account.field_account_payment__payment_difference_handling
+#: model:ir.model.fields,field_description:account.field_account_register_payments__payment_difference_handling
msgid "Payment Difference Handling"
msgstr ""
@@ -6465,6 +7518,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_abstract_payment__journal_id
#: model:ir.model.fields,field_description:account.field_account_payment__journal_id
#: model:ir.model.fields,field_description:account.field_account_register_payments__journal_id
+#: model:ir.model.fields,field_description:account.field_res_config_settings__qr_code_payment_journal_id
msgid "Payment Journal"
msgstr ""
@@ -6486,6 +7540,12 @@ msgid "Payment Method Type"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_bank_journal_form
+#: model:ir.ui.view,arch_db:account.view_account_journal_form
+msgid "Payment Method Types"
+msgstr ""
+
+#. module: account
#. openerp-web
#: code:addons/account/static/src/xml/account_payment.xml:60
#, python-format
@@ -6494,7 +7554,6 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_payment_method
-#: model:ir.model.fields,field_description:account.field_account_journal__outbound_payment_method_ids
msgid "Payment Methods"
msgstr ""
@@ -6509,12 +7568,16 @@ msgid "Payment Receipt"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.report_payment_receipt
+#: model:ir.ui.view,arch_db:account.report_payment_receipt_document
msgid "Payment Receipt:"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_invoice__reference_type
+#: model:ir.model.fields,field_description:account.field_account_invoice__reference
+msgid "Payment Ref."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_payment__payment_reference
msgid "Payment Reference"
msgstr ""
@@ -6527,6 +7590,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_payment_term__name
#: model:ir.model.fields,field_description:account.field_account_payment_term_line__payment_id
#: model:ir.ui.menu,name:account.menu_action_payment_term_form
+#: model:ir.ui.view,arch_db:account.view_partner_property_form
#: model:ir.ui.view,arch_db:account.view_payment_term_form
#: model:ir.ui.view,arch_db:account.view_payment_term_line_form
#: model:ir.ui.view,arch_db:account.view_payment_term_line_tree
@@ -6584,14 +7648,13 @@ msgid "Payment that created this entry"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:235
+#: code:addons/account/models/account_payment.py:371
#: model:ir.actions.act_window,name:account.action_account_payments
#: model:ir.actions.act_window,name:account.action_account_payments_payable
#: model:ir.model,name:account.model_account_payment
#: model:ir.model.fields,field_description:account.field_account_invoice__payment_ids
#: model:ir.ui.menu,name:account.menu_action_account_payments_payable
#: model:ir.ui.menu,name:account.menu_action_account_payments_receivable
-#: model:ir.ui.view,arch_db:account.partner_view_buttons
#: model:ir.ui.view,arch_db:account.view_account_payment_search
#, python-format
msgid "Payments"
@@ -6610,20 +7673,11 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_account_payments
#: model:ir.actions.act_window,help:account.action_account_payments_payable
+#: model:ir.actions.act_window,help:account.action_account_payments_transfer
msgid "Payments are used to register liquidity movements. You can process those payments by your own means or by using installed facilities."
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-msgid "Payments to Do"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-msgid "Payments to Receive"
-msgstr ""
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
msgid "Pending Invoice"
msgstr ""
@@ -6663,9 +7717,9 @@ msgid "Percentage of balance"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1785
+#: code:addons/account/models/account_invoice.py:1961
#, python-format
-msgid "Percentages for Payment Terms Line must be between 0 and 100."
+msgid "Percentages on the Payment Terms lines must be between 0 and 100."
msgstr ""
#. module: account
@@ -6684,48 +7738,63 @@ msgid "Plaid Connector"
msgstr ""
#. module: account
-#: code:addons/account/wizard/pos_box.py:27
+#: selection:account.invoice,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_invoice.py:1173
#, python-format
-msgid "Please check that the field 'Journal' is set on the Bank Statement"
+msgid "Please add at least one invoice line."
msgstr ""
#. module: account
-#: code:addons/account/wizard/pos_box.py:29
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Please check that following information are set on the journal: bank account, BIC, EUR as currency."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/pos_box.py:27
#, python-format
-msgid "Please check that the field 'Transfer Account' is set on the company."
+msgid "Please check that the field 'Journal' is set on the Bank Statement"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1078
+#: code:addons/account/wizard/pos_box.py:29
#, python-format
-msgid "Please create some invoice lines."
+msgid "Please check that the field 'Transfer Account' is set on the company."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:160
+#: code:addons/account/models/account_move.py:301
#, python-format
msgid "Please define a sequence for the credit notes"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:165
+#: code:addons/account/models/account_move.py:306
#, python-format
msgid "Please define a sequence on the journal."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1076
+#: code:addons/account/models/account_invoice.py:1171
#, python-format
msgid "Please define sequence on the journal related to this invoice."
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:273
+#: code:addons/account/models/company.py:343
#, python-format
msgid "Please install a chart of accounts or create a miscellaneous journal before proceeding."
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.report_invoice_document
+msgid "Please use the following communication for your payment :"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_account_form
msgid "Plus Bank"
msgstr ""
@@ -6751,7 +7820,11 @@ msgid "Plus Other Income"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.setup_opening_move_wizard_form
+#: model:ir.model.fields,field_description:account.field_account_invoice__access_url
+msgid "Portal Access URL"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_move_form
msgid "Post"
msgstr ""
@@ -6762,6 +7835,12 @@ msgid "Post All Entries"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_journal__post_at_bank_rec
+msgid "Post At Bank Reconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_payment_from_invoices
#: model:ir.ui.view,arch_db:account.view_account_payment_invoice_form
msgid "Post Difference In"
msgstr ""
@@ -6792,6 +7871,11 @@ msgid "Posted Journal Items"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.portal_invoice_page
+msgid "Powered by"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_chart_template__bank_account_code_prefix
#: model:ir.model.fields,field_description:account.field_res_company__bank_account_code_prefix
msgid "Prefix of the bank accounts"
@@ -6808,6 +7892,16 @@ msgid "Prefix of the main cash accounts"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_chart_template__transfer_account_code_prefix
+msgid "Prefix of the main transfer accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_company__transfer_account_code_prefix
+msgid "Prefix of the transfer accounts"
+msgstr ""
+
+#. module: account
#: model:account.account.type,name:account.data_account_type_prepayments
#: model:ir.ui.view,arch_db:account.view_account_form
msgid "Prepayments"
@@ -6824,14 +7918,23 @@ msgid "Preset to create journal entries during a invoices and payments matching"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.account_aged_balance_view
-#: model:ir.ui.view,arch_db:account.account_common_report_view
-msgid "Print"
+#: model:ir.ui.view,arch_db:account.invoice_form
+msgid "Preview"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.invoice_form
-msgid "Print Invoice"
+#: model:ir.ui.view,arch_db:account.account_invoice_send_wizard_form
+msgid "Preview as a PDF"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__is_print
+#: model:ir.model.fields,field_description:account.field_res_config_settings__invoice_is_print
+#: model:ir.ui.view,arch_db:account.account_aged_balance_view
+#: model:ir.ui.view,arch_db:account.account_common_report_view
+#: model:ir.ui.view,arch_db:account.account_invoice_send_wizard_form
+#: model:ir.ui.view,arch_db:account.portal_invoice_page
+msgid "Print"
msgstr ""
#. module: account
@@ -6841,6 +7944,11 @@ msgid "Print Report with the currency column if the currency differs from the co
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_res_company__invoice_is_print
+msgid "Print by default"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
msgid "Print checks to pay your vendors"
msgstr ""
@@ -6879,12 +7987,16 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.product_product_action
+#: model:ir.actions.act_window,name:account.product_product_action_purchasable
+#: model:ir.actions.act_window,name:account.product_product_action_sellable
+#: model:ir.ui.menu,name:account.product_product_menu_purchasable
+#: model:ir.ui.menu,name:account.product_product_menu_sellable
#: model:ir.ui.view,arch_db:account.product_product_view_tree
msgid "Products"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:177
+#: code:addons/account/models/account_bank_statement.py:179
#, python-format
msgid "Profit"
msgstr ""
@@ -6912,7 +8024,7 @@ msgid "Profit and Loss"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:136
+#: code:addons/account/models/account_payment.py:283
#, python-format
msgid "Programming error: wizard action executed without active_ids in context."
msgstr ""
@@ -6923,16 +8035,9 @@ msgid "Properties"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.product_product_action_purchasable
-#: model:ir.ui.menu,name:account.product_product_menu_purchasable
-msgid "Purchasable Products"
-msgstr ""
-
-#. module: account
#: selection:account.journal,type:0
#: model:ir.ui.view,arch_db:account.view_account_tax_search
#: model:ir.ui.view,arch_db:account.view_account_tax_template_search
-#: model:ir.ui.view,arch_db:account.view_partner_property_form
msgid "Purchase"
msgstr ""
@@ -6943,25 +8048,12 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
-#: model:ir.ui.view,arch_db:account.view_wizard_multi_chart
msgid "Purchase Tax"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__purchase_tax_rate
-msgid "Purchase Tax(%)"
-msgstr ""
-
-#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:35
-#, python-format
-msgid "Purchase: Untaxed Total"
-msgstr ""
-
-#. module: account
#: selection:account.tax,type_tax_use:0
#: selection:account.tax.template,type_tax_use:0
-#: model:ir.ui.menu,name:account.menu_finance_payables
#: model:ir.ui.view,arch_db:account.view_account_journal_search
#: model:ir.ui.view,arch_db:account.view_account_move_filter
msgid "Purchases"
@@ -6987,12 +8079,20 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_line__quantity
#: model:ir.model.fields,field_description:account.field_account_move_line__quantity
-#: model:ir.ui.view,arch_db:account.portal_invoice_report
-#: model:ir.ui.view,arch_db:account.report_invoice_document
msgid "Quantity"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.invoice_form
+msgid "Quantity:"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__rating_value
+msgid "Rating Value"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_refund__description
#: model:ir.model.fields,field_description:account.field_cash_box_in__name
#: model:ir.model.fields,field_description:account.field_cash_box_out__name
@@ -7008,7 +8108,6 @@ msgstr ""
#: model:account.account.type,name:account.data_account_type_receivable
#: selection:account.account.type,type:0
#: model:ir.ui.view,arch_db:account.view_account_move_line_filter
-#: model:ir.ui.view,arch_db:account.view_account_payment_search
msgid "Receivable"
msgstr ""
@@ -7038,7 +8137,6 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.product_template_form_view
-#: model:ir.ui.view,arch_db:account.view_account_bank_journal_form
msgid "Receivables"
msgstr ""
@@ -7046,44 +8144,40 @@ msgstr ""
#: selection:account.abstract.payment,payment_type:0
#: selection:account.payment,payment_type:0
#: selection:account.register.payments,payment_type:0
-#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
msgid "Receive Money"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:73
-#: code:addons/account/static/src/xml/account_reconciliation.xml:105
-#: code:addons/account/static/src/xml/account_reconciliation.xml:106
-#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-#: model:ir.ui.view,arch_db:account.account_move_line_reconcile_writeoff
-#: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full
-#: model:ir.ui.view,arch_db:account.view_bank_statement_form
-#, python-format
-msgid "Reconcile"
+#: model:ir.model.fields,field_description:account.field_account_abstract_payment__partner_bank_account_id
+#: model:ir.model.fields,field_description:account.field_account_payment__partner_bank_account_id
+#: model:ir.model.fields,field_description:account.field_account_register_payments__partner_bank_account_id
+msgid "Recipient Bank Account"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile
-msgid "Reconcile Entries"
+#: model:ir.ui.view,arch_db:account.account_invoice_send_wizard_form
+msgid "Recipients"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full
-msgid "Reconcile With Write-Off"
+#: model:ir.model.fields,field_description:account.field_account_move_line__recompute_tax_line
+msgid "Recompute Tax Line"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_reconcile.py:86
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:76
+#: code:addons/account/static/src/xml/account_reconciliation.xml:108
+#: code:addons/account/static/src/xml/account_reconciliation.xml:109
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+#: model:ir.ui.view,arch_db:account.view_bank_statement_form
#, python-format
-msgid "Reconcile Writeoff"
+msgid "Reconcile"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/js/tour_bank_statement_reconciliation.js:11
-#, python-format
-msgid "Reconcile the demo bank statement"
+#: model:ir.actions.client,name:account.action_view_account_move_line_reconcile
+msgid "Reconcile Entries"
msgstr ""
#. module: account
@@ -7099,17 +8193,24 @@ msgid "Reconciled Entries"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_payment__reconciled_invoice_ids
+msgid "Reconciled Invoices"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_move_form
msgid "Reconciled entries"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full
+#: model:ir.actions.client,name:account.action_manual_reconciliation
+#: model:ir.ui.menu,name:account.menu_action_manual_reconciliation
msgid "Reconciliation"
msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_reconcile_model
+#: model:ir.ui.menu,name:account.action_account_reconcile_model_menu
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
msgid "Reconciliation Models"
msgstr ""
@@ -7120,23 +8221,13 @@ msgid "Reconciliation Parts"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full
-msgid "Reconciliation Transactions"
-msgstr ""
-
-#. module: account
#: model:ir.actions.client,name:account.action_bank_reconcile
#: model:ir.actions.client,name:account.action_bank_reconcile_bank_statements
msgid "Reconciliation on Bank Statements"
msgstr ""
#. module: account
-#: selection:account.journal,bank_statements_source:0
-msgid "Record Manually"
-msgstr ""
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree2
+#: model:ir.actions.act_window,help:account.action_vendor_bill_template
msgid "Record a new vendor bill"
msgstr ""
@@ -7146,8 +8237,14 @@ msgid "Record transactions in foreign currencies"
msgstr ""
#. module: account
+#: code:addons/account/models/account.py:919
+#, python-format
+msgid "Recursion found for tax '%s'."
+msgstr ""
+
+#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:235
+#: code:addons/account/static/src/xml/account_reconciliation.xml:273
#: model:ir.ui.view,arch_db:account.report_generalledger
#: model:ir.ui.view,arch_db:account.report_partnerledger
#, python-format
@@ -7160,7 +8257,7 @@ msgid "Ref."
msgstr ""
#. module: account
-#: code:addons/account/controllers/portal.py:72
+#: code:addons/account/controllers/portal.py:46
#: model:ir.model.fields,field_description:account.field_account_bank_statement__name
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line__ref
#: model:ir.model.fields,field_description:account.field_account_move__ref
@@ -7197,18 +8294,14 @@ msgid "Reference/Description"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_invoice__refund_invoice_ids
-msgid "Refund Invoices"
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,field_description:account.field_account_invoice_refund__filter_refund
-msgid "Refund Method"
+#: model:ir.actions.act_window,name:account.action_invoice_in_refund
+#: model:ir.ui.menu,name:account.menu_action_invoice_in_refund
+msgid "Refund"
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_account_invoice_refund__filter_refund
-msgid "Refund base on this type. You can not Modify and Cancel if the invoice is already reconciled"
+#: model:ir.model.fields,field_description:account.field_account_invoice__refund_invoice_ids
+msgid "Refund Invoices"
msgstr ""
#. module: account
@@ -7230,6 +8323,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_account_payments
#: model:ir.actions.act_window,help:account.action_account_payments_payable
+#: model:ir.actions.act_window,help:account.action_account_payments_transfer
msgid "Register a payment"
msgstr ""
@@ -7244,6 +8338,21 @@ msgid "Regular"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__res_id
+msgid "Related Document ID"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__model
+msgid "Related Document Model"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__rating_ids
+msgid "Related ratings"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_invoice__residual_company_signed
msgid "Remaining amount due in the currency of the company."
msgstr ""
@@ -7264,6 +8373,16 @@ msgid "Replacement Tax"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_send__reply_to
+msgid "Reply email address. Setting the reply_to bypasses the automatic thread creation."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__reply_to
+msgid "Reply-To"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_account_financial_report_form
msgid "Report"
msgstr ""
@@ -7302,13 +8421,18 @@ msgid "Represent the non-zero value smallest coinage (for example, 0.05)."
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__res_partner_bank_id
+msgid "Res Partner Bank"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.invoice_form
msgid "Reset to Draft"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:240
+#: code:addons/account/static/src/xml/account_reconciliation.xml:278
#, python-format
msgid "Residual"
msgstr ""
@@ -7324,11 +8448,27 @@ msgid "Residual Amount in Currency"
msgstr ""
#. module: account
+#: code:addons/account/models/account_journal_dashboard.py:32
+#, python-format
+msgid "Residual amount"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_bank_statement__user_id
msgid "Responsible"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_digest_digest__kpi_account_total_revenue
+msgid "Revenue"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_deferred_revenue
msgid "Revenue Recognition"
msgstr ""
@@ -7373,8 +8513,8 @@ msgid "Reversed entry"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_group__parent_right
-msgid "Right Parent"
+#: model:ir.ui.view,arch_db:account.onboarding_chart_of_account_step
+msgid "Review"
msgstr ""
#. module: account
@@ -7399,7 +8539,6 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_cash_rounding__rounding_method
-#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
msgid "Rounding Method"
msgstr ""
@@ -7419,6 +8558,13 @@ msgid "Rounding Tree"
msgstr ""
#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:131
+#, python-format
+msgid "Run"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_sepa
msgid "SEPA Credit Transfer (SCT)"
msgstr ""
@@ -7429,42 +8575,40 @@ msgid "SEPA Direct Debit (SDD)"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "SEPA QR Code"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_company__qr_code_payment_journal_id
+msgid "SEPA QR Code Bank Journal account"
+msgstr ""
+
+#. module: account
#: selection:account.journal,type:0
#: model:ir.ui.view,arch_db:account.report_tax
#: model:ir.ui.view,arch_db:account.view_account_tax_search
#: model:ir.ui.view,arch_db:account.view_account_tax_template_search
-#: model:ir.ui.view,arch_db:account.view_partner_property_form
msgid "Sale"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.view_wizard_multi_chart
-msgid "Sale Tax"
-msgstr ""
-
-#. module: account
#: selection:account.tax,type_tax_use:0
#: selection:account.tax.template,type_tax_use:0
-#: model:ir.ui.menu,name:account.menu_finance_receivables
#: model:ir.ui.view,arch_db:account.view_account_journal_search
#: model:ir.ui.view,arch_db:account.view_account_move_filter
msgid "Sales"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.account_invoice_onboarding_sale_tax_form
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
msgid "Sales Tax"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__sale_tax_rate
-msgid "Sales Tax(%)"
-msgstr ""
-
-#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:33
-#, python-format
-msgid "Sales: Untaxed Total"
+#: model:ir.actions.act_window,name:account.action_open_account_onboarding_sale_tax
+msgid "Sales tax"
msgstr ""
#. module: account
@@ -7476,22 +8620,62 @@ msgid "Salesperson"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.setup_bank_journal_form
-#: model:ir.ui.view,arch_db:account.setup_financial_year_opening_form
-#: model:ir.ui.view,arch_db:account.setup_opening_move_wizard_form
-#: model:ir.ui.view,arch_db:account.setup_posted_move_form
-#: model:ir.ui.view,arch_db:account.setup_view_company_form
-msgid "Save"
+#: model:ir.ui.view,arch_db:account.onboarding_sample_invoice_step
+msgid "Sample Invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/company.py:465
+#, python-format
+msgid "Sample invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/company.py:471
+#, python-format
+msgid "Sample invoice line name"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/company.py:478
+#, python-format
+msgid "Sample invoice line name 2"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.onboarding_sample_invoice_step
+msgid "Sample invoice sent!"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_company__account_sanitize_invoice_ref
+#: model:ir.model.fields,field_description:account.field_res_config_settings__account_sanitize_invoice_ref
+msgid "Sanitize Invoice References"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__sanitized_acc_number
+msgid "Sanitized Account Number"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:203
+#: code:addons/account/static/src/xml/account_reconciliation.xml:211
#, python-format
msgid "Save and New"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.account_invoice_send_wizard_form
+msgid "Save as a new template"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.account_invoice_send_wizard_form
+msgid "Save as new template"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
msgid "Save this page and come back here to set up the feature."
msgstr ""
@@ -7542,16 +8726,12 @@ msgid "Search Move"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-msgid "Search Operations"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.view_account_tax_template_search
msgid "Search Tax Templates"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.account_tax_view_search
#: model:ir.ui.view,arch_db:account.view_account_tax_search
msgid "Search Taxes"
msgstr ""
@@ -7602,6 +8782,23 @@ msgid "Second Tax"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_reconcile_model__second_tax_amount_type
+msgid "Second Tax Amount Type"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_reconcile_model__force_second_tax_included
+#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template__force_second_tax_included
+msgid "Second Tax Included in Price"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.line,display_type:0
+#: model:ir.ui.view,arch_db:account.view_invoice_line_form
+msgid "Section"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice__access_token
msgid "Security Token"
msgstr ""
@@ -7616,12 +8813,17 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:74
+#: code:addons/account/static/src/xml/account_reconciliation.xml:77
#, python-format
msgid "Select a partner or choose a counterpart"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.invoice_supplier_form
+msgid "Select an old vendor bill"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_payment_term_line__value
msgid "Select here the kind of valuation related to this payment terms line."
msgstr ""
@@ -7644,16 +8846,32 @@ msgid "Selecting the \"Warning\" option will notify user with the message, Selec
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.product_product_action_sellable
-#: model:ir.ui.menu,name:account.product_product_menu_sellable
-msgid "Sellable Products"
+#: model:ir.actions.act_window,name:account.invoice_send
+#: model:ir.ui.view,arch_db:account.account_invoice_send_wizard_form
+msgid "Send"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.account_invoice_send_wizard_form
+#: model:ir.ui.view,arch_db:account.invoice_form
+msgid "Send & Print"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_config_settings__invoice_is_email
+msgid "Send Email"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_invoice.py:605
+#, python-format
+msgid "Send Invoice"
msgstr ""
#. module: account
#: selection:account.abstract.payment,payment_type:0
#: selection:account.payment,payment_type:0
#: selection:account.register.payments,payment_type:0
-#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
msgid "Send Money"
msgstr ""
@@ -7663,8 +8881,18 @@ msgid "Send Receipt By Email"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.invoice_form
-msgid "Send by Email"
+#: model:ir.actions.act_window,name:account.action_open_account_onboarding_sample_invoice
+msgid "Send a sample invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.onboarding_sample_invoice_step
+msgid "Send an invoice to test the customer portal."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.onboarding_sample_invoice_step
+msgid "Send sample"
msgstr ""
#. module: account
@@ -7691,6 +8919,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_payment_term_line__sequence
#: model:ir.model.fields,field_description:account.field_account_reconcile_model__sequence
#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template__sequence
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__sequence
#: model:ir.model.fields,field_description:account.field_account_tax__sequence
#: model:ir.model.fields,field_description:account.field_account_tax_group__sequence
#: model:ir.model.fields,field_description:account.field_account_tax_template__sequence
@@ -7698,6 +8927,13 @@ msgid "Sequence"
msgstr ""
#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:232
+#, python-format
+msgid "Set"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_account_payment_form
msgid "Set To Draft"
msgstr ""
@@ -7719,6 +8955,11 @@ msgid "Set active to false to hide the tax without removing it."
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.onboarding_sale_tax_step
+msgid "Set taxes"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_chart_template__visible
msgid "Set this to False if you don't want this template to be used actively in the wizard that generate Chart of Accounts from templates, this is useful when you want to generate accounts of this template only when loading its child template."
msgstr ""
@@ -7729,9 +8970,14 @@ msgid "Set to Draft"
msgstr ""
#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:82
+#: code:addons/account/static/src/xml/account_reconciliation.xml:121
#: model:ir.actions.act_window,name:account.action_account_config
+#: model:ir.actions.act_window,name:account.action_open_settings
#: model:ir.ui.menu,name:account.menu_account_config
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+#, python-format
msgid "Settings"
msgstr ""
@@ -7741,8 +8987,23 @@ msgid "Setup"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_res_company__account_setup_bar_closed
-msgid "Setup Bar Closed"
+#: model:ir.ui.view,arch_db:account.onboarding_bank_account_step
+msgid "Setup your bank account to sync bank feeds."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.onboarding_chart_of_account_step
+msgid "Setup your chart of accounts and record initial balances."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.dashboard_onboarding_company_step
+msgid "Setup your company's data for reports headers."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.server,name:account.model_account_invoice_action_share
+msgid "Share"
msgstr ""
#. module: account
@@ -7751,11 +9012,23 @@ msgid "Short Code"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_register_payments__show_communication_field
+msgid "Show Communication Field"
+msgstr ""
+
+#. module: account
#: model:res.groups,name:account.group_account_user
msgid "Show Full Accounting Features"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_abstract_payment__show_partner_bank_account
+#: model:ir.model.fields,field_description:account.field_account_payment__show_partner_bank_account
+#: model:ir.model.fields,field_description:account.field_account_register_payments__show_partner_bank_account
+msgid "Show Partner Bank Account"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_account_tax_search
msgid "Show active taxes"
msgstr ""
@@ -7776,23 +9049,58 @@ msgid "Show journal on dashboard"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_res_config_settings__group_show_line_subtotals_tax_included
+msgid "Show line subtotals with taxes (B2C)"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_users__has_group_show_line_subtotals_tax_included
+#: model:res.groups,comment:account.group_show_line_subtotals_tax_included
+msgid "Show line subtotals with taxes included (B2C)"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_config_settings__group_show_line_subtotals_tax_excluded
+#: model:ir.model.fields,field_description:account.field_res_users__has_group_show_line_subtotals_tax_excluded
+#: model:res.groups,comment:account.group_show_line_subtotals_tax_excluded
+msgid "Show line subtotals without taxes (B2B)"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_financial_report__sign
msgid "Sign on Reports"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:107
+#: code:addons/account/static/src/xml/account_reconciliation.xml:110
#, python-format
msgid "Skip"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_send__author_avatar
+msgid "Small-sized image of this contact. It is automatically resized as a 64x64px image, with aspect ratio preserved. Use this field anywhere a small image is required."
+msgstr ""
+
+#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Smallest Text"
msgstr ""
#. module: account
+#. openerp-web
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:755
+#, python-format
+msgid "Some fields are undefined"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_setup_bank_manual_config__bank_bic
+msgid "Sometimes called BIC or Swift."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger__sortby
msgid "Sort by"
msgstr ""
@@ -7800,23 +9108,32 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice__origin
#: model:ir.model.fields,field_description:account.field_account_invoice_line__origin
-#: model:ir.ui.view,arch_db:account.portal_invoice_report
-#: model:ir.ui.view,arch_db:account.report_invoice_document
msgid "Source Document"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice__source_email
+msgid "Source Email"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_cash_rounding__strategy
msgid "Specify which way will be used to round the invoice amount to the rounding precision"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__starred
+msgid "Starred"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_aged_trial_balance__date_from
#: model:ir.model.fields,field_description:account.field_account_balance_report__date_from
#: model:ir.model.fields,field_description:account.field_account_common_account_report__date_from
#: model:ir.model.fields,field_description:account.field_account_common_journal_report__date_from
#: model:ir.model.fields,field_description:account.field_account_common_partner_report__date_from
#: model:ir.model.fields,field_description:account.field_account_common_report__date_from
+#: model:ir.model.fields,field_description:account.field_account_fiscal_year__date_from
#: model:ir.model.fields,field_description:account.field_account_print_journal__date_from
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger__date_from
#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger__date_from
@@ -7831,6 +9148,11 @@ msgid "Start Date Comparison"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_fiscal_year__date_from
+msgid "Start Date, included in the fiscal year."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_bank_statement__balance_start
msgid "Starting Balance"
msgstr ""
@@ -7846,6 +9168,46 @@ msgid "State"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_res_company__account_dashboard_onboarding_state
+msgid "State of the account dashboard onboarding panel"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_company__account_invoice_onboarding_state
+msgid "State of the account invoice onboarding panel"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_company__account_setup_bank_data_state
+msgid "State of the onboarding bank data step"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_company__account_setup_coa_state
+msgid "State of the onboarding charts of account step"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_company__account_setup_fy_data_state
+msgid "State of the onboarding fiscal year step"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_company__account_onboarding_invoice_layout_state
+msgid "State of the onboarding invoice layout step"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_company__account_onboarding_sale_tax_state
+msgid "State of the onboarding sale tax step"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_company__account_onboarding_sample_invoice_state
+msgid "State of the onboarding sample invoice step"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_move_line__parent_state
msgid "State of the parent account.move"
msgstr ""
@@ -7853,11 +9215,12 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line__statement_id
#: model:ir.model.fields,field_description:account.field_account_move_line__statement_id
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
msgid "Statement"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:246
+#: code:addons/account/models/account_bank_statement.py:248
#, python-format
msgid "Statement %s confirmed, journal items were created."
msgstr ""
@@ -7875,6 +9238,7 @@ msgid "Statement lines"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#: model:ir.ui.view,arch_db:account.view_bank_statement_tree
msgid "Statements"
msgstr ""
@@ -7890,7 +9254,7 @@ msgid "States Count"
msgstr ""
#. module: account
-#: code:addons/account/controllers/portal.py:73
+#: code:addons/account/controllers/portal.py:47
#: model:ir.model.fields,field_description:account.field_account_bank_statement__state
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line__state
#: model:ir.model.fields,field_description:account.field_account_invoice__state
@@ -7905,12 +9269,42 @@ msgid "Status"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice__activity_state
+msgid "Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.onboarding_bank_account_step
+#: model:ir.ui.view,arch_db:account.onboarding_fiscal_year_step
+#: model:ir.ui.view,arch_db:account.onboarding_sale_tax_step
+msgid "Step Completed!"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__subject
+msgid "Subject"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.account_invoice_send_wizard_form
+msgid "Subject..."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_cashbox_line__subtotal
#: model:ir.ui.view,arch_db:account.invoice_form
msgid "Subtotal"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__subtype_id
+msgid "Subtype"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
msgid "Supplier Payments"
msgstr ""
@@ -7955,13 +9349,13 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:174
+#: code:addons/account/static/src/xml/account_reconciliation.xml:178
#: model:ir.model,name:account.model_account_tax
#: model:ir.model.fields,field_description:account.field_account_invoice__amount_tax
#: model:ir.model.fields,field_description:account.field_account_invoice_tax__tax_id
#: model:ir.model.fields,field_description:account.field_account_reconcile_model__tax_id
#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template__tax_id
-#: model:ir.ui.view,arch_db:account.portal_invoice_report
+#: model:ir.ui.view,arch_db:account.account_tax_view_search
#: model:ir.ui.view,arch_db:account.report_tax
#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
#: model:ir.ui.view,arch_db:account.view_account_tax_search
@@ -7970,8 +9364,8 @@ msgid "Tax"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:840
-#: code:addons/account/models/chart_template.py:843
+#: code:addons/account/models/chart_template.py:279
+#: code:addons/account/models/chart_template.py:281
#, python-format
msgid "Tax %.2f%%"
msgstr ""
@@ -8000,12 +9394,18 @@ msgid "Tax Adjustments"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_line__price_tax
#: model:ir.model.fields,field_description:account.field_account_invoice_tax__amount
#: model:ir.ui.view,arch_db:account.report_journal
msgid "Tax Amount"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_reconcile_model__tax_amount_type
+msgid "Tax Amount Type"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_account_tax_search
msgid "Tax Application"
msgstr ""
@@ -8048,12 +9448,27 @@ msgid "Tax Due"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.invoice_supplier_tree
+#: model:ir.ui.view,arch_db:account.invoice_tree
+msgid "Tax Excluded"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_tax__tax_group_id
#: model:ir.model.fields,field_description:account.field_account_tax_template__tax_group_id
msgid "Tax Group"
msgstr ""
#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:205
+#: model:ir.model.fields,field_description:account.field_account_reconcile_model__force_tax_included
+#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template__force_tax_included
+#, python-format
+msgid "Tax Included in Price"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice__tax_line_ids
msgid "Tax Lines"
msgstr ""
@@ -8072,8 +9487,8 @@ msgid "Tax Name"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_tax__cash_basis_account
-#: model:ir.model.fields,field_description:account.field_account_tax_template__cash_basis_account
+#: model:ir.model.fields,field_description:account.field_account_tax__cash_basis_account_id
+#: model:ir.model.fields,field_description:account.field_account_tax_template__cash_basis_account_id
msgid "Tax Received Account"
msgstr ""
@@ -8117,11 +9532,26 @@ msgid "Tax Templates"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_move__tax_type_domain
+msgid "Tax Type Domain"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_res_config_settings__tax_calculation_rounding_method
msgid "Tax calculation rounding method"
msgstr ""
#. module: account
+#: model:res.groups,name:account.group_show_line_subtotals_tax_excluded
+msgid "Tax display B2B"
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_show_line_subtotals_tax_included
+msgid "Tax display B2C"
+msgstr ""
+
+#. module: account
#: sql_constraint:account.tax:0
#: sql_constraint:account.tax.template:0
msgid "Tax names must be unique !"
@@ -8138,11 +9568,26 @@ msgid "Tax to Apply"
msgstr ""
#. module: account
+#: selection:res.config.settings,show_line_subtotals_tax_selection:0
+msgid "Tax-Excluded"
+msgstr ""
+
+#. module: account
+#: selection:res.config.settings,show_line_subtotals_tax_selection:0
+msgid "Tax-Included"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
msgid "TaxCloud"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice__amount_by_group
+msgid "Taxe amount by group"
+msgstr ""
+
+#. module: account
#: selection:account.account.tag,applicability:0
#: model:account.tax.group,name:account.tax_group_taxes
#: model:ir.actions.act_window,name:account.action_tax_form
@@ -8151,14 +9596,18 @@ msgstr ""
#: model:ir.ui.menu,name:account.menu_action_tax_form
#: model:ir.ui.view,arch_db:account.invoice_form
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
-#: model:ir.ui.view,arch_db:account.portal_invoice_report
-#: model:ir.ui.view,arch_db:account.report_invoice_document
+#: model:ir.ui.view,arch_db:account.onboarding_sale_tax_step
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
#: model:ir.ui.view,arch_db:account.view_move_line_form
msgid "Taxes"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.view_move_form
+msgid "Taxes Applied"
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Taxes Fiscal Position"
msgstr ""
@@ -8184,6 +9633,18 @@ msgid "Taxes, fiscal positions, chart of accounts &amp; legal statements for you
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_payment__invoice_ids
+msgid "Technical field containing the invoices for which the payment has been generated.\n"
+" This does not especially correspond to the invoices reconciled with the payment,\n"
+" as it can have been generated first, and reconciled later"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_line__display_type
+msgid "Technical field for UX purpose."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_move_line__balance
msgid "Technical field holding the debit - credit in order to open meaningful graph views from reports"
msgstr ""
@@ -8205,36 +9666,13 @@ msgid "Technical field holding the number given to the journal entry, automatica
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_res_company__account_setup_bank_data_done
-msgid "Technical field holding the status of the bank setup step."
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,help:account.field_res_company__account_setup_coa_done
-msgid "Technical field holding the status of the chart of account setup step."
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,help:account.field_res_company__account_setup_company_data_done
-msgid "Technical field holding the status of the company setup step."
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,help:account.field_res_company__account_setup_fy_data_done
-msgid "Technical field holding the status of the financial year setup step."
-msgstr ""
-
-#. module: account
+#: model:ir.model.fields,help:account.field_account_abstract_payment__multi
+#: model:ir.model.fields,help:account.field_account_payment__multi
#: model:ir.model.fields,help:account.field_account_register_payments__multi
msgid "Technical field indicating if the user selected invoices from multiple partners or from different types."
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_res_company__account_setup_bar_closed
-msgid "Technical field set to True when setup bar has been closed by the user."
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_refund__refund_only
msgid "Technical field to hide filter_refund in case invoice is partially paid"
msgstr ""
@@ -8251,8 +9689,23 @@ msgid "Technical field used in cash basis method"
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_account_journal__account_setup_bank_data_done
-msgid "Technical field used in the special view for the setup bar step."
+#: model:ir.model.fields,help:account.field_account_reconcile_model__second_tax_amount_type
+msgid "Technical field used inside the view to make the force_second_tax_included field invisible if the tax is a group."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_reconcile_model__is_second_tax_price_included
+msgid "Technical field used inside the view to make the force_second_tax_included field readonly if the tax is already price included."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_reconcile_model__tax_amount_type
+msgid "Technical field used inside the view to make the force_tax_included field invisible if the tax is a group."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_reconcile_model__is_tax_price_included
+msgid "Technical field used inside the view to make the force_tax_included field readonly if the tax is already price included."
msgstr ""
#. module: account
@@ -8268,6 +9721,11 @@ msgid "Technical field used to determine at which date this reconciliation needs
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_move__tax_type_domain
+msgid "Technical field used to have a dynamic taxes domain on the form view."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_abstract_payment__hide_payment_method
#: model:ir.model.fields,help:account.field_account_payment__hide_payment_method
#: model:ir.model.fields,help:account.field_account_register_payments__hide_payment_method
@@ -8280,13 +9738,30 @@ msgid "Technical field used to keep track of the tax cash basis reconciliation.
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_move_line__recompute_tax_line
+msgid "Technical field used to know if the tax_ids field has been modified in the UI."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_abstract_payment__show_partner_bank_account
+#: model:ir.model.fields,help:account.field_account_payment__show_partner_bank_account
+#: model:ir.model.fields,help:account.field_account_register_payments__show_partner_bank_account
+msgid "Technical field used to know whether the field `partner_bank_account_id` needs to be displayed or not in the payments form views"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_move_line__tax_exigible
msgid "Technical field used to mark a tax line as exigible in the vat report or not (only exigible journal items are displayed). By default all new journal items are directly exigible, but with the feature cash_basis on taxes, some will become exigible only when the payment is recorded."
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_account_move_line__is_unaffected_earnings_line
-msgid "Tells whether or not this line belongs to an unaffected earnings account"
+#: model:ir.model.fields,help:account.field_account_bank_statement_line__account_number
+msgid "Technical field used to store the bank account number before its creation, upon the line's processing"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_move_line__tax_line_grouping_key
+msgid "Technical field used to store the old values of fields used to compute tax lines (in account.move form view) between the moment the user changed it and the moment the ORM reflects that change in its one2many"
msgstr ""
#. module: account
@@ -8342,30 +9817,37 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:53
+#: code:addons/account/static/src/xml/account_reconciliation.xml:56
#, python-format
msgid "That's on average"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_account__internal_group
+#: model:ir.model.fields,help:account.field_account_account_type__internal_group
+msgid "The 'Internal Group' is used to filter accounts based on the internal group set on the account type."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_account__internal_type
#: model:ir.model.fields,help:account.field_account_account_type__type
msgid "The 'Internal Type' is used for features available on different types of accounts: liquidity type is for cash or bank accounts, payable/receivable is for vendor/customer accounts."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1243
+#: code:addons/account/models/account_move.py:1059
#, python-format
-msgid "The account %s (%s) is deprecated !"
+msgid "The account %s (%s) is deprecated."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1057
+#: code:addons/account/models/account_invoice.py:521
#, python-format
-msgid "The account %s (%s) is not marked as reconcilable !"
+msgid "The account selected for payment does not belong to the same company as this invoice."
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_setup_bank_manual_config__journal_id
#: model:ir.model.fields,help:account.field_res_partner_bank__journal_id
msgid "The accounting journal corresponding to this bank account."
msgstr ""
@@ -8382,30 +9864,50 @@ msgid "The amount expressed in an optional other currency if it is a multi-curre
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:533
+#: code:addons/account/models/account_move.py:696
#, python-format
msgid "The amount expressed in the secondary currency must be positive when account is debited and negative when account is credited."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:827
+#: code:addons/account/models/account_bank_statement.py:319
+#, python-format
+msgid "The amount of a cash transaction cannot be 0."
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account.py:921
#, python-format
-msgid "The application scope of taxes in a group must be either the same as the group or \"None\"."
+msgid "The application scope of taxes in a group must be either the same as the group or left empty."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:486
+#: code:addons/account/models/account.py:542
#, python-format
msgid "The bank account of a bank journal must belong to the same company (%s)."
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_res_company__account_bank_reconciliation_start
+msgid "The bank reconciliation widget won't ask to reconcile payments older than this date.\n"
+" This is useful if you install accounting after having used invoicing for some time and\n"
+" don't want to reconcile all the past payments with bank statements."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_res_config_settings__account_bank_reconciliation_start
+msgid "The bank reconciliation widget won't ask to reconcile payments older than this date.\n"
+" This is useful if you install accounting after having used invoicing for some time and\n"
+" don't want to reconcile all the past payments with bank statements."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_move_line__statement_id
msgid "The bank statement used for bank reconciliation"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1173
+#: code:addons/account/models/account_invoice.py:1261
#, python-format
msgid "The cash rounding cannot be computed because the difference must be added on the biggest tax found and no tax are specified.\n"
"Please set up a tax or change the cash rounding method."
@@ -8437,24 +9939,42 @@ msgid "The commercial entity that will be used on Journal Entries for this invoi
msgstr ""
#. module: account
+#: code:addons/account/models/account.py:533
+#, python-format
+msgid "The currency of the journal should be the same than the default credit account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account.py:535
+#, python-format
+msgid "The currency of the journal should be the same than the default debit account."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_journal__currency_id
msgid "The currency used to enter statement"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1791
+#: code:addons/account/models/account_invoice.py:1967
#, python-format
msgid "The day of the month used for this term must be stricly positive."
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:191
+#: code:addons/account/models/account_bank_statement.py:193
#, python-format
msgid "The ending balance is incorrect !\n"
"The expected balance (%s) is different from the computed one. (%s)"
msgstr ""
#. module: account
+#: code:addons/account/models/account_fiscal_year.py:42
+#, python-format
+msgid "The ending date must not be prior to the starting date."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_product_category__property_account_expense_categ_id
msgid "The expense is accounted for when a vendor bill is validated, except in anglo-saxon accounting with perpetual inventory valuation in which case the expense (Cost of Goods Sold account) is recognized at the customer invoice validation."
msgstr ""
@@ -8466,13 +9986,19 @@ msgid "The expense is accounted for when a vendor bill is validated, except in a
msgstr ""
#. module: account
+#: code:addons/account/models/account_invoice.py:889
+#, python-format
+msgid "The field Vendor is required, please complete it to validate the Vendor Bill."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_res_partner__property_account_position_id
#: model:ir.model.fields,help:account.field_res_users__property_account_position_id
msgid "The fiscal position will determine taxes and accounts used for the partner."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:490
+#: code:addons/account/models/account.py:546
#, python-format
msgid "The holder of a journal's bank account must be the company (%s)."
msgstr ""
@@ -8483,18 +10009,11 @@ msgid "The income or expense account related to the selected product."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:615
-#, python-format
-msgid "The journal %s does not have a sequence, please specify one."
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,help:account.field_account_journal__code
msgid "The journal entries of this journal will be named using this prefix."
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_account_opening__opening_move_id
#: model:ir.model.fields,help:account.field_res_company__account_opening_move_id
msgid "The journal entry containing the initial balance of all this company's accounts."
msgstr ""
@@ -8506,11 +10025,23 @@ msgid "The last day of the month will be taken if the chosen day doesn't exist."
msgstr ""
#. module: account
+#: code:addons/account/models/account_invoice.py:1878
+#, python-format
+msgid "The last line of a Payment Term should have the Balance type."
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_payment_term_form
msgid "The last line's computation type should be \"Balance\" to ensure that the whole amount will be allocated."
msgstr ""
#. module: account
+#: code:addons/account/models/company.py:148
+#, python-format
+msgid "The lock date for advisors is irreversible and can't be removed."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_move_line__move_id
msgid "The move of this entry line."
msgstr ""
@@ -8521,6 +10052,12 @@ msgid "The name that will be used on account move lines"
msgstr ""
#. module: account
+#: code:addons/account/models/company.py:152
+#, python-format
+msgid "The new lock date for advisors must be set after the previous lock date."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_journal__refund_sequence_number_next
msgid "The next sequence number will be used for the next credit note."
msgstr ""
@@ -8531,7 +10068,7 @@ msgid "The next sequence number will be used for the next invoice."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1793
+#: code:addons/account/models/account_invoice.py:1969
#, python-format
msgid "The number of days used for a payment term cannot be negative."
msgstr ""
@@ -8559,32 +10096,31 @@ msgid "The partner has at least one unreconciled debit and credit since last tim
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1059
+#: code:addons/account/models/account.py:639
#, python-format
-msgid "The partner has to be the same on all lines for receivable and payable accounts!"
+msgid "The partners of the journal's company and the related bank account mismatch."
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_account_invoice__reference
-msgid "The partner reference of this invoice."
+#: code:addons/account/models/account_payment.py:119
+#, python-format
+msgid "The payment amount cannot be negative."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:556
+#: code:addons/account/models/account_payment.py:603
#, python-format
-msgid "The partners of the journal's company and the related bank account mismatch."
+msgid "The payment cannot be processed because the invoice is not open!"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:61
-#, python-format
-msgid "The payment amount cannot be negative."
+#: model:ir.model.fields,help:account.field_account_invoice__reference
+msgid "The payment communication that will be automatically populated once the invoice validation. You can also write a free communication."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:482
-#, python-format
-msgid "The payment cannot be processed because the invoice is not open!"
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "The payments which have not been matched with a bank statement will not be shown in bank reconciliation data if they were made before this date."
msgstr ""
#. module: account
@@ -8598,15 +10134,15 @@ msgid "The residual amount on a journal item expressed in the company currency."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:518
+#: code:addons/account/models/account_move.py:681
#, python-format
msgid "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1615
+#: code:addons/account/models/account_invoice.py:1749
#, python-format
-msgid "The selected unit of measure is not compatible with the unit of measure of the product."
+msgid "The selected unit of measure has to be in the same category as the product unit of measure."
msgstr ""
#. module: account
@@ -8616,12 +10152,6 @@ msgid "The sequence field is used to define order in which the tax lines are app
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:617
-#, python-format
-msgid "The sequence of journal %s is deactivated."
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,help:account.field_account_cash_rounding__rounding_method
msgid "The tie-breaking rule used for float rounding operations"
msgstr ""
@@ -8632,13 +10162,19 @@ msgid "There are currently no invoices and payments for your account."
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:118
+#: code:addons/account/models/company.py:251
#, python-format
msgid "There are still unposted entries in the period you want to lock. You should either post or delete them."
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:179
+#: code:addons/account/models/account_payment.py:453
+#, python-format
+msgid "There is no Transfer Account defined in the accounting settings. Please define one to be able to confirm this transfer."
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_bank_statement.py:181
#, python-format
msgid "There is no account defined on the journal %s for %s involved in a cash difference."
msgstr ""
@@ -8650,7 +10186,7 @@ msgid "There is no journal items in draft state to post."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1810
+#: code:addons/account/models/account_move.py:1565
#, python-format
msgid "There is no tax cash basis journal defined for this company: \"%s\" \n"
"Configure it in Accounting/Configuration/Settings"
@@ -8658,7 +10194,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:46
+#: code:addons/account/static/src/xml/account_reconciliation.xml:49
#, python-format
msgid "There is nothing to reconcile."
msgstr ""
@@ -8679,18 +10215,13 @@ msgid "These types are defined according to your country. The type contains more
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1345
+#: code:addons/account/models/account_invoice.py:1440
#, python-format
-msgid "This %s has been created from: <a href=# data-oe-model=account.invoice data-oe-id=%d>%s</a>"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
-msgid "This Month"
+msgid "This %s has been created from: <a href=# data-oe-model=account.invoice data-oe-id=%d>%s</a><br>Reason: %s"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:103
+#: code:addons/account/models/account_journal_dashboard.py:100
#, python-format
msgid "This Week"
msgstr ""
@@ -8723,9 +10254,9 @@ msgid "This allows accountants to manage analytic and crossovered budgets. Once
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_res_config_settings__module_account_batch_deposit
-msgid "This allows you to group received checks before you deposit them to the bank.\n"
-"-This installs the module account_batch_deposit."
+#: model:ir.model.fields,help:account.field_res_config_settings__module_account_batch_payment
+msgid "This allows you grouping payments into a single batch and eases the reconciliation process.\n"
+"-This installs the account_batch_payment module."
msgstr ""
#. module: account
@@ -8744,11 +10275,6 @@ msgid "This boolean helps you to choose if you want to propose to the user to en
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_wizard_multi_charts_accounts__complete_tax_set
-msgid "This boolean helps you to choose if you want to propose to the user to encode the sales and purchase rates or use the usual m2o fields. This last choice assumes that the set of tax defined for the chosen template is complete"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
msgid "This feature is useful if you issue a high amounts of invoices."
msgstr ""
@@ -8785,13 +10311,13 @@ msgid "This is the accounting dashboard"
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:528
+#: code:addons/account/models/account.py:611
#, python-format
msgid "This journal already contains items, therefore you cannot modify its company."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:537
+#: code:addons/account/models/account.py:620
#, python-format
msgid "This journal already contains items, therefore you cannot modify its short name."
msgstr ""
@@ -8802,19 +10328,12 @@ msgid "This label will be displayed on report to show the balance computed for t
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:528
+#: code:addons/account/models/account_payment.py:651
#, python-format
msgid "This method should only be called to process a single invoice's payment."
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:389
-#, python-format
-msgid "This move's amount is higher than the transaction's amount. Click to register a partial payment and keep the payment balance open."
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,help:account.field_accounting_report__debit_credit
msgid "This option allows you to get more details about the way your balances are computed. Because it is space consuming, we do not allow to use it while doing a comparison."
msgstr ""
@@ -8826,14 +10345,14 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:35
+#: code:addons/account/static/src/xml/account_reconciliation.xml:39
#, python-format
msgid "This page displays all the bank transactions that are to be reconciled and provides with a neat interface to do so."
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:244
+#: code:addons/account/static/src/xml/account_reconciliation.xml:282
#, python-format
msgid "This payment is registered but not reconciled."
msgstr ""
@@ -8867,13 +10386,8 @@ msgid "Those can be used to quickly create a journal items when reconciling\n"
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_res_config_settings__account_hide_setup_bar
-msgid "Tick if you wish to hide the setup bar on the dashboard"
-msgstr ""
-
-#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:31
+#: code:addons/account/static/src/xml/account_reconciliation.xml:35
#, python-format
msgid "Tip: Hit CTRL-Enter to reconcile all the balanced items in the sheet."
msgstr ""
@@ -8904,9 +10418,21 @@ msgid "To pay"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1053
+#: code:addons/account/models/account_move.py:909
#, python-format
-msgid "To reconcile the entries company should be the same for all entries!"
+msgid "To reconcile the entries company should be the same for all entries."
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:162
+#, python-format
+msgid "To speed up reconciliation, define"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,activity_state:0
+msgid "Today"
msgstr ""
#. module: account
@@ -8916,9 +10442,9 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice__amount_total
+#: model:ir.ui.view,arch_db:account.invoice_form
#: model:ir.ui.view,arch_db:account.invoice_supplier_tree
#: model:ir.ui.view,arch_db:account.invoice_tree
-#: model:ir.ui.view,arch_db:account.report_agedpartnerbalance
#: model:ir.ui.view,arch_db:account.view_account_bnk_stmt_cashbox
msgid "Total"
msgstr ""
@@ -8929,14 +10455,17 @@ msgid "Total Amount"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.setup_opening_move_lines_tree
+#: model:ir.ui.view,arch_db:account.view_move_line_tax_audit_tree
+msgid "Total Base Amount"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_move_form
#: model:ir.ui.view,arch_db:account.view_move_line_tree
msgid "Total Credit"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.setup_opening_move_lines_tree
#: model:ir.ui.view,arch_db:account.view_move_form
#: model:ir.ui.view,arch_db:account.view_move_line_tree
msgid "Total Debit"
@@ -9033,16 +10562,20 @@ msgid "Track costs &amp; revenues by project, department, etc."
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:254
-#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-#, python-format
-msgid "Transaction"
+#: model:ir.model.fields,help:account.field_account_invoice_send__tracking_value_ids
+msgid "Tracked values are stored in a separate model. This field allow to reconstruct the tracking and to generate statistics on the model."
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile__trans_nbr
-msgid "Transaction Count"
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__tracking_value_ids
+msgid "Tracking values"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:292
+#, python-format
+msgid "Transaction"
msgstr ""
#. module: account
@@ -9056,30 +10589,18 @@ msgid "Transactions Subtotal"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_chart_template__transfer_account_id
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__transfer_account_id
-msgid "Transfer Account"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_payment__destination_journal_id
msgid "Transfer To"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:363
-#, python-format
-msgid "Transfer account not defined on the company."
-msgstr ""
-
-#. module: account
-#: code:addons/account/models/account_payment.py:590
+#: code:addons/account/models/account_payment.py:715
#, python-format
msgid "Transfer from %s"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:671
+#: code:addons/account/models/account_payment.py:791
#, python-format
msgid "Transfer to %s"
msgstr ""
@@ -9109,9 +10630,11 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_financial_report__type
#: model:ir.model.fields,field_description:account.field_account_invoice__type
#: model:ir.model.fields,field_description:account.field_account_invoice_report__type
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__message_type
#: model:ir.model.fields,field_description:account.field_account_journal__type
#: model:ir.model.fields,field_description:account.field_account_move_line__user_type_id
#: model:ir.model.fields,field_description:account.field_account_payment_term_line__value
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__acc_type
msgid "Type"
msgstr ""
@@ -9121,52 +10644,42 @@ msgid "UP"
msgstr ""
#. module: account
-#: selection:account.journal,bank_statements_source:0
+#: code:addons/account/models/account.py:389
+#, python-format
msgid "Undefined Yet"
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:304
+#: code:addons/account/models/company.py:366
#, python-format
msgid "Undistributed Profits/Losses"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:386
-#, python-format
-msgid "Undo the partial reconciliation."
+#: model:ir.model.fields,field_description:account.field_account_invoice_line__price_unit
+msgid "Unit Price"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_invoice_line__price_unit
-#: model:ir.ui.view,arch_db:account.portal_invoice_report
-#: model:ir.ui.view,arch_db:account.report_invoice_document
-msgid "Unit Price"
+#: model:ir.ui.view,arch_db:account.invoice_form
+msgid "Unit Price:"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_analytic_line__product_uom_id
#: model:ir.model.fields,field_description:account.field_account_invoice_line__uom_id
#: model:ir.model.fields,field_description:account.field_account_move_line__product_uom_id
msgid "Unit of Measure"
msgstr ""
#. module: account
-#: code:addons/account/report/account_aged_partner_balance.py:194
+#: code:addons/account/report/account_aged_partner_balance.py:206
#, python-format
msgid "Unknown Partner"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.setup_bank_journal_form
-#: model:ir.ui.view,arch_db:account.setup_financial_year_opening_form
-#: model:ir.ui.view,arch_db:account.setup_view_company_form
-msgid "Unmark as done"
-msgstr ""
-
-#. module: account
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
msgid "Unpaid Invoices"
msgstr ""
@@ -9188,6 +10701,20 @@ msgid "Unposted Journal Items"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_bank_statement__message_unread
+#: model:ir.model.fields,field_description:account.field_account_invoice__message_unread
+#: model:ir.model.fields,field_description:account.field_account_payment__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_bank_statement__message_unread_counter
+#: model:ir.model.fields,field_description:account.field_account_invoice__message_unread_counter
+#: model:ir.model.fields,field_description:account.field_account_payment__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: account
#. openerp-web
#: code:addons/account/static/src/xml/account_payment.xml:81
#: model:ir.ui.view,arch_db:account.account_unreconcile_view
@@ -9231,8 +10758,8 @@ msgid "Update exchange rates automatically"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__use_anglo_saxon
-msgid "Use Anglo-Saxon Accounting"
+#: model:ir.ui.view,arch_db:account.account_invoice_import_wizard_form_view
+msgid "Upload Files"
msgstr ""
#. module: account
@@ -9256,13 +10783,23 @@ msgid "Use Specific Journal"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__use_active_domain
+msgid "Use active domain"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_res_company__anglo_saxon_accounting
msgid "Use anglo-saxon accounting"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_batch_deposit
-msgid "Use batch deposit"
+#: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_batch_payment
+msgid "Use batch payments"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
+msgid "Use budgets to compare actual with expected revenues and costs"
msgstr ""
#. module: account
@@ -9276,6 +10813,11 @@ msgid "Use follow-up levels and schedule actions"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_send__template_id
+msgid "Use template"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_account_invoice_refund
msgid "Use this option if you want to cancel an invoice and create a new\n"
" one. The credit note will be created, validated and reconciled\n"
@@ -9316,6 +10858,11 @@ msgid "Used to register a profit when the ending balance of a cash register diff
msgstr ""
#. module: account
+#: model:ir.model,name:account.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_bank_statement_line__journal_currency_id
#: model:ir.model.fields,help:account.field_account_move_line__company_currency_id
#: model:ir.model.fields,help:account.field_account_partial_reconcile__company_currency_id
@@ -9331,13 +10878,8 @@ msgid "VAT required"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.portal_invoice_report
-msgid "VAT:"
-msgstr ""
-
-#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:72
+#: code:addons/account/static/src/xml/account_reconciliation.xml:75
#: model:ir.ui.view,arch_db:account.invoice_form
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
#: model:ir.ui.view,arch_db:account.view_account_payment_from_invoices
@@ -9377,25 +10919,25 @@ msgstr ""
#. module: account
#: selection:account.invoice,type:0
#: selection:account.invoice.report,type:0
-#: code:addons/account/models/account_invoice.py:447
-#: code:addons/account/models/account_invoice.py:1223
+#: code:addons/account/models/account_invoice.py:488
+#: code:addons/account/models/account_invoice.py:1316
+#: model:ir.model.fields,field_description:account.field_account_invoice__vendor_bill_id
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
-#: model:ir.ui.view,arch_db:account.portal_invoice_page
+#: model:ir.ui.view,arch_db:account.invoice_supplier_tree
#: model:ir.ui.view,arch_db:account.report_invoice_document
#, python-format
msgid "Vendor Bill"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:448
+#: code:addons/account/models/account_invoice.py:489
#, python-format
msgid "Vendor Bill - %s"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:194
-#: model:ir.actions.act_window,name:account.action_invoice_tree2
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree2
+#: code:addons/account/models/chart_template.py:410
+#: model:ir.actions.act_window,name:account.action_vendor_bill_template
#, python-format
msgid "Vendor Bills"
msgstr ""
@@ -9403,34 +10945,33 @@ msgstr ""
#. module: account
#: selection:account.invoice,type:0
#: selection:account.invoice.report,type:0
-#: code:addons/account/models/account_invoice.py:449
-#: code:addons/account/models/account_payment.py:653
-#: model:ir.ui.view,arch_db:account.portal_invoice_page
+#: code:addons/account/models/account_invoice.py:490
+#: code:addons/account/models/account_payment.py:773
#: model:ir.ui.view,arch_db:account.report_invoice_document
#, python-format
msgid "Vendor Credit Note"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:450
+#: code:addons/account/models/account_invoice.py:491
#, python-format
msgid "Vendor Credit Note - %s"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_in_refund
-#: model:ir.ui.menu,name:account.menu_action_invoice_in_refund
-msgid "Vendor Credit Notes"
+#: code:addons/account/models/account_invoice.py:1318
+#, python-format
+msgid "Vendor Credit note"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1225
-#, python-format
-msgid "Vendor Credit note"
+#: model:ir.model.fields,field_description:account.field_account_invoice__vendor_display_name
+msgid "Vendor Display Name"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:655
+#: code:addons/account/models/account_payment.py:775
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#, python-format
msgid "Vendor Payment"
msgstr ""
@@ -9442,7 +10983,12 @@ msgid "Vendor Payment Terms"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_invoice__reference
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+#: model:ir.ui.view,arch_db:account.view_account_payment_search
+msgid "Vendor Payments"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
msgid "Vendor Reference"
msgstr ""
@@ -9455,11 +11001,15 @@ msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_account_supplier
+#: model:ir.ui.menu,name:account.menu_finance_payables
msgid "Vendors"
msgstr ""
#. module: account
+#. openerp-web
#: selection:account.financial.report,type:0
+#: code:addons/account/static/src/xml/account_payment.xml:82
+#, python-format
msgid "View"
msgstr ""
@@ -9469,7 +11019,7 @@ msgid "Warning"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:669
+#: code:addons/account/models/account_invoice.py:776
#, python-format
msgid "Warning for %s"
msgstr ""
@@ -9480,8 +11030,8 @@ msgid "Warning on the Invoice"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1555
-#: code:addons/account/models/account_invoice.py:1614
+#: code:addons/account/models/account_invoice.py:1684
+#: code:addons/account/models/account_invoice.py:1748
#, python-format
msgid "Warning!"
msgstr ""
@@ -9497,11 +11047,59 @@ msgid "Warnings in Invoices"
msgstr ""
#. module: account
+#: code:addons/account/models/company.py:521
+#, python-format
+msgid "We cannot find a chart of accounts for this company, you should configure it. \n"
+"Please go to Account Configuration and select or install a fiscal localization."
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/company.py:460
+#, python-format
+msgid "We cannot find any journal for this company. You should create one.\n"
+"Please go to Configuration > Journals."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_bank_statement__website_message_ids
+#: model:ir.model.fields,field_description:account.field_account_invoice__website_message_ids
+#: model:ir.model.fields,field_description:account.field_account_payment__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_bank_statement__website_message_ids
+#: model:ir.model.fields,help:account.field_account_invoice__website_message_ids
+#: model:ir.model.fields,help:account.field_account_payment__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_res_company__account_sanitize_invoice_ref
+msgid "Whether or not customer invoices and vendor bills should automatically correct their reference they are maximum 140 characters long, consist only of latin characters, contain no '//' sequence, and have no leading or trailing /. (these are the SEPA criteria for payment communications)"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_journal__post_at_bank_rec
+msgid "Whether or not the payments made in this journal should be generated in draft state, so that the related journal entries are only posted when performing bank reconciliation."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_send__is_log
+msgid "Whether the message is an internal note (comment mode only)"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_journal__show_on_dashboard
msgid "Whether this journal should be displayed on the dashboard or not"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_setup_bank_manual_config__new_journal_name
+msgid "Will be used to name the Journal related to this bank account"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_common_journal_report__amount_currency
#: model:ir.model.fields,field_description:account.field_account_print_journal__amount_currency
#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger__amount_currency
@@ -9541,41 +11139,21 @@ msgid "Wizard for Tax Adjustments"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1094
-#: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full
+#: code:addons/account/models/account_move.py:979
+#: code:addons/account/models/account_move.py:999
#, python-format
msgid "Write-Off"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff__journal_id
-msgid "Write-Off Journal"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.view,arch_db:account.account_move_line_reconcile_writeoff
-msgid "Write-Off Move"
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff__writeoff_acc_id
-msgid "Write-Off account"
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile__writeoff
-msgid "Write-Off amount"
-msgstr ""
-
-#. module: account
#: sql_constraint:account.move.line:0
msgid "Wrong credit or debit value in accounting entry !"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1051
+#: code:addons/account/models/account_move.py:907
#, python-format
-msgid "You are trying to reconcile some entries that are already reconciled!"
+msgid "You are trying to reconcile some entries that are already reconciled."
msgstr ""
#. module: account
@@ -9584,223 +11162,241 @@ msgid "You can check this box to mark this journal item as a litigation with the
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree2
-msgid "You can control the invoice from your vendor based on\n"
-" what you purchased or received."
-msgstr ""
-
-#. module: account
-#: model:ir.ui.view,arch_db:account.setup_bank_journal_form
-msgid "You can define additional accounts here"
-msgstr ""
-
-#. module: account
-#: code:addons/account/models/product.py:51
+#: code:addons/account/models/account_invoice.py:1926
#, python-format
-msgid "You can not change the unit of measure of a product that has been already used in an account journal item. If you need to change the unit of measure, you may deactivate this product."
+msgid "You can not delete payment terms as other records still reference it. However, you can archive it."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:463
+#: code:addons/account/models/account_fiscal_year.py:55
#, python-format
-msgid "You can not delete a payment that is already posted"
+msgid "You can not have an overlap between two fiscal years, please correct the start and/or end dates of your fiscal years."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1636
+#: code:addons/account/models/account_invoice.py:1770
#, python-format
msgid "You can only delete an invoice line if the invoice is in draft state."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:142
+#: code:addons/account/models/account_payment.py:87
#, python-format
msgid "You can only register payments for open invoices"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_res_company__invoice_reference_type
+msgid "You can set here the default communication that will appear on customer invoices, once validated, to help the customer to refer to that particular invoice when making the payment."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_financial_report__style_overwrite
msgid "You can set up here the format you want this record to be displayed. If you leave the automatic formatting, it will be computed based on the financial reports hierarchy (auto-computed field 'level')."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:214
+#: code:addons/account/models/account_move.py:370
#, python-format
msgid "You cannot add/modify entries prior to and inclusive of the lock date %s"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:216
+#: code:addons/account/models/account_move.py:372
#, python-format
msgid "You cannot add/modify entries prior to and inclusive of the lock date %s. Check the company settings or ask someone with the 'Adviser' role"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1204
+#: code:addons/account/models/company.py:270
#, python-format
-msgid "You cannot cancel an invoice which is partially paid. You need to unreconcile related payment entries first."
+msgid "You cannot change the currency of the company since some journal items already exist"
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:137
+#: code:addons/account/models/account.py:308
#, python-format
-msgid "You cannot change the currency of the company since some journal items already exist"
+msgid "You cannot change the owner company of an account that already contains journal items."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:271
+#: code:addons/account/models/account_move.py:688
#, python-format
-msgid "You cannot change the owner company of an account that already contains journal items."
+msgid "You cannot create journal items with a secondary currency without filling both 'currency' and 'amount currency' fields."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:525
+#: code:addons/account/models/company.py:174
#, python-format
-msgid "You cannot create journal items with a secondary currency without filling both 'currency' and 'amount currency' field."
+msgid "You cannot define stricter conditions on advisors than on users. Please make sure that the lock date on advisor is set before the lock date for users."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:620
+#: code:addons/account/models/account_payment.py:584
#, python-format
-msgid "You cannot delete an invoice after it has been validated (and received a number). You can set it back to \"Draft\" state and modify its content, then re-confirm it."
+msgid "You cannot delete a payment that is already posted."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:618
+#: code:addons/account/models/account_invoice.py:727
#, python-format
-msgid "You cannot delete an invoice which is not draft or cancelled. You should create a credit note instead."
+msgid "You cannot delete an invoice after it has been validated (and received a number). You can set it back to \"Draft\" state and modify its content, then re-confirm it."
msgstr ""
#. module: account
-#: code:addons/account/models/res_config_settings.py:115
+#: code:addons/account/models/account_invoice.py:725
#, python-format
-msgid "You cannot disable this setting because some of your taxes are cash basis. Modify your taxes first before disabling this setting."
+msgid "You cannot delete an invoice which is not draft or cancelled. You should create a credit note instead."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:282
+#: code:addons/account/models/res_config_settings.py:145
#, python-format
-msgid "You cannot do that on an account that contains journal items."
+msgid "You cannot disable this setting because some of your taxes are cash basis. Modify your taxes first before disabling this setting."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1398
+#: code:addons/account/models/account_move.py:1146
#, python-format
msgid "You cannot do this modification on a posted journal entry, you can just change some non legal fields. You must revert the journal entry to cancel it.\n"
"%s."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1400
+#: code:addons/account/models/account_move.py:1148
#, python-format
msgid "You cannot do this modification on a reconciled entry. You can just change some non legal fields or you must unreconcile first.\n"
"%s."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:55
+#: code:addons/account/models/account.py:64
#, python-format
msgid "You cannot have a receivable/payable account that is not reconcilable. (account code: %s)"
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:63
+#: code:addons/account/models/account.py:71
#, python-format
msgid "You cannot have more than one account with \"Current Year Earnings\" as type. (accounts: %s)"
msgstr ""
#. module: account
+#: code:addons/account/models/company.py:163
+#, python-format
+msgid "You cannot lock a period that is not finished yet. Please make sure that the lock date for advisors is not set after the last day of the previous month."
+msgstr ""
+
+#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:718
+#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:748
#, python-format
msgid "You cannot mix items from receivable and payable accounts."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:175
+#: code:addons/account/models/account_move.py:124
+#, python-format
+msgid "You cannot modify a journal entry linked to a posted payment."
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_move.py:331
#, python-format
msgid "You cannot modify a posted entry of this journal.\n"
"First you should set the journal to allow cancelling entries."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:796
+#: code:addons/account/models/account_invoice.py:910
#, python-format
msgid "You cannot pay an invoice which is partially paid. You need to reconcile payment entries first."
msgstr ""
#. module: account
+#: code:addons/account/models/account.py:319
+#, python-format
+msgid "You cannot perform this action on an account that contains journal items."
+msgstr ""
+
+#. module: account
#: code:addons/account/wizard/pos_box.py:36
#, python-format
msgid "You cannot put/take money in/out for a bank statement which is closed."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:552
+#: code:addons/account/models/account.py:635
#, python-format
msgid "You cannot remove the bank account from the journal once set."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:287
+#: code:addons/account/models/account.py:324
#, python-format
msgid "You cannot remove/deactivate an account which is set on a customer or vendor."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:255
+#: code:addons/account/models/account.py:292
#, python-format
-msgid "You cannot switch an account to not allow the reconciliationif some partial reconciliations are still pending."
+msgid "You cannot switch an account to prevent the reconciliation if some partial reconciliations are still pending."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1364
+#: code:addons/account/models/account_move.py:1112
#, python-format
-msgid "You cannot use deprecated account."
+msgid "You cannot use a deprecated account."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1284
+#: code:addons/account/models/account_move.py:1069
#, python-format
msgid "You cannot use this general account in this journal, check the tab 'Entry Controls' on the related journal."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:74
-#: code:addons/account/models/account_invoice.py:784
+#: code:addons/account/models/account_invoice.py:76
+#: code:addons/account/models/account_invoice.py:893
#, python-format
msgid "You cannot validate an invoice with a negative total amount. You should create a credit note instead."
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:158
-#, python-format
-msgid "You did not configure any reconcile model yet, you can do it"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.invoice_form
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
msgid "You have"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:500
+#: code:addons/account/models/account_payment.py:623
#, python-format
msgid "You have to define a sequence for %s in your company."
msgstr ""
#. module: account
+#: code:addons/account/wizard/pos_box.py:49
+#: code:addons/account/wizard/pos_box.py:67
+#, python-format
+msgid "You have to define an 'Internal Transfer Account' in your cash register's journal."
+msgstr ""
+
+#. module: account
#: code:addons/account/wizard/account_report_general_ledger.py:21
#, python-format
-msgid "You must define a Start Date"
+msgid "You must define a start Date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account.py:142
+#, python-format
+msgid "You must first define an opening move."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1556
+#: code:addons/account/models/account_invoice.py:1685
#, python-format
-msgid "You must first select a partner!"
+msgid "You must first select a partner."
msgstr ""
#. module: account
@@ -9817,37 +11413,30 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:53
+#: code:addons/account/static/src/xml/account_reconciliation.xml:56
#, python-format
msgid "You reconciled"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1958
+#: code:addons/account/models/account_move.py:1620
#, python-format
msgid "You should configure the 'Exchange Rate Journal' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1960
+#: code:addons/account/models/account_move.py:1622
#, python-format
msgid "You should configure the 'Gain Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1962
+#: code:addons/account/models/account_move.py:1624
#, python-format
msgid "You should configure the 'Loss Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."
msgstr ""
#. module: account
-#: code:addons/account/wizard/pos_box.py:49
-#: code:addons/account/wizard/pos_box.py:67
-#, python-format
-msgid "You should have defined an 'Internal Transfer Account' in your cash register's journal!"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.view_account_invoice_refund
msgid "You will be able to edit and validate this\n"
" credit note directly or keep it draft,\n"
@@ -9873,11 +11462,6 @@ msgid "Zip Range To"
msgstr ""
#. module: account
-#: model:ir.model,name:account.model_account_bank_accounts_wizard
-msgid "account.bank.accounts.wizard"
-msgstr ""
-
-#. module: account
#: model:ir.model,name:account.model_account_financial_year_op
msgid "account.financial.year.op"
msgstr ""
@@ -9888,8 +11472,8 @@ msgid "account.group"
msgstr ""
#. module: account
-#: model:ir.model,name:account.model_account_opening
-msgid "account.opening"
+#: model:ir.model,name:account.model_account_invoice_send
+msgid "account.invoice.send"
msgstr ""
#. module: account
@@ -9898,11 +11482,31 @@ msgid "account.reconcile.model.template"
msgstr ""
#. module: account
+#: model:ir.model,name:account.model_account_reconciliation_widget
+msgid "account.reconciliation.widget"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_setup_bank_manual_config
+msgid "account.setup.bank.manual.config"
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_tax_group
msgid "account.tax.group"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.account_dashboard_onboarding_panel
+msgid "action_close_account_dashboard_onboarding"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.account_invoice_onboarding_panel
+msgid "action_close_account_invoice_onboarding"
+msgstr ""
+
+#. module: account
#. openerp-web
#: code:addons/account/static/src/xml/account_payment.xml:17
#, python-format
@@ -9941,6 +11545,21 @@ msgid "day(s) after the invoice date"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.setup_bank_account_wizard
+msgid "e.g BE15001559627230"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.setup_bank_account_wizard
+msgid "e.g Bank of America"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.setup_bank_account_wizard
+msgid "e.g Checking account"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
msgid "e.g. Bank Fees"
msgstr ""
@@ -9957,31 +11576,29 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:158
+#: code:addons/account/static/src/xml/account_reconciliation.xml:45
#, python-format
-msgid "here"
+msgid "o_manual_statement"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:41
-#, python-format
-msgid "o_manual_statement"
+#: model:ir.ui.view,arch_db:account.account_invoice_onboarding_panel
+msgid "o_onboarding_blue"
msgstr ""
#. module: account
-#: selection:account.payment.term.line,option:0
-msgid "of the current month"
+#: model:ir.ui.view,arch_db:account.account_dashboard_onboarding_panel
+msgid "o_onboarding_orange"
msgstr ""
#. module: account
#: selection:account.payment.term.line,option:0
-msgid "of the following month"
+msgid "of the current month"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.view_payment_term_line_form
-msgid "of the month"
+#: selection:account.payment.term.line,option:0
+msgid "of the following month"
msgstr ""
#. module: account
@@ -9995,6 +11612,20 @@ msgid "outstanding payments"
msgstr ""
#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:162
+#, python-format
+msgid "reconciliation models"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:151
+#, python-format
+msgid "remaining)"
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_report_account_report_agedpartnerbalance
msgid "report.account.report_agedpartnerbalance"
msgstr ""
@@ -10010,6 +11641,11 @@ msgid "report.account.report_generalledger"
msgstr ""
#. module: account
+#: model:ir.model,name:account.model_report_account_report_invoice_with_payments
+msgid "report.account.report_invoice_with_payments"
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_report_account_report_journal
msgid "report.account.report_journal"
msgstr ""
@@ -10035,13 +11671,19 @@ msgid "report.account.report_trialbalance"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.account_dashboard_onboarding_panel
+#: model:ir.ui.view,arch_db:account.account_invoice_onboarding_panel
+msgid "res.company"
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_res_config_settings
msgid "res.config.settings"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:53
+#: code:addons/account/static/src/xml/account_reconciliation.xml:56
#, python-format
msgid "seconds per transaction."
msgstr ""
@@ -10053,14 +11695,14 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:53
+#: code:addons/account/static/src/xml/account_reconciliation.xml:56
#, python-format
msgid "transactions in"
msgstr ""
#. module: account
-#: model:ir.model,name:account.model_wizard_multi_charts_accounts
-msgid "wizard.multi.charts.accounts"
+#: model:ir.model.fields,help:account.field_account_invoice__amount_by_group
+msgid "type: [(name, amount, base, formated amount, formated base)]"
msgstr ""
#. module: account
diff --git a/addons/account_asset/i18n/account_asset.pot b/addons/account_asset/i18n/account_asset.pot
index 775df8cdf79..9dc93caab2b 100644
--- a/addons/account_asset/i18n/account_asset.pot
+++ b/addons/account_asset/i18n/account_asset.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:12+0000\n"
-"PO-Revision-Date: 2018-08-02 09:12+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:426
+#: code:addons/account_asset/models/account_asset.py:429
#, python-format
msgid " (copy)"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:561
+#: code:addons/account_asset/models/account_asset.py:571
#, python-format
msgid " (grouped)"
msgstr ""
@@ -88,7 +88,7 @@ msgid "Additional Options"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:627
+#: code:addons/account_asset/models/account_asset.py:639
#, python-format
msgid "Amount"
msgstr ""
@@ -104,11 +104,18 @@ msgid "Amount of Installment Lines"
msgstr ""
#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__account_analytic_id
#: model:ir.model.fields,field_description:account_asset.field_account_asset_category__account_analytic_id
msgid "Analytic Account"
msgstr ""
#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__analytic_tag_ids
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_category__analytic_tag_ids
+msgid "Analytic Tag"
+msgstr ""
+
+#. module: account_asset
#: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line__asset_id
#: model:ir.model.fields,field_description:account_asset.field_asset_asset_report__asset_id
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form
@@ -182,7 +189,7 @@ msgid "Asset category"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:297
+#: code:addons/account_asset/models/account_asset.py:296
#, python-format
msgid "Asset created"
msgstr ""
@@ -193,7 +200,7 @@ msgid "Asset depreciation line"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:345
+#: code:addons/account_asset/models/account_asset.py:344
#, python-format
msgid "Asset sold or disposed. Accounting entry awaiting for validation."
msgstr ""
@@ -386,7 +393,7 @@ msgid "Cumulative Depreciation"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:627
+#: code:addons/account_asset/models/account_asset.py:639
#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__currency_id
#, python-format
msgid "Currency"
@@ -528,7 +535,7 @@ msgid "Depreciation board modified"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:630
+#: code:addons/account_asset/models/account_asset.py:642
#, python-format
msgid "Depreciation line posted."
msgstr ""
@@ -544,19 +551,19 @@ msgid "Display Name"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:300
+#: code:addons/account_asset/models/account_asset.py:299
#, python-format
msgid "Disposal Move"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:303
+#: code:addons/account_asset/models/account_asset.py:302
#, python-format
msgid "Disposal Moves"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:609
+#: code:addons/account_asset/models/account_asset.py:621
#, python-format
msgid "Document closed."
msgstr ""
@@ -726,7 +733,7 @@ msgid "Journal"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:460
+#: code:addons/account_asset/models/account_asset.py:463
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
#, python-format
msgid "Journal Entries"
@@ -883,7 +890,7 @@ msgid "One Entry Every"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:629
+#: code:addons/account_asset/models/account_asset.py:641
#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__partner_id
#: model:ir.model.fields,field_description:account_asset.field_asset_asset_report__partner_id
#, python-format
@@ -938,7 +945,7 @@ msgid "Prorata Temporis"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:391
+#: code:addons/account_asset/models/account_asset.py:392
#, python-format
msgid "Prorata temporis can be applied only for the \"number of depreciations\" time method."
msgstr ""
@@ -1058,7 +1065,7 @@ msgid "The number of depreciations needed to depreciate your asset"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_invoice.py:63
+#: code:addons/account_asset/models/account_invoice.py:62
#, python-format
msgid "The number of depreciations or the period length of your asset category cannot be 0."
msgstr ""
@@ -1079,7 +1086,7 @@ msgid "The way to compute the date of the first depreciation.\n"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:503
+#: code:addons/account_asset/models/account_asset.py:506
#, python-format
msgid "This depreciation is already linked to a journal entry. Please post or delete it."
msgstr ""
@@ -1161,25 +1168,25 @@ msgid "Year"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:134
+#: code:addons/account_asset/models/account_asset.py:136
#, python-format
msgid "You cannot delete a document that contains posted entries."
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:131
+#: code:addons/account_asset/models/account_asset.py:133
#, python-format
msgid "You cannot delete a document that is in %s state."
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:638
+#: code:addons/account_asset/models/account_asset.py:650
#, python-format
msgid "You cannot delete posted depreciation lines."
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:640
+#: code:addons/account_asset/models/account_asset.py:652
#, python-format
msgid "You cannot delete posted installment lines."
msgstr ""
diff --git a/addons/account_bank_statement_import/i18n/account_bank_statement_import.pot b/addons/account_bank_statement_import/i18n/account_bank_statement_import.pot
index b2efc21a481..605ca45d246 100644
--- a/addons/account_bank_statement_import/i18n/account_bank_statement_import.pot
+++ b/addons/account_bank_statement_import/i18n/account_bank_statement_import.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:12+0000\n"
-"PO-Revision-Date: 2018-08-02 09:12+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -133,11 +133,6 @@ msgid "Bank Statement Line"
msgstr ""
#. module: account_bank_statement_import
-#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__account_setup_bank_data_done
-msgid "Bank setup marked as done"
-msgstr ""
-
-#. module: account_bank_statement_import
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__belongs_to_company
msgid "Belong to the user's current company"
msgstr ""
@@ -430,6 +425,11 @@ msgid "OK"
msgstr ""
#. module: account_bank_statement_import
+#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__post_at_bank_rec
+msgid "Post At Bank Reconciliation"
+msgstr ""
+
+#. module: account_bank_statement_import
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__profit_account_id
msgid "Profit Account"
msgstr ""
@@ -468,11 +468,6 @@ msgid "Show journal on dashboard"
msgstr ""
#. module: account_bank_statement_import
-#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation__account_setup_bank_data_done
-msgid "Technical field used in the special view for the setup bar step."
-msgstr ""
-
-#. module: account_bank_statement_import
#: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_journal_creation_view
msgid "The account of the statement you are importing is not yet recorded in Odoo. In order to proceed with the import, you need to create a bank journal for this account."
msgstr ""
@@ -552,6 +547,11 @@ msgid "Used to register a profit when the ending balance of a cash register diff
msgstr ""
#. module: account_bank_statement_import
+#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation__post_at_bank_rec
+msgid "Whether or not the payments made in this journal should be generated in draft state, so that the related journal entries are only posted when performing bank reconciliation."
+msgstr ""
+
+#. module: account_bank_statement_import
#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation__show_on_dashboard
msgid "Whether this journal should be displayed on the dashboard or not"
msgstr ""
diff --git a/addons/account_check_printing/i18n/account_check_printing.pot b/addons/account_check_printing/i18n/account_check_printing.pot
index 6cb1574f82b..58872ec2502 100644
--- a/addons/account_check_printing/i18n/account_check_printing.pot
+++ b/addons/account_check_printing/i18n/account_check_printing.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:10+0000\n"
-"PO-Revision-Date: 2018-03-22 14:10+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid " : Check Number Sequence"
msgstr ""
#. module: account_check_printing
-#: code:addons/account_check_printing/models/account_payment.py:71
+#: code:addons/account_check_printing/models/account_payment.py:63
#, python-format
msgid "A check memo cannot exceed 60 characters."
msgstr ""
@@ -161,7 +161,7 @@ msgid "ID"
msgstr ""
#. module: account_check_printing
-#: code:addons/account_check_printing/models/account_payment.py:91
+#: code:addons/account_check_printing/models/account_payment.py:84
#, python-format
msgid "In order to print multiple checks at once, they must belong to the same bank journal."
msgstr ""
@@ -226,7 +226,7 @@ msgid "Payments"
msgstr ""
#. module: account_check_printing
-#: code:addons/account_check_printing/models/account_payment.py:88
+#: code:addons/account_check_printing/models/account_payment.py:81
#, python-format
msgid "Payments to print as a checks must have 'Check' selected as payment method and not have already been reconciled"
msgstr ""
@@ -258,7 +258,7 @@ msgid "Print Date Label"
msgstr ""
#. module: account_check_printing
-#: code:addons/account_check_printing/models/account_payment.py:101
+#: code:addons/account_check_printing/models/account_payment.py:94
#: model:ir.model,name:account_check_printing.model_print_prenumbered_checks
#: model:ir.ui.view,arch_db:account_check_printing.print_pre_numbered_checks_view
#, python-format
@@ -293,6 +293,11 @@ msgid "Technical feature used to know whether check printing was enabled as paym
msgstr ""
#. module: account_check_printing
+#: model:ir.model,name:account_check_printing.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr ""
+
+#. module: account_check_printing
#: model:ir.model.fields,help:account_check_printing.field_res_config_settings__country_code
msgid "The ISO country code in two chars. \n"
"You can use this field for quick search."
@@ -332,7 +337,7 @@ msgid "Unmark Sent"
msgstr ""
#. module: account_check_printing
-#: code:addons/account_check_printing/models/account_payment.py:123
+#: code:addons/account_check_printing/models/account_payment.py:116
#, python-format
msgid "You have to choose a check layout. For this, go in Apps, search for 'Checks layout' and install one."
msgstr ""
@@ -357,8 +362,3 @@ msgstr ""
msgid "res.config.settings"
msgstr ""
-#. module: account_check_printing
-#: model:ir.model,name:account_check_printing.model_wizard_multi_charts_accounts
-msgid "wizard.multi.charts.accounts"
-msgstr ""
-
diff --git a/addons/account_payment/i18n/account_payment.pot b/addons/account_payment/i18n/account_payment.pot
index bee4691ab12..05c8ad410bb 100644
--- a/addons/account_payment/i18n/account_payment.pot
+++ b/addons/account_payment/i18n/account_payment.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:12+0000\n"
-"PO-Revision-Date: 2018-08-02 09:12+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,23 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_payment
+msgid "&amp;times;"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_success
+msgid "<b>Communication: </b>"
+msgstr ""
+
+#. module: account_payment
#: model:ir.ui.view,arch_db:account_payment.portal_invoice_page_inherit_payment
msgid "<i class=\"fa fa-arrow-circle-right\"/> Pay Now"
msgstr ""
#. module: account_payment
#: model:ir.ui.view,arch_db:account_payment.portal_my_invoices_payment
-msgid "<i class=\"fa fa-arrow-circle-right\"/><span class=\"hidden-xs\"> Pay Now</span>"
+msgid "<i class=\"fa fa-arrow-circle-right\"/><span class=\"d-none d-md-inline\"> Pay Now</span>"
msgstr ""
#. module: account_payment
@@ -41,18 +51,33 @@ msgid "<i class=\"fa fa-info\"/> You have credits card registered, you can log-i
msgstr ""
#. module: account_payment
-#: model:ir.ui.view,arch_db:account_payment.portal_invoice_report
-msgid "<span class=\"label label-info orders_label_text_align\"><i class=\"fa fa-fw fa-clock-o\"/> Waiting</span>"
+#: model:ir.ui.view,arch_db:account_payment.portal_my_invoices_payment
+msgid "<span class=\"badge badge-info\"><i class=\"fa fa-fw fa-clock-o\"/><span class=\"d-none d-md-inline\"> Waiting for Payment</span></span>"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_my_invoices_payment
+msgid "<span class=\"badge badge-secondary\"><i class=\"fa fa-fw fa-check\"/><span class=\"d-none d-md-inline\"> Paid</span></span>"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_my_invoices_payment
+msgid "<span class=\"badge badge-secondary\"><i class=\"fa fa-fw fa-remove\"/><span class=\"d-none d-md-inline\"> Cancelled</span></span>"
msgstr ""
#. module: account_payment
-#: model:ir.ui.view,arch_db:account_payment.portal_invoice_report
-msgid "<span class=\"label label-success orders_label_text_align\"><i class=\"fa fa-fw fa-check\"/> Done</span>"
+#: model:ir.ui.view,arch_db:account_payment.portal_my_invoices_payment
+msgid "<span class=\"badge badge-success\"><i class=\"fa fa-fw fa-check\"/><span class=\"d-none d-md-inline\"> Authorized</span></span>"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_my_invoices_payment
+msgid "<span class=\"badge badge-warning\"><span class=\"d-none d-md-inline\"> Pending</span></span>"
msgstr ""
#. module: account_payment
-#: model:ir.ui.view,arch_db:account_payment.portal_invoice_report
-msgid "<strong>Transactions</strong>"
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_success
+msgid "Done, your online payment has been successfully processed. Thank you for your order."
msgstr ""
#. module: account_payment
@@ -69,13 +94,17 @@ msgstr ""
#. module: account_payment
#: code:addons/account_payment/models/payment.py:22
-#: model:ir.ui.view,arch_db:account_payment.portal_my_invoices_payment
#, python-format
msgid "Pay Now"
msgstr ""
#. module: account_payment
-#: model:ir.ui.view,arch_db:account_payment.portal_invoice_page_inherit_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_my_invoices_payment
+msgid "Pay now"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_payment
msgid "Pay with"
msgstr ""
diff --git a/addons/account_voucher/i18n/account_voucher.pot b/addons/account_voucher/i18n/account_voucher.pot
index 58499060c29..651dc7ec3cf 100644
--- a/addons/account_voucher/i18n/account_voucher.pot
+++ b/addons/account_voucher/i18n/account_voucher.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:11+0000\n"
-"PO-Revision-Date: 2018-08-02 09:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -438,12 +438,6 @@ msgid "Purchase Receipt"
msgstr ""
#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
-msgid "Purchase Receipts"
-msgstr ""
-
-#. module: account_voucher
#: model:ir.ui.view,arch_db:account_voucher.view_purchase_receipt_form
msgid "Purchase Voucher"
msgstr ""
@@ -454,6 +448,14 @@ msgid "Quantity"
msgstr ""
#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Receipts"
+msgstr ""
+
+#. module: account_voucher
#: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
msgid "Register a new purchase receipt"
msgstr ""
@@ -474,12 +476,6 @@ msgid "Sales Receipt"
msgstr ""
#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipts"
-msgstr ""
-
-#. module: account_voucher
#: model:ir.ui.view,arch_db:account_voucher.view_voucher_filter
#: model:ir.ui.view,arch_db:account_voucher.view_voucher_filter_sale
#: model:ir.ui.view,arch_db:account_voucher.view_voucher_filter_vendor
@@ -659,7 +655,7 @@ msgid "When the sale receipt is confirmed, you can record the customer\n"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/models/account_voucher.py:456
+#: code:addons/account_voucher/models/account_voucher.py:457
#, python-format
msgid "You must first select a partner."
msgstr ""
diff --git a/addons/analytic/i18n/analytic.pot b/addons/analytic/i18n/analytic.pot
index 6e62c1c0357..4b775476aa0 100644
--- a/addons/analytic/i18n/analytic.pot
+++ b/addons/analytic/i18n/analytic.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:12+0000\n"
-"PO-Revision-Date: 2018-08-02 09:12+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -92,7 +92,6 @@ msgid "Analytic Distribution"
msgstr ""
#. module: analytic
-#: model:ir.actions.act_window,name:analytic.account_analytic_line_action_entries
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_line_graph
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_line_pivot
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_line_tree
@@ -105,6 +104,11 @@ msgid "Analytic Entry"
msgstr ""
#. module: analytic
+#: model:ir.actions.act_window,name:analytic.account_analytic_line_action_entries
+msgid "Analytic Items"
+msgstr ""
+
+#. module: analytic
#: model:ir.model,name:analytic.model_account_analytic_line
msgid "Analytic Line"
msgstr ""
@@ -478,7 +482,7 @@ msgid "The percentage of an analytic distribution should be between 0 and 100."
msgstr ""
#. module: analytic
-#: code:addons/analytic/models/analytic_account.py:193
+#: code:addons/analytic/models/analytic_account.py:194
#, python-format
msgid "The selected account belongs to another company that the one you're trying to create an analytic item for"
msgstr ""
@@ -494,6 +498,11 @@ msgid "Total"
msgstr ""
#. module: analytic
+#: model:ir.model.fields,field_description:analytic.field_account_analytic_line__product_uom_id
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account__message_unread
msgid "Unread Messages"
msgstr ""
diff --git a/addons/auth_ldap/i18n/auth_ldap.pot b/addons/auth_ldap/i18n/auth_ldap.pot
index 6ce53f198d5..def9f149e53 100644
--- a/addons/auth_ldap/i18n/auth_ldap.pot
+++ b/addons/auth_ldap/i18n/auth_ldap.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:10+0000\n"
-"PO-Revision-Date: 2018-03-22 14:10+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -123,6 +123,12 @@ msgid "Login Information"
msgstr ""
#. module: auth_ldap
+#: code:addons/auth_ldap/models/res_company_ldap.py:201
+#, python-format
+msgid "No local user found for LDAP login and not configured to create one"
+msgstr ""
+
+#. module: auth_ldap
#: model:ir.ui.view,arch_db:auth_ldap.view_ldap_installer_form
msgid "Process Parameter"
msgstr ""
diff --git a/addons/auth_signup/i18n/auth_signup.pot b/addons/auth_signup/i18n/auth_signup.pot
index 96996c4290c..323d8cdc313 100644
--- a/addons/auth_signup/i18n/auth_signup.pot
+++ b/addons/auth_signup/i18n/auth_signup.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:12+0000\n"
-"PO-Revision-Date: 2018-08-02 09:12+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,74 +16,14 @@ msgstr ""
"Plural-Forms: \n"
#. module: auth_signup
-#: model:mail.template,body_html:auth_signup.reset_password_email
-msgid "\n"
-"<div style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\">\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
-" <tbody><tr>\n"
-" <td valign=\"center\" width=\"200\" style=\"padding:10px 10px 10px 5px;font-size: 12px\">\n"
-" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\">\n"
-" </td>\n"
-" </tr></tbody>\n"
-" </table>\n"
-"</div>\n"
-"<div style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\">\n"
-" <p>Dear ${object.name},</p>\n"
-" <p>A password reset was requested for the Odoo account linked to this email.</p>\n"
-" <p>You may change your password by following this link which will remain valid during 24 hours:</p>\n"
-" <div style=\"text-align: center; margin-top: 16px;\">\n"
-" <a href=\"${object.signup_url}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius:3px\">Change password</a>\n"
-" </div>\n"
-" <p>If you do not expect this, you can safely ignore this email.</p>\n"
-" <p>Best regards,</p>\n"
-"</div>\n"
-"<div style=\"padding:0px;width:600px;margin:auto; margin-top: 10px; background: #fff repeat top /100%;color:#777777\">\n"
-" ${user.signature | safe}\n"
-" <p style=\"font-size: 11px; margin-top: 10px;\">\n"
-" <strong>Sent by ${user.company_id.name} using <a href=\"www.odoo.com\" style=\"text-decoration:none; color: #875A7B;\">Odoo</a></strong>\n"
-" </p>\n"
-"</div>"
-msgstr ""
-
-#. module: auth_signup
#: model:mail.template,subject:auth_signup.set_password_email
msgid "${object.create_uid.name} from ${object.company_id.name} invites you to connect to Odoo"
msgstr ""
#. module: auth_signup
-#: model:mail.template,body_html:auth_signup.mail_template_user_signup_account_created
-msgid "<div style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\">\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
-" <tbody><tr>\n"
-" <td valign=\"center\" width=\"200\" style=\"padding:10px 10px 10px 5px;font-size: 12px\">\n"
-" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
-" </td>\n"
-" </tr></tbody>\n"
-" </table>\n"
-"</div>\n"
-"<div style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\">\n"
-" <p>Dear ${object.name},</p>\n"
-" <p>\n"
-" Your account has been successfully created!\n"
-" </p>\n"
-" <p>\n"
-" Your login: ${object.email}\n"
-" <br/>\n"
-" </p>\n"
-" <p>\n"
-" To gain access to your account, you can use the following link:\n"
-" </p>\n"
-" <div style=\"text-align: center; margin-top: 16px;\">\n"
-" <a href=\"/web/login?${ctx['auth_login']}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius:3px\">Go to My Account</a>\n"
-" </div>\n"
-" <p>Best regards,</p>\n"
-"</div>\n"
-"<div style=\"padding:0px;width:600px;margin:auto; margin-top: 10px; background: #fff repeat top /100%;color:#777777\">\n"
-" ${user.signature | safe}\n"
-" <p style=\"font-size: 11px; margin-top: 10px;\">\n"
-" <strong>Sent by ${user.company_id.name} using <a href=\"www.odoo.com\" style=\"text-decoration:none; color: #875A7B;\">Odoo</a></strong>\n"
-" </p>\n"
-"</div>"
+#: code:addons/auth_signup/models/res_users.py:126
+#, python-format
+msgid "%s connected"
msgstr ""
#. module: auth_signup
@@ -98,88 +38,256 @@ msgstr ""
#. module: auth_signup
#: model:mail.template,body_html:auth_signup.set_password_email
-msgid "<table border=\"0\" cellpadding=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\">\n"
+msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Welcome to Odoo</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">\n"
+" ${object.name}\n"
+" </span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${object.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${object.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div>\n"
+" Dear ${object.name},<br/><br/>\n"
+" You have been invited by ${object.create_uid.name} of ${object.company_id.name} to connect on Odoo.\n"
+" <div style=\"margin: 16px 0px 16px 0px;\">\n"
+" <a href=\"${object.signup_url}\" style=\"background-color: #875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:13px;\">\n"
+" Accept invitation\n"
+" </a>\n"
+" </div>\n"
+" % set website_url = object.env['ir.config_parameter'].sudo().get_param('web.base.url')\n"
+" Your Odoo domain is: <b><a href=\"${website_url}\">${website_url}</a></b><br/>\n"
+" Your sign in email is: <b><a href=\"/web/login?login=${object.email}\" target=\"_blank\">${object.email}</a></b><br/><br/>\n"
+" Never heard of Odoo? It’s a all-in-one business software loved by 3+ million users. It will considerably improve your experience at work and increase your productivity.\n"
+" <br/><br/>\n"
+" Have a look at the <a href=\"https://www.odoo.com/page/tour?utm_source=db&amp;utm_medium=auth\" style=\"color: #875A7B;\">Odoo Tour</a> to discover the tool.\n"
+" <br/><br/>\n"
+" Enjoy Odoo!<br/>\n"
+" --<br/>The ${object.company_id.name} Team\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${object.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" ${object.company_id.phone}\n"
+" % if object.company_id.email\n"
+" | <a href=\"'mailto:%s' % ${object.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${object.company_id.email}</a>\n"
+" % endif\n"
+" % if object.company_id.website\n"
+" | <a href=\"'%s' % ${object.company_id.website}\" style=\"text-decoration:none; color: #454748;\">\n"
+" ${object.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=auth\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>"
+msgstr ""
+
+#. module: auth_signup
+#: model:mail.template,body_html:auth_signup.reset_password_email
+msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Account</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">\n"
+" ${object.name}\n"
+" </span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${object.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${object.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div>\n"
+" Dear ${object.name},<br/><br/>\n"
+" A password reset was requested for the Odoo account linked to this email.\n"
+" You may change your password by following this link which will remain valid during 24 hours:<br/>\n"
+" <div style=\"margin: 16px 0px 16px 0px;\">\n"
+" <a href=\"${object.signup_url}\" style=\"background-color: #875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:13px;\">\n"
+" Change password\n"
+" </a>\n"
+" </div>\n"
+" If you do not expect this, you can safely ignore this email.<br/><br/>\n"
+" Thanks,<br/>\n"
+" ${user.signature | safe}<br/>\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
" <tr>\n"
-" <td align=\"center\">\n"
-" <table border=\"0\" width=\"590\" cellpadding=\"0\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
-" <tbody>\n"
-" <tr>\n"
-" <td align=\"center\" style=\"min-width: 590px;\">\n"
-" <table width=\"590\" border=\"0\" cellpadding=\"0\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
-" <tr>\n"
-" <td valign=\"middle\">\n"
-" <span style=\"font-size: 20px;\">\n"
-" <strong>Welcome to Odoo!</strong>\n"
-" </span>\n"
-" </td>\n"
-" <td valign=\"middle\" align=\"right\">\n"
-" <img src=\"/web/static/src/img/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\"/>\n"
-" </td>\n"
-" </tr>\n"
-" <tr>\n"
-" <td colspan=\"2\" style=\"text-align:center;\">\n"
-" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </td>\n"
-" </tr>\n"
-" <tr>\n"
-" <td align=\"center\" style=\"min-width: 590px;\">\n"
-" <table width=\"590\" border=\"0\" cellpadding=\"0\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
-" <tr>\n"
-" <td valign=\"top\" style=\"font-size: 14px;\">\n"
-" <div style=\"margin-top:15px; margin-bottom:15px;\">\n"
-" Dear ${object.name},\n"
-" </div>\n"
-" <div style=\"margin-top:15px; margin-bottom:15px;\">\n"
-" You have been invited by ${object.create_uid.name} of ${object.company_id.name} to connect on Odoo.\n"
-" </div>\n"
-" <div style=\"text-align: center; margin-top: 16px;margin-bottom: 16px;\">\n"
-" <a href=\"${object.signup_url}\" style=\"padding: 12px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; display: inline-block; text-align: center; cursor: pointer; background-image: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius:3px;\">Accept invitation</a>\n"
-" <br/>\n"
-" <div style=\"margin-top:15px; margin-bottom:15px; line-height:1;\">\n"
-" % set website_url = object.env['ir.config_parameter'].sudo().get_param('web.base.url')\n"
-" Your Odoo domain is: <br/>\n"
-" <b><a href=\"${website_url}\">${website_url}</a></b>\n"
-" </div>\n"
-" <div style=\"margin-top:15px; margin-bottom:15px;line-height:1;\">\n"
-" Your sign in email is: <br/>\n"
-" <b><a href=\"/web/login?login=${object.email}\" target=\"_blank\">${object.email}</a></b>\n"
-" </div>\n"
-" </div>\n"
-" <div style=\"margin-top:15px; margin-bottom:15px;\">\n"
-" Never heard of Odoo? It’s a all-in-one business software loved by 3+ million users. It will considerably improve your experience at work and increase your productivity.\n"
-" </div>\n"
-" <div style=\"margin-top:15px; margin-bottom:15px;\">\n"
-" Have a look at the <a href=\"https://www.odoo.com/page/tour\" style=\"color: #875A7B;\">Odoo Tour</a> to discover the tool.\n"
-" </div>\n"
-" <div style=\"margin-top:15px;\">\n"
-" Enjoy Odoo!\n"
-" </div>\n"
-" <div style=\"margin-top:15px; margin-bottom:15px;\">\n"
-" --<br/>The ${object.company_id.name} Team\n"
-" </div>\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </td>\n"
-" </tr>\n"
-" </tbody>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${object.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" ${object.company_id.phone}\n"
+" % if object.company_id.email\n"
+" | <a href=\"'mailto:%s' % ${object.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${object.company_id.email}</a>\n"
+" % endif\n"
+" % if object.company_id.website\n"
+" | <a href=\"'%s' % ${object.company_id.website}\" style=\"text-decoration:none; color: #454748;\">\n"
+" ${object.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
" </table>\n"
" </td>\n"
" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=auth\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: auth_signup
+#: model:mail.template,body_html:auth_signup.mail_template_user_signup_account_created
+msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
" <tr>\n"
" <td align=\"center\" style=\"min-width: 590px;\">\n"
-" <table width=\"590\" border=\"0\" cellpadding=\"0\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
-" <tr>\n"
-" <td style=\"text-align: center; font-size: 14px;\">\n"
-" Powered by <a target=\"_blank\" href=\"https://www.odoo.com\" style=\"color: #875A7B;\">Odoo</a>\n"
-" </td>\n"
-" </tr>\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Account</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">\n"
+" ${object.name}\n"
+" </span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${object.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${object.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
" </table>\n"
" </td>\n"
" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div>\n"
+" Dear ${object.name},<br/><br/>\n"
+" Your account has been successfully created!<br/>\n"
+" Your login is <strong>${object.email}</strong><br/>\n"
+" To gain access to your account, you can use the following link:\n"
+" <div style=\"margin: 16px 0px 16px 0px;\">\n"
+" <a href=\"/web/login?${ctx['auth_login']}\" style=\"background-color: #875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:13px;\">\n"
+" Go to My Account\n"
+" </a>\n"
+" </div>\n"
+" Thanks,<br/><br/>\n"
+" ${user.signature | safe}<br/>\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${object.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" ${object.company_id.phone}\n"
+" % if object.company_id.email\n"
+" | <a href=\"'mailto:%s' % ${object.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${object.company_id.email}</a>\n"
+" % endif\n"
+" % if object.company_id.website\n"
+" | <a href=\"'%s' % ${object.company_id.website}\" style=\"text-decoration:none; color: #454748;\">\n"
+" ${object.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=auth\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
"</table>"
msgstr ""
@@ -212,12 +320,17 @@ msgid "Back to Login"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/models/res_users.py:168
+#: code:addons/auth_signup/models/res_users.py:199
#, python-format
msgid "Cannot send email: user %s has no email address."
msgstr ""
#. module: auth_signup
+#: model:ir.ui.view,arch_db:auth_signup.res_users_view_form
+msgid "Close"
+msgstr ""
+
+#. module: auth_signup
#: model:ir.ui.view,arch_db:auth_signup.reset_password
msgid "Confirm"
msgstr ""
@@ -271,11 +384,6 @@ msgid "Enable password reset from Login page"
msgstr ""
#. module: auth_signup
-#: selection:res.config.settings,auth_signup_uninvited:0
-msgid "Free sign up (B2C)"
-msgstr ""
-
-#. module: auth_signup
#: model:ir.model,name:auth_signup.model_ir_http
msgid "HTTP routing"
msgstr ""
@@ -303,11 +411,6 @@ msgid "No login provided."
msgstr ""
#. module: auth_signup
-#: selection:res.config.settings,auth_signup_uninvited:0
-msgid "On invitation (B2B)"
-msgstr ""
-
-#. module: auth_signup
#: model:ir.ui.view,arch_db:auth_signup.fields
msgid "Password"
msgstr ""
@@ -334,7 +437,7 @@ msgid "Reset Password"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/models/res_users.py:141
+#: code:addons/auth_signup/models/res_users.py:163
#, python-format
msgid "Reset password: invalid username or email"
msgstr ""
@@ -385,37 +488,37 @@ msgid "Signup URL"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/models/res_users.py:110
+#: code:addons/auth_signup/models/res_users.py:117
#, python-format
msgid "Signup is not allowed for uninvited users"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/models/res_partner.py:147
+#: code:addons/auth_signup/models/res_partner.py:149
#, python-format
msgid "Signup token '%s' is no longer valid"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/models/res_partner.py:143
+#: code:addons/auth_signup/models/res_partner.py:145
#, python-format
msgid "Signup token '%s' is not valid"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/models/res_users.py:117
+#: code:addons/auth_signup/models/res_users.py:138
#, python-format
msgid "Signup: invalid template user"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/models/res_users.py:120
+#: code:addons/auth_signup/models/res_users.py:141
#, python-format
msgid "Signup: no login given for new user"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/models/res_users.py:122
+#: code:addons/auth_signup/models/res_users.py:143
#, python-format
msgid "Signup: no name or partner given for new user"
msgstr ""
@@ -437,6 +540,12 @@ msgid "The form was not properly filled in."
msgstr ""
#. module: auth_signup
+#: code:addons/auth_signup/models/res_users.py:127
+#, python-format
+msgid "This is his first connection. Wish him welcome"
+msgstr ""
+
+#. module: auth_signup
#: model:ir.model,name:auth_signup.model_res_users
msgid "Users"
msgstr ""
diff --git a/addons/base_automation/i18n/base_automation.pot b/addons/base_automation/i18n/base_automation.pot
index 8b8bf6834b2..56e4dc0ea26 100644
--- a/addons/base_automation/i18n/base_automation.pot
+++ b/addons/base_automation/i18n/base_automation.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:55+0000\n"
-"PO-Revision-Date: 2018-08-02 09:55+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -52,6 +52,16 @@ msgid "Active"
msgstr ""
#. module: base_automation
+#: model:ir.model.fields,field_description:base_automation.field_base_automation__activity_type_id
+msgid "Activity"
+msgstr ""
+
+#. module: base_automation
+#: model:ir.model.fields,field_description:base_automation.field_base_automation__activity_user_type
+msgid "Activity User Type"
+msgstr ""
+
+#. module: base_automation
#: model:ir.model.fields,field_description:base_automation.field_base_automation__channel_ids
msgid "Add Channels"
msgstr ""
@@ -204,6 +214,16 @@ msgid "Display Name"
msgstr ""
#. module: base_automation
+#: model:ir.model.fields,field_description:base_automation.field_base_automation__activity_date_deadline_range
+msgid "Due Date In"
+msgstr ""
+
+#. module: base_automation
+#: model:ir.model.fields,field_description:base_automation.field_base_automation__activity_date_deadline_range_type
+msgid "Due type"
+msgstr ""
+
+#. module: base_automation
#: model:ir.model.fields,field_description:base_automation.field_base_automation__template_id
msgid "Email Template"
msgstr ""
@@ -337,6 +357,11 @@ msgid "New"
msgstr ""
#. module: base_automation
+#: model:ir.model.fields,field_description:base_automation.field_base_automation__activity_note
+msgid "Note"
+msgstr ""
+
+#. module: base_automation
#: model:ir.model.fields,field_description:base_automation.field_base_automation__on_change_fields
msgid "On Change Fields Trigger"
msgstr ""
@@ -402,6 +427,7 @@ msgid "Remove the contextual action related to this server action"
msgstr ""
#. module: base_automation
+#: model:ir.model.fields,field_description:base_automation.field_base_automation__activity_user_id
#: model:ir.model.fields,field_description:base_automation.field_base_automation_lead_test__user_id
msgid "Responsible"
msgstr ""
@@ -447,6 +473,16 @@ msgid "Subject"
msgstr ""
#. module: base_automation
+#: model:ir.model.fields,field_description:base_automation.field_base_automation__activity_summary
+msgid "Summary"
+msgstr ""
+
+#. module: base_automation
+#: model:ir.model.fields,help:base_automation.field_base_automation__activity_user_field_name
+msgid "Technical name of the user on the record"
+msgstr ""
+
+#. module: base_automation
#: code:addons/base_automation/models/base_automation.py:87
#, python-format
msgid "The \"%(trigger_value)s\" %(trigger_label)s can only be used with the \"%(state_value)s\" action type"
@@ -480,6 +516,11 @@ msgid "Usage"
msgstr ""
#. module: base_automation
+#: model:ir.model.fields,help:base_automation.field_base_automation__activity_user_type
+msgid "Use 'Specific User' to always assign the same user on the next activity. Use 'Generic User From Record' to specify the field name of the user to choose on the record."
+msgstr ""
+
+#. module: base_automation
#: model:ir.model.fields,field_description:base_automation.field_base_automation__trg_date_calendar_id
msgid "Use Calendar"
msgstr ""
@@ -488,7 +529,7 @@ msgstr ""
#: model:ir.actions.act_window,help:base_automation.base_automation_act
msgid "Use automated actions to automatically trigger actions for\n"
" various screens. Example: a lead created by a specific user may\n"
-" be automatically set to a specific sales channel, or an\n"
+" be automatically set to a specific Sales Team, or an\n"
" opportunity which still has status pending after 14 days might\n"
" trigger an automatic reminder email."
msgstr ""
@@ -499,6 +540,11 @@ msgid "User"
msgstr ""
#. module: base_automation
+#: model:ir.model.fields,field_description:base_automation.field_base_automation__activity_user_field_name
+msgid "User field name"
+msgstr ""
+
+#. module: base_automation
#: model:ir.model.fields,field_description:base_automation.field_base_automation__fields_lines
msgid "Value Mapping"
msgstr ""
@@ -532,7 +578,7 @@ msgstr ""
#. module: base_automation
#: model:ir.model.fields,help:base_automation.field_base_automation__code
-msgid "Write Python code that the action will execute. Some variables are available for use; help about pyhon expression is given in the help tab."
+msgid "Write Python code that the action will execute. Some variables are available for use; help about python expression is given in the help tab."
msgstr ""
#. module: base_automation
diff --git a/addons/base_gengo/i18n/base_gengo.pot b/addons/base_gengo/i18n/base_gengo.pot
index 6254d55feff..d1ed4fa4348 100644
--- a/addons/base_gengo/i18n/base_gengo.pot
+++ b/addons/base_gengo/i18n/base_gengo.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:10+0000\n"
-"PO-Revision-Date: 2018-03-22 14:10+0000\n"
+"POT-Creation-Date: 2018-08-24 11:37+0000\n"
+"PO-Revision-Date: 2018-08-24 11:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,16 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_gengo
+#: model:ir.ui.view,arch_db:base_gengo.base_gengo_translation_wizard_from
+msgid "<span class=\"o_form_label\">Gengo Public or Private keys are wrong or missing.</span>"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.ui.view,arch_db:base_gengo.view_ir_translation_inherit_base_gengo_form
+msgid "<span class=\"o_form_label\">Note: If the translation state is 'In Progress', it means that the translation has to be approved to be uploaded in this system. You are supposed to do that directly by using your Gengo Account</span>"
+msgstr ""
+
+#. module: base_gengo
#: model:ir.ui.view,arch_db:base_gengo.res_config_settings_view_form
msgid "Add Gengo login Private Key..."
msgstr ""
@@ -122,11 +132,6 @@ msgstr ""
#. module: base_gengo
#: model:ir.ui.view,arch_db:base_gengo.base_gengo_translation_wizard_from
-msgid "Gengo Public or Private keys are wrong or missing."
-msgstr ""
-
-#. module: base_gengo
-#: model:ir.ui.view,arch_db:base_gengo.base_gengo_translation_wizard_from
msgid "Gengo Request Form"
msgstr ""
@@ -210,11 +215,6 @@ msgid "No. of terms to sync"
msgstr ""
#. module: base_gengo
-#: model:ir.ui.view,arch_db:base_gengo.view_ir_translation_inherit_base_gengo_form
-msgid "Note: If the translation state is 'In Progress', it means that the translation has to be approved to be uploaded in this system. You are supposed to do that directly by using your Gengo Account"
-msgstr ""
-
-#. module: base_gengo
#: model:ir.ui.view,arch_db:base_gengo.res_config_settings_view_form
msgid "Private Key"
msgstr ""
diff --git a/addons/base_import/i18n/base_import.pot b/addons/base_import/i18n/base_import.pot
index a2273031a9b..fecaa0546b1 100644
--- a/addons/base_import/i18n/base_import.pot
+++ b/addons/base_import/i18n/base_import.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:55+0000\n"
-"PO-Revision-Date: 2018-08-02 09:55+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,62 +17,88 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:155
+#: code:addons/base_import/static/src/js/import_action.js:612
#, python-format
-msgid " Import Template for Customers"
+msgid "%d records were successfully imported"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:542
+#: code:addons/base_import/static/src/js/import_action.js:647
#, python-format
msgid "(%d more)"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:316
+#: code:addons/base_import/static/src/js/import_action.js:378
#, python-format
msgid "A single column was found in the file, this often means the file separator is incorrect"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:103
+#: code:addons/base_import/static/src/js/import_action.js:582
+#, python-format
+msgid "An unknown issue occurred during import (possibly lost connection, data limit exceeded or memory limits exceeded). Please retry in case the issue is transient. If the issue still occurs, try to split the file rather than import it at once."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:102
#, python-format
msgid "Cancel"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:597
+#: code:addons/base_import/models/base_import.py:711
#, python-format
msgid "Column %s contains incorrect values (value: %s)"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:630
+#: code:addons/base_import/models/base_import.py:806
#, python-format
msgid "Column %s contains incorrect values. Error in line %d: %s"
msgstr ""
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__column_name
+msgid "Column Name"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:183
-#: code:addons/base_import/static/src/js/import_action.js:194
-#: code:addons/base_import/static/src/js/import_action.js:201
-#: code:addons/base_import/static/src/js/import_action.js:213
+#: code:addons/base_import/static/src/js/import_action.js:211
+#: code:addons/base_import/static/src/js/import_action.js:228
#, python-format
msgid "Comma"
msgstr ""
#. module: base_import
+#: code:addons/base_import/models/base_import.py:843
+#, python-format
+msgid "Could not retrieve URL: %(url)s [%(field_name)s: L%(line_number)d]: %(error)s"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:108
+#, python-format
+msgid "Create if doesn't exist"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_uid
@@ -85,12 +111,15 @@ msgstr ""
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__create_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__create_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__create_date
@@ -102,48 +131,64 @@ msgid "Created on"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:145
-#: code:addons/base_import/models/base_import.py:150
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:107
+#, python-format
+msgid "Creates new records if they can't be found (instead of failing to import). Note that the value in the column will be used as the new record's 'name', and assumes this is sufficient to create the record."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__currency_id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:206
+#: code:addons/base_import/models/base_import.py:211
#, python-format
msgid "Database ID"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:55
+#: code:addons/base_import/static/src/js/import_action.js:83
#, python-format
msgid "Date Format:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:56
+#: code:addons/base_import/static/src/js/import_action.js:84
#, python-format
msgid "Datetime Format:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:58
+#: code:addons/base_import/static/src/js/import_action.js:88
#, python-format
msgid "Decimal Separator:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:76
+#: code:addons/base_import/static/src/xml/base_import.xml:56
#, python-format
msgid "Defer parent/child computation"
msgstr ""
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__display_name
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__display_name
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__display_name
@@ -156,53 +201,76 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:361
+#: code:addons/base_import/static/src/js/import_action.js:445
#, python-format
msgid "Don't import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:202
-#: code:addons/base_import/static/src/js/import_action.js:220
+#: code:addons/base_import/static/src/js/import_action.js:229
#, python-format
msgid "Dot"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:50
+#: code:addons/base_import/static/src/xml/base_import.xml:87
+#, python-format
+msgid "Download"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__dt
+msgid "Dt"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:78
#, python-format
msgid "Encoding:"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:632
+#: code:addons/base_import/models/base_import.py:808
#, python-format
msgid "Error Parsing Date [%s:L%d]: %s"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:227
+#: code:addons/base_import/models/base_import.py:288
#, python-format
msgid "Error cell found while reading XLS/XLSX file: %s"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:519
+#: code:addons/base_import/static/src/js/import_action.js:624
#, python-format
msgid "Everything seems valid."
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:110
-#: code:addons/base_import/models/base_import.py:144
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:82
+#, python-format
+msgid "Excel files are recommended as fields formatting is automatic."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:168
+#: code:addons/base_import/models/base_import.py:205
#, python-format
msgid "External ID"
msgstr ""
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__field_name
+msgid "Field Name"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__file
msgid "File"
msgstr ""
@@ -218,53 +286,63 @@ msgid "File Type"
msgstr ""
#. module: base_import
+#: code:addons/base_import/models/base_import.py:826
+#: code:addons/base_import/models/base_import.py:832
+#, python-format
+msgid "File size exceeds configured maximum (%s bytes)"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,help:base_import.field_base_import_import__file
msgid "File to check and/or import, raw binary (not base64)"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:129
+#: code:addons/base_import/static/src/xml/base_import.xml:137
#, python-format
-msgid "For CSV files, the issue could be an incorrect encoding."
+msgid "For CSV files, you may need to select the correct separator."
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:566
+#: code:addons/base_import/static/src/xml/base_import.xml:13
#, python-format
-msgid "Get all possible values"
+msgid "Formatting Options…"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/js/import_action.js:671
#, python-format
-msgid "Help"
+msgid "Get all possible values"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:553
+#: code:addons/base_import/static/src/js/import_action.js:658
#, python-format
msgid "Here are the possible values:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:130
+#: code:addons/base_import/static/src/xml/base_import.xml:138
#, python-format
msgid "Here is the start of the file we could not import:"
msgstr ""
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__id
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__id
@@ -277,7 +355,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:87
+#: code:addons/base_import/static/src/xml/base_import.xml:67
#, python-format
msgid "If the file contains\n"
" the column names, Odoo can try auto-detecting the\n"
@@ -287,48 +365,72 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:65
+#: code:addons/base_import/static/src/xml/base_import.xml:45
#, python-format
msgid "If the model uses openchatter, history tracking will set up subscriptions and send notifications during the import, but lead to a slower import."
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:74
+#: code:addons/base_import/static/src/xml/base_import.xml:54
#, python-format
msgid "If the model uses parent/child relations, computing the parent / child relation occurs on every line, and lead to a slower import. Defering it can speed up import."
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:102
-#: code:addons/base_import/static/src/xml/base_import.xml:161
+#: code:addons/base_import/static/src/xml/base_import.xml:98
+#: code:addons/base_import/static/src/xml/base_import.xml:169
#, python-format
msgid "Import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:111
+#: code:addons/base_import/static/src/xml/base_import.xml:91
+#, python-format
+msgid "Import FAQ"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:140
#, python-format
msgid "Import a File"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:128
+#: code:addons/base_import/static/src/js/import_action.js:612
+#, python-format
+msgid "Import completed"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:136
#, python-format
msgid "Import preview failed due to:"
msgstr ""
#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import_action.js:579
+#, python-format
+msgid "Import timed out. Please retry. If you still encounter this issue, the file may be too big for the system's configuration, try to split it (import less records per file)."
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex____last_update
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related____last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required____last_update
@@ -341,12 +443,15 @@ msgstr ""
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_uid
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_uid
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_uid
@@ -359,12 +464,15 @@ msgstr ""
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_complex__write_date
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__write_date
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__write_date
@@ -377,14 +485,21 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:19
+#: code:addons/base_import/static/src/xml/base_import.xml:101
#, python-format
msgid "Load File"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:61
+#: code:addons/base_import/static/src/js/import_action.js:364
+#, python-format
+msgid "Load New File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/base_import.xml:41
#, python-format
msgid "Map your columns to import"
msgstr ""
@@ -401,23 +516,23 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:15
+#: code:addons/base_import/static/src/xml/base_import.xml:85
#, python-format
-msgid "No file chosen..."
+msgid "Need Help?"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:426
+#: code:addons/base_import/static/src/js/import_action.js:231
#, python-format
-msgid "Normal Fields"
+msgid "No Separator"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:35
+#: code:addons/base_import/static/src/js/import_action.js:513
#, python-format
-msgid "Options…"
+msgid "Normal Fields"
msgstr ""
#. module: base_import
@@ -432,42 +547,47 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:427
+#: code:addons/base_import/static/src/js/import_action.js:514
#, python-format
msgid "Relation Fields"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:24
+#: code:addons/base_import/static/src/xml/base_import.xml:100
#, python-format
msgid "Reload File"
msgstr ""
#. module: base_import
+#: model:ir.model.fields,field_description:base_import.field_base_import_mapping__res_model
+msgid "Res Model"
+msgstr ""
+
+#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:11
+#: code:addons/base_import/static/src/xml/base_import.xml:79
#, python-format
msgid "Select a CSV or Excel file to import."
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:184
+#: code:addons/base_import/static/src/js/import_action.js:212
#, python-format
msgid "Semicolon"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:51
+#: code:addons/base_import/static/src/js/import_action.js:79
#, python-format
msgid "Separator:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:86
+#: code:addons/base_import/static/src/xml/base_import.xml:66
#, python-format
msgid "Show fields of relation fields (advanced)"
msgstr ""
@@ -479,35 +599,35 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:186
+#: code:addons/base_import/static/src/js/import_action.js:214
#, python-format
msgid "Space"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:185
+#: code:addons/base_import/static/src/js/import_action.js:213
#, python-format
msgid "Tab"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:100
+#: code:addons/base_import/static/src/xml/base_import.xml:99
#, python-format
msgid "Test Import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:52
+#: code:addons/base_import/static/src/js/import_action.js:80
#, python-format
msgid "Text Delimiter:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:82
+#: code:addons/base_import/static/src/xml/base_import.xml:62
#, python-format
msgid "The first row\n"
" contains the label of the column"
@@ -515,37 +635,43 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:57
+#: code:addons/base_import/static/src/js/import_action.js:87
#, python-format
msgid "Thousands Separator:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/base_import.xml:67
+#: code:addons/base_import/static/src/xml/base_import.xml:47
#, python-format
msgid "Track history during import"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:192
+#: code:addons/base_import/models/base_import.py:253
#, python-format
msgid "Unable to load \"{extension}\" file: requires Python module \"{modname}\""
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:193
+#: code:addons/base_import/models/base_import.py:254
#, python-format
msgid "Unsupported file format \"{}\", import only supports CSV, ODS, XLS and XLSX"
msgstr ""
#. module: base_import
+#: model:ir.model,name:base_import.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly__value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related__value
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required__value
@@ -556,24 +682,45 @@ msgid "Value"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:534
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_float__value2
+msgid "Value2"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:778
+#, python-format
+msgid "You can not import images via URL, check with your administrator or support for the reason."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:649
#, python-format
msgid "You must configure at least one field to import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:536
+#: code:addons/base_import/static/src/js/import_action.js:641
#, python-format
msgid "at row %d"
msgstr ""
#. module: base_import
+#: model:ir.model,name:base_import.model_base
+msgid "base"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_import
msgid "base_import.import"
msgstr ""
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_mapping
+msgid "base_import.mapping"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char
msgid "base_import.tests.models.char"
msgstr ""
@@ -604,6 +751,16 @@ msgid "base_import.tests.models.char.stillreadonly"
msgstr ""
#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_complex
+msgid "base_import.tests.models.complex"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_float
+msgid "base_import.tests.models.float"
+msgstr ""
+
+#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
msgid "base_import.tests.models.m2o"
msgstr ""
@@ -640,7 +797,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:538
+#: code:addons/base_import/static/src/js/import_action.js:643
#, python-format
msgid "between rows %d and %d"
msgstr ""
diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot
index 2c6d8394820..9495664c997 100644
--- a/addons/base_setup/i18n/base_setup.pot
+++ b/addons/base_setup/i18n/base_setup.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:55+0000\n"
-"PO-Revision-Date: 2018-08-02 09:55+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,26 @@ msgstr ""
#. module: base_setup
#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
+msgid "<i class=\"fa fa-lg fa-building-o\"/>\n"
+" <span class=\"text-muted\">\n"
+" the creation of documents between your companies\n"
+" </span>"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
+msgid "<span class=\"o_form_label\">Document Template</span>\n"
+" <span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-specific.\" aria-label=\"Values set here are company-specific.\" groups=\"base.group_multi_company\" role=\"img\"/>"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
+msgid "<span class=\"o_form_label\">Format</span>\n"
+" <span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-specific.\" aria-label=\"Values set here are company-specific.\" groups=\"base.group_multi_company\" role=\"img\"/>"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
msgid "<strong>Save</strong> this page and come back here to set up the feature."
msgstr ""
@@ -72,7 +92,7 @@ msgid "Change Document Template"
msgstr ""
#. module: base_setup
-#: code:addons/base_setup/models/res_config_settings.py:98
+#: code:addons/base_setup/models/res_config_settings.py:99
#, python-format
msgid "Choose Your Document Layout"
msgstr ""
@@ -124,14 +144,13 @@ msgid "Default Access Rights"
msgstr ""
#. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_res_config_settings__external_report_layout
-#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings__external_report_layout_id
msgid "Document Template"
msgstr ""
#. module: base_setup
#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
-msgid "Edit Header"
+msgid "Edit Layout"
msgstr ""
#. module: base_setup
@@ -145,6 +164,11 @@ msgid "Extract and analyze Odoo data from Google Spreadsheet"
msgstr ""
#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
+msgid "Find free high-resolution images from Unsplash"
+msgstr ""
+
+#. module: base_setup
#: model:ir.model.fields,help:base_setup.field_res_config_settings__report_footer
msgid "Footer text displayed at the bottom of all reports."
msgstr ""
@@ -299,6 +323,11 @@ msgid "Translate your website with Gengo"
msgstr ""
#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings__module_web_unsplash
+msgid "Unsplash Image Library"
+msgstr ""
+
+#. module: base_setup
#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
msgid "Use LDAP credentials to log in"
msgstr ""
@@ -328,8 +357,3 @@ msgstr ""
msgid "res.config.settings"
msgstr ""
-#. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
-msgid "the creation of documents between your companies"
-msgstr ""
-
diff --git a/addons/board/i18n/board.pot b/addons/board/i18n/board.pot
index 08eaaf25a88..aa23fafdb0c 100644
--- a/addons/board/i18n/board.pot
+++ b/addons/board/i18n/board.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:55+0000\n"
-"PO-Revision-Date: 2018-08-02 09:55+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -39,14 +39,14 @@ msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/xml/board.xml:85
+#: code:addons/board/static/src/xml/board.xml:83
#, python-format
msgid "Add"
msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/xml/board.xml:79
+#: code:addons/board/static/src/xml/board.xml:78
#, python-format
msgid "Add to my Dashboard"
msgstr ""
@@ -118,6 +118,13 @@ msgstr ""
#. module: board
#. openerp-web
+#: code:addons/board/static/src/xml/board.xml:41
+#, python-format
+msgid "Layout"
+msgstr ""
+
+#. module: board
+#. openerp-web
#: code:addons/board/static/src/js/board_view.js:43
#: model:ir.actions.act_window,name:board.open_board_my_dash_action
#: model:ir.ui.menu,name:board.menu_board_my_dash
diff --git a/addons/calendar/i18n/calendar.pot b/addons/calendar/i18n/calendar.pot
index 75c77ccd38e..31ec8331ad8 100644
--- a/addons/calendar/i18n/calendar.pot
+++ b/addons/calendar/i18n/calendar.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,298 +16,36 @@ msgstr ""
"Plural-Forms: \n"
#. module: calendar
-#: model:mail.template,body_html:calendar.calendar_template_meeting_changedate
-msgid "\n"
-"<div summary=\"o_mail_template\" style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\">\n"
-"% set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'}\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
-" <tbody><tr>\n"
-" <td valign=\"center\" width=\"200\" style=\"padding:10px 10px 10px 5px;font-size: 12px\">\n"
-" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\">\n"
-" </td>\n"
-" <td valign=\"center\" align=\"right\" width=\"340\" style=\"padding:10px 10px 10px 5px; font-size: 12px;\">\n"
-" <p>\n"
-" <a href=\"/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius:3px\">Accept</a>\n"
-" <a href=\"/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or '' }&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius:3px\">Decline</a>\n"
-" <a href=\"/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius:3px\">View</a>\n"
-" </p>\n"
-" </td>\n"
-" </tr></tbody>\n"
-" </table>\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
-" <tbody><tr>\n"
-" <td valign=\"top\" style=\"width:600px; padding:10px 10px 10px 5px;\">\n"
-" <div>\n"
-" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n"
-" </div>\n"
-" </td>\n"
-" </tr></tbody>\n"
-" </table>\n"
-"</div>\n"
-"<div style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\">\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
-" <tbody><tr>\n"
-" <td style=\"padding:10px 10px 10px 5px;font-size: 14px;\">\n"
-" <p style=\"font-size: 20px; text-align: center;\"><strong>${object.event_id.name} date updated</strong></p>\n"
-" <p>\n"
-" <strong>Dear ${object.common_name}</strong>,<br />\n"
-" The date of the meeting has been upated. The meeting ${object.event_id.name} created by ${object.event_id.user_id.partner_id.name} is now scheduled for ${object.event_id.get_display_time_tz(tz=object.partner_id.tz)}.\n"
-" </p>\n"
-" <table style=\"margin-top: 20px;\"><tr>\n"
-" <td>\n"
-" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#875A7B;padding-top: 4px;\">\n"
-" ${object.event_id.get_interval('dayname', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
-" </div>\n"
-" <div style=\"font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #F8F8F8;width: 130px;border:1px solid #875A7B;\">\n"
-" ${object.event_id.get_interval('day', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
-" </div>\n"
-" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#875A7B'>${object.event_id.get_interval('month', tz=object.partner_id.tz if not object.event_id.allday else None)}</div>\n"
-" <div style=\"border-collapse:separate;color: #5F5F5F;text-align:center;width: 130px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid #875A7B;border-bottom-left-radius:3px;\">${not object.event_id.allday and object.event_id.get_interval('time', tz=object.partner_id.tz) or ''}</div>\n"
-" </td>\n"
-" <td width=\"20px;\"/>\n"
-" <td>\n"
-" <p>Details of the event</p>\n"
-" <ul>\n"
-" % if object.event_id.location:\n"
-" <li>Location: ${object.event_id.location}\n"
-" (<a target=\"_blank\" href=\"http://maps.google.com/maps?oi=map&q=${object.event_id.location}\">View Map</a>)\n"
-" </li>\n"
-" % endif\n"
-" % if object.event_id.description :\n"
-" <li>Description: ${object.event_id.description}</li>\n"
-" % endif\n"
-" % if not object.event_id.allday and object.event_id.duration\n"
-" <li>Duration: ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}</li>\n"
-" % endif\n"
-" <li>Attendees\n"
-" <ul>\n"
-" % for attendee in object.event_id.attendee_ids:\n"
-" <li>\n"
-" <div style=\"display:inline-block; border-radius: 50%; width:10px; height:10px;background:${colors[attendee.state] or 'white'};\"></div>\n"
-" % if attendee.common_name != object.common_name:\n"
-" <span style=\"margin-left:5px\">${attendee.common_name}</span>\n"
-" % else:\n"
-" <span style=\"margin-left:5px\">You</span>\n"
-" % endif\n"
-" </li>\n"
-" % endfor\n"
-" </ul></li>\n"
-" </ul>\n"
-" </td>\n"
-" </tr></table>\n"
-" </td>\n"
-" </tr></tbody>\n"
-" </table>\n"
-"</div>"
-msgstr ""
-
-#. module: calendar
-#: model:mail.template,body_html:calendar.calendar_template_meeting_invitation
-msgid "\n"
-"<div summary=\"o_mail_template\" style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\">\n"
-"% set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'}\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
-" <tbody><tr>\n"
-" <td valign=\"center\" width=\"200\" style=\"padding:10px 10px 10px 5px;font-size: 12px\">\n"
-" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\">\n"
-" </td>\n"
-" <td valign=\"center\" align=\"right\" width=\"340\" style=\"padding:10px 10px 10px 5px; font-size: 12px;\">\n"
-" <p>\n"
-" <a href=\"/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius:3px\">Accept</a>\n"
-" <a href=\"/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or '' }&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius:3px\">Decline</a>\n"
-" <a href=\"/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius:3px\">View</a>\n"
-" </p>\n"
-" </td>\n"
-" </tr></tbody>\n"
-" </table>\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
-" <tbody><tr>\n"
-" <td valign=\"top\" style=\"width:600px; padding:10px 10px 10px 5px;\">\n"
-" <div>\n"
-" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n"
-" </div>\n"
-" </td>\n"
-" </tr></tbody>\n"
-" </table>\n"
-"</div>\n"
-"<div style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\">\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
-" <tbody><tr>\n"
-" <td style=\"padding:10px 10px 10px 5px;font-size: 14px;\">\n"
-" <p style=\"font-size: 20px; text-align: center;\">Invitation to <strong>${object.event_id.name}</strong></p>\n"
-" <p>\n"
-" <strong>Dear ${object.common_name}</strong>,<br />\n"
-" ${object.event_id.user_id.partner_id.name} invited you for the ${object.event_id.name} meeting of ${object.event_id.user_id.company_id.name}.</p>\n"
-" <table style=\"margin-top: 20px;\"><tr>\n"
-" <td>\n"
-" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#875A7B;padding-top: 4px;border:1px solid #875A7B;\">\n"
-" ${object.event_id.get_interval('dayname', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
-" </div>\n"
-" <div style=\"font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #F8F8F8;width: 130px;border:1px solid #875A7B;\">\n"
-" ${object.event_id.get_interval('day', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
-" </div>\n"
-" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#875A7B'>${object.event_id.get_interval('month', tz=object.partner_id.tz if not object.event_id.allday else None)}</div>\n"
-" <div style=\"border-collapse:separate;color: #5F5F5F;text-align:center;width: 130px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid #875A7B;border-bottom-left-radius:3px;\">${not object.event_id.allday and object.event_id.get_interval('time', tz=object.partner_id.tz) or ''}</div>\n"
-" </td>\n"
-" <td width=\"20px;\"/>\n"
-" <td>\n"
-" <p>Details of the event</p>\n"
-" <ul>\n"
-" % if object.event_id.location:\n"
-" <li>Location: ${object.event_id.location}\n"
-" (<a target=\"_blank\" href=\"http://maps.google.com/maps?oi=map&q=${object.event_id.location}\">View Map</a>)\n"
-" </li>\n"
-" % endif\n"
-" % if object.event_id.description :\n"
-" <li>Description: ${object.event_id.description}</li>\n"
-" % endif\n"
-" % if not object.event_id.allday and object.event_id.duration\n"
-" <li>Duration: ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}</li>\n"
-" % endif\n"
-" <li>Attendees\n"
-" <ul>\n"
-" % for attendee in object.event_id.attendee_ids:\n"
-" <li>\n"
-" <div style=\"display:inline-block; border-radius: 50%; width:10px; height:10px;background:${colors[attendee.state] or 'white'};\"></div>\n"
-" % if attendee.common_name != object.common_name:\n"
-" <span style=\"margin-left:5px\">${attendee.common_name}</span>\n"
-" % else:\n"
-" <span style=\"margin-left:5px\">You</span>\n"
-" % endif\n"
-" </li>\n"
-" % endfor\n"
-" </ul></li>\n"
-" </ul>\n"
-" </td>\n"
-" </tr></table>\n"
-" </td>\n"
-" </tr></tbody>\n"
-" </table>\n"
-"</div>"
-msgstr ""
-
-#. module: calendar
-#: model:mail.template,body_html:calendar.calendar_template_meeting_reminder
-msgid "\n"
-"<div summary=\"o_mail_template\" style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\">\n"
-"% set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'}\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
-" <tbody><tr>\n"
-" <td valign=\"center\" width=\"200\" style=\"padding:10px 10px 10px 5px;font-size: 12px\">\n"
-" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\">\n"
-" </td>\n"
-" <td valign=\"center\" align=\"right\" width=\"340\" style=\"padding:10px 10px 10px 5px; font-size: 12px;\">\n"
-" <p>\n"
-" <a href=\"/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius:3px\">Accept</a>\n"
-" <a href=\"/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or '' }&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius:3px\">Decline</a>\n"
-" <a href=\"/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius:3px\">View</a>\n"
-" </p>\n"
-" </td>\n"
-" </tr></tbody>\n"
-" </table>\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
-" <tbody><tr>\n"
-" <td valign=\"top\" style=\"width:600px; padding:10px 10px 10px 5px;\">\n"
-" <div>\n"
-" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n"
-" </div>\n"
-" </td>\n"
-" </tr></tbody>\n"
-" </table>\n"
-"</div>\n"
-"<div style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\">\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
-" <tbody><tr>\n"
-" <td style=\"padding:10px 10px 10px 5px;font-size: 14px;\">\n"
-" <p style=\"font-size: 20px; text-align: center;\">Reminder for <strong>${object.event_id.name}</strong></p>\n"
-" <p>\n"
-" <strong>Dear ${object.common_name}</strong>,<br />\n"
-" This is a reminder for the below event :\n"
-" </p>\n"
-" <table style=\"margin-top: 20px;\"><tr>\n"
-" <td>\n"
-" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#875A7B;padding-top: 4px;\">\n"
-" ${object.event_id.get_interval('dayname', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
-" </div>\n"
-" <div style=\"font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #F8F8F8;width: 130px;border:1px solid #875A7B;\">\n"
-" ${object.event_id.get_interval('day', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
-" </div>\n"
-" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#875A7B'>${object.event_id.get_interval('month', tz=object.partner_id.tz if not object.event_id.allday else None)}</div>\n"
-" <div style=\"border-collapse:separate;color: #5F5F5F;text-align:center;width: 130px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid #875A7B;border-bottom-left-radius:3px;\">${not object.event_id.allday and object.event_id.get_interval('time', tz=object.partner_id.tz) or ''}</div>\n"
-" </td>\n"
-" <td width=\"20px;\"/>\n"
-" <td>\n"
-" <p>Details of the event</p>\n"
-" <ul>\n"
-" % if object.event_id.location:\n"
-" <li>Location: ${object.event_id.location}\n"
-" (<a target=\"_blank\" href=\"http://maps.google.com/maps?oi=map&q=${object.event_id.location}\">View Map</a>)\n"
-" </li>\n"
-" % endif\n"
-" % if object.event_id.description :\n"
-" <li>Description: ${object.event_id.description}</li>\n"
-" % endif\n"
-" % if not object.event_id.allday and object.event_id.duration\n"
-" <li>Duration: ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}</li>\n"
-" % endif\n"
-" <li>Attendees\n"
-" <ul>\n"
-" % for attendee in object.event_id.attendee_ids:\n"
-" <li>\n"
-" <div style=\"display:inline-block; border-radius: 50%; width:10px; height:10px;background:${colors[attendee.state] or 'white'};\"></div>\n"
-" % if attendee.common_name != object.common_name:\n"
-" <span style=\"margin-left:5px\">${attendee.common_name}</span>\n"
-" % else:\n"
-" <span style=\"margin-left:5px\">You</span>\n"
-" % endif\n"
-" </li>\n"
-" % endfor\n"
-" </ul></li>\n"
-" </ul>\n"
-" </td>\n"
-" </tr></table>\n"
-" </td>\n"
-" </tr></tbody>\n"
-" </table>\n"
-"</div>"
-msgstr ""
-
-#. module: calendar
#: model:mail.template,subject:calendar.calendar_template_meeting_reminder
msgid "${object.event_id.name} - Reminder"
msgstr ""
#. module: calendar
-#: model:mail.template,subject:calendar.calendar_template_meeting_invitation
-msgid "${object.event_id.name} invitation"
-msgstr ""
-
-#. module: calendar
#: model:mail.template,subject:calendar.calendar_template_meeting_changedate
msgid "${object.event_id.name}: Date updated"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:741
+#: code:addons/calendar/models/calendar.py:742
#, python-format
msgid "%s at %s To\n"
" %s at %s (%s)"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:732
+#: code:addons/calendar/models/calendar.py:733
#, python-format
msgid "%s at (%s To %s) (%s)"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:227
+#: code:addons/calendar/models/calendar.py:228
#, python-format
msgid "%s has accepted invitation"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:235
+#: code:addons/calendar/models/calendar.py:236
#, python-format
msgid "%s has declined invitation"
msgstr ""
@@ -348,6 +86,222 @@ msgid "6 Hour(s), by e-mail"
msgstr ""
#. module: calendar
+#: model:mail.template,body_html:calendar.calendar_template_meeting_invitation
+msgid "<div>\n"
+" % set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'}\n"
+" <p>\n"
+" Hello ${object.common_name},<br/><br/>\n"
+" ${object.event_id.user_id.partner_id.name} invited you for the ${object.event_id.name} meeting of ${object.event_id.user_id.company_id.name}.\n"
+" </p>\n"
+" <div style=\"text-align: center; margin: 16px 0px 16px 0px;\">\n"
+" <a href=\"/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or ''}&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n"
+" Accept</a>\n"
+" <a href=\"/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or '' }&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n"
+" Decline</a>\n"
+" <a href=\"/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or ''}&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n"
+" View</a>\n"
+" </div>\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr>\n"
+" <td width=\"130px;\">\n"
+" <div style=\"border-top-left-radius: 3px; border-top-right-radius: 3px; font-size: 12px; border-collapse: separate; text-align: center; font-weight: bold; color: #ffffff; min-height: 18px; background-color: #875A7B; border: 1px solid #875A7B;\">\n"
+" ${object.event_id.get_interval('dayname', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
+" </div>\n"
+" <div style=\"font-size: 48px; min-height: auto; font-weight: bold; text-align: center; color: #5F5F5F; background-color: #F8F8F8; border: 1px solid #875A7B;\">\n"
+" ${object.event_id.get_interval('day', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
+" </div>\n"
+" <div style=\"font-size: 12px; text-align: center; font-weight: bold; color: #ffffff; background-color: #875A7B;\">\n"
+" ${object.event_id.get_interval('month', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
+" </div>\n"
+" <div style=\"border-collapse: separate; color: #5F5F5F; text-align: center; font-size: 12px; border-bottom-right-radius: 3px; font-weight: bold; border: 1px solid #875A7B; border-bottom-left-radius: 3px;\">\n"
+" ${not object.event_id.allday and object.event_id.get_interval('time', tz=object.partner_id.tz) or ''}\n"
+" </div>\n"
+" </td>\n"
+" <td width=\"20px;\"/>\n"
+" <td style=\"padding-top: 5px;\">\n"
+" <p><strong>Details of the event</strong></p>\n"
+" <ul>\n"
+" % if object.event_id.location:\n"
+" <li>Location: ${object.event_id.location}\n"
+" (<a target=\"_blank\" href=\"http://maps.google.com/maps?oi=map&amp;q=${object.event_id.location}\">View Map</a>)\n"
+" </li>\n"
+" % endif\n"
+" % if object.event_id.description :\n"
+" <li>Description: ${object.event_id.description}</li>\n"
+" % endif\n"
+" % if not object.event_id.allday and object.event_id.duration\n"
+" <li>Duration: ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}</li>\n"
+" % endif\n"
+" <li>Attendees\n"
+" <ul>\n"
+" % for attendee in object.event_id.attendee_ids:\n"
+" <li>\n"
+" <div style=\"display: inline-block; border-radius: 50%; width: 10px; height: 10px; background:${colors[attendee.state] or 'white'};\"> </div>\n"
+" % if attendee.common_name != object.common_name:\n"
+" <span style=\"margin-left:5px\">${attendee.common_name}</span>\n"
+" % else:\n"
+" <span style=\"margin-left:5px\">You</span>\n"
+" % endif\n"
+" </li>\n"
+" % endfor\n"
+" </ul></li>\n"
+" </ul>\n"
+" </td>\n"
+" </tr></table>\n"
+" <br/>\n"
+" Thank you,\n"
+" <br/>\n"
+" % if object.event_id.user_id and object.event_id.user_id.signature:\n"
+" ${object.event_id.user_id.signature | safe}\n"
+" % endif\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: calendar
+#: model:mail.template,body_html:calendar.calendar_template_meeting_changedate
+msgid "<div>\n"
+" % set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'}\n"
+" <p>\n"
+" Hello ${object.common_name},<br/><br/>\n"
+" The date of the meeting has been updated. The meeting ${object.event_id.name} created by ${object.event_id.user_id.partner_id.name} is now scheduled for ${object.event_id.get_display_time_tz(tz=object.partner_id.tz)}.\n"
+" </p>\n"
+" <div style=\"text-align: center; margin: 16px 0px 16px 0px;\">\n"
+" <a href=\"/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or ''}&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n"
+" Accept</a>\n"
+" <a href=\"/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or '' }&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n"
+" Decline</a>\n"
+" <a href=\"/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or ''}&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n"
+" View</a>\n"
+" </div>\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr>\n"
+" <td width=\"130px;\">\n"
+" <div style=\"border-top-left-radius: 3px; border-top-right-radius: 3px; font-size: 12px; border-collapse: separate; text-align: center; font-weight: bold; color: #ffffff; min-height: 18px; background-color: #875A7B; border: 1px solid #875A7B;\">\n"
+" ${object.event_id.get_interval('dayname', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
+" </div>\n"
+" <div style=\"font-size: 48px; min-height: auto; font-weight: bold; text-align: center; color: #5F5F5F; background-color: #F8F8F8; border: 1px solid #875A7B;\">\n"
+" ${object.event_id.get_interval('day', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
+" </div>\n"
+" <div style=\"font-size: 12px; text-align: center; font-weight: bold; color: #ffffff; background-color: #875A7B;\">\n"
+" ${object.event_id.get_interval('month', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
+" </div>\n"
+" <div style=\"border-collapse: separate; color: #5F5F5F; text-align: center; font-size: 12px; border-bottom-right-radius: 3px; font-weight: bold; border: 1px solid #875A7B; border-bottom-left-radius: 3px;\">\n"
+" ${not object.event_id.allday and object.event_id.get_interval('time', tz=object.partner_id.tz) or ''}\n"
+" </div>\n"
+" </td>\n"
+" <td width=\"20px;\"/>\n"
+" <td style=\"padding-top: 5px;\">\n"
+" <p><strong>Details of the event</strong></p>\n"
+" <ul>\n"
+" % if object.event_id.location:\n"
+" <li>Location: ${object.event_id.location}\n"
+" (<a target=\"_blank\" href=\"http://maps.google.com/maps?oi=map&amp;q=${object.event_id.location}\">View Map</a>)\n"
+" </li>\n"
+" % endif\n"
+" % if object.event_id.description :\n"
+" <li>Description: ${object.event_id.description}</li>\n"
+" % endif\n"
+" % if not object.event_id.allday and object.event_id.duration\n"
+" <li>Duration: ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}</li>\n"
+" % endif\n"
+" <li>Attendees\n"
+" <ul>\n"
+" % for attendee in object.event_id.attendee_ids:\n"
+" <li>\n"
+" <div style=\"display: inline-block; border-radius: 50%; width: 10px; height: 10px; background: ${colors[attendee.state] or 'white'};\"> </div>\n"
+" % if attendee.common_name != object.common_name:\n"
+" <span style=\"margin-left:5px\">${attendee.common_name}</span>\n"
+" % else:\n"
+" <span style=\"margin-left:5px\">You</span>\n"
+" % endif\n"
+" </li>\n"
+" % endfor\n"
+" </ul></li>\n"
+" </ul>\n"
+" </td>\n"
+" </tr></table>\n"
+" <br/>\n"
+" Thank you,\n"
+" <br/>\n"
+" % if object.event_id.user_id and object.event_id.user_id.signature:\n"
+" ${object.event_id.user_id.signature | safe}\n"
+" % endif\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: calendar
+#: model:mail.template,body_html:calendar.calendar_template_meeting_reminder
+msgid "<div>\n"
+" % set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'}\n"
+" <p>\n"
+" Hello ${object.common_name},<br/><br/>\n"
+" This is a reminder for the below event :\n"
+" </p>\n"
+" <div style=\"text-align: center; margin: 16px 0px 16px 0px;\">\n"
+" <a href=\"/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or ''}&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n"
+" Accept</a>\n"
+" <a href=\"/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or '' }&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n"
+" Decline</a>\n"
+" <a href=\"/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or ''}&amp;token=${object.access_token}&amp;action=${'action_id' in ctx and ctx['action_id'] or ''}&amp;id=${object.event_id.id}\" style=\"padding: 5px 10px; color: #FFFFFF; text-decoration: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius: 3px\">\n"
+" View</a>\n"
+" </div>\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr>\n"
+" <td width=\"130px;\">\n"
+" <div style=\"border-top-left-radius: 3px; border-top-right-radius: 3px; font-size: 12px; border-collapse: separate; text-align: center; font-weight: bold; color: #ffffff; min-height: 18px; background-color: #875A7B; border: 1px solid #875A7B;\">\n"
+" ${object.event_id.get_interval('dayname', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
+" </div>\n"
+" <div style=\"font-size: 48px; min-height: auto; font-weight: bold; text-align: center; color: #5F5F5F; background-color: #F8F8F8; border: 1px solid #875A7B;\">\n"
+" ${object.event_id.get_interval('day', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
+" </div>\n"
+" <div style=\"font-size: 12px; text-align: center; font-weight: bold; color: #ffffff; background-color: #875A7B;\">\n"
+" ${object.event_id.get_interval('month', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
+" </div>\n"
+" <div style=\"border-collapse: separate; color: #5F5F5F; text-align: center; font-size: 12px; border-bottom-right-radius: 3px; font-weight: bold; border: 1px solid #875A7B; border-bottom-left-radius: 3px;\">\n"
+" ${not object.event_id.allday and object.event_id.get_interval('time', tz=object.partner_id.tz) or ''}\n"
+" </div>\n"
+" </td>\n"
+" <td width=\"20px;\"/>\n"
+" <td style=\"padding-top: 5px;\">\n"
+" <p><strong>Details of the event</strong></p>\n"
+" <ul>\n"
+" % if object.event_id.location:\n"
+" <li>Location: ${object.event_id.location}\n"
+" (<a target=\"_blank\" href=\"http://maps.google.com/maps?oi=map&amp;q=${object.event_id.location}\">View Map</a>)\n"
+" </li>\n"
+" % endif\n"
+" % if object.event_id.description :\n"
+" <li>Description: ${object.event_id.description}</li>\n"
+" % endif\n"
+" % if not object.event_id.allday and object.event_id.duration\n"
+" <li>Duration: ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}</li>\n"
+" % endif\n"
+" <li>Attendees\n"
+" <ul>\n"
+" % for attendee in object.event_id.attendee_ids:\n"
+" <li>\n"
+" <div style=\"display: inline-block; border-radius: 50%; width: 10px; height: 10px; background:${colors[attendee.state] or 'white'};\"> </div>\n"
+" % if attendee.common_name != object.common_name:\n"
+" <span style=\"margin-left:5px\">${attendee.common_name}</span>\n"
+" % else:\n"
+" <span style=\"margin-left:5px\">You</span>\n"
+" % endif\n"
+" </li>\n"
+" % endfor\n"
+" </ul></li>\n"
+" </ul>\n"
+" </td>\n"
+" </tr></table>\n"
+" <br/>\n"
+" Thank you,\n"
+" <br/>\n"
+" % if object.event_id.user_id and object.event_id.user_id.signature:\n"
+" ${object.event_id.user_id.signature | safe}\n"
+" % endif\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: calendar
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_form
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_form_popup
msgid "<span> hours</span>"
@@ -399,7 +353,7 @@ msgid "All Day"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:728
+#: code:addons/calendar/models/calendar.py:729
#, python-format
msgid "AllDay , %s"
msgstr ""
@@ -420,11 +374,6 @@ msgid "Attendee Status"
msgstr ""
#. module: calendar
-#: model:ir.model,name:calendar.model_calendar_attendee
-msgid "Attendee information"
-msgstr ""
-
-#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event__partner_ids
#: model:ir.ui.view,arch_db:calendar.invitation_page_anonymous
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_form
@@ -438,7 +387,7 @@ msgid "Availability"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:1673
+#: code:addons/calendar/models/calendar.py:1687
#: selection:calendar.attendee,availability:0
#: selection:calendar.event,show_as:0
#, python-format
@@ -475,6 +424,11 @@ msgid "Calendar Meeting"
msgstr ""
#. module: calendar
+#: model:ir.model,name:calendar.model_calendar_attendee
+msgid "Calendar Registration"
+msgstr ""
+
+#. module: calendar
#: model:ir.actions.server,name:calendar.ir_cron_scheduler_alarm_ir_actions_server
#: model:ir.cron,cron_name:calendar.ir_cron_scheduler_alarm
#: model:ir.cron,name:calendar.ir_cron_scheduler_alarm
@@ -677,7 +631,7 @@ msgid "Event alarm"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:1225
+#: code:addons/calendar/models/calendar.py:1228
#, python-format
msgid "Event recurrence interval cannot be negative."
msgstr ""
@@ -704,7 +658,7 @@ msgid "First"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:990
+#: code:addons/calendar/models/calendar.py:993
#, python-format
msgid "First you have to specify the date of the invitation."
msgstr ""
@@ -756,7 +710,7 @@ msgid "Group By"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:1616
+#: code:addons/calendar/models/calendar.py:1630
#, python-format
msgid "Group by date is not supported, use the calendar view instead."
msgstr ""
@@ -822,6 +776,11 @@ msgid "Invitation for"
msgstr ""
#. module: calendar
+#: model:mail.template,subject:calendar.calendar_template_meeting_invitation
+msgid "Invitation to ${object.event_id.name}"
+msgstr ""
+
+#. module: calendar
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_form
msgid "Invitations"
msgstr ""
@@ -897,6 +856,11 @@ msgid "Location of Event"
msgstr ""
#. module: calendar
+#: model:ir.ui.view,arch_db:calendar.invitation_page_anonymous
+msgid "Logo"
+msgstr ""
+
+#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_contacts__user_id
msgid "Me"
msgstr ""
@@ -908,8 +872,8 @@ msgid "Meeting"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:936
-#: code:addons/calendar/models/calendar.py:941
+#: code:addons/calendar/models/calendar.py:937
+#: code:addons/calendar/models/calendar.py:942
#, python-format
msgid "Meeting '%s' starts '%s' and ends '%s'"
msgstr ""
@@ -1107,7 +1071,7 @@ msgid "Partner-related data of the user"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:1238
+#: code:addons/calendar/models/calendar.py:1241
#, python-format
msgid "Please select a proper day of the month."
msgstr ""
@@ -1344,13 +1308,13 @@ msgid "The calendar is shared between employees and fully integrated with\n"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:935
+#: code:addons/calendar/models/calendar.py:936
#, python-format
msgid "The ending date and time cannot be earlier than the starting date and time."
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:940
+#: code:addons/calendar/models/calendar.py:941
#, python-format
msgid "The ending date cannot be earlier than the starting date."
msgstr ""
@@ -1470,7 +1434,7 @@ msgid "Yes I'm going."
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:157
+#: code:addons/calendar/models/calendar.py:158
#, python-format
msgid "You cannot duplicate a calendar attendee."
msgstr ""
@@ -1491,7 +1455,7 @@ msgid "e.g. Business Lunch"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:1223
+#: code:addons/calendar/models/calendar.py:1226
#, python-format
msgid "interval cannot be negative."
msgstr ""
diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot
index 232c5950c7c..d4e897fe2b4 100644
--- a/addons/crm/i18n/crm.pot
+++ b/addons/crm/i18n/crm.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:11+0000\n"
-"PO-Revision-Date: 2018-08-02 09:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:03+0000\n"
+"PO-Revision-Date: 2018-08-24 09:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,114 +16,6 @@ msgstr ""
"Plural-Forms: \n"
#. module: crm
-#: model:mail.template,body_html:crm.mail_template_data_module_install_crm
-msgid "\n"
-"\n"
-" <div style=\"margin: 10px auto;\">\n"
-" % set last_created_team = user.env['crm.team'].search([], order=\"create_date desc\")[0]\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-" <tbody>\n"
-" <tr>\n"
-" <td style=\"padding:2px;width:30%;\">\n"
-" <img src=\"web/static/src/img/logo.png\"/>\n"
-" </td>\n"
-" <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-" <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-" </td>\n"
-" </tr>\n"
-" </tbody>\n"
-" </table>\n"
-" <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-" <tbody>\n"
-" <tr>\n"
-" <td style=\"padding:15px 10px;font-size:20px\">\n"
-" <p style=\"color:#875A7B;margin:0\" >Hooray!</p><br>\n"
-" <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-" <span>Your Odoo CRM application is up and running.</span></p><br>\n"
-" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-" <span style=\"font-size:13px;font-weight:bold; \">What’s next?</span></p>\n"
-" <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-" <li dir=\"ltr\">\n"
-" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-" <span>Try creating a lead by sending an email to </span>\n"
-" <a href=\"mailto:${last_created_team.alias_id.name_get()[0][1] if last_created_team.alias_id.alias_domain else user.company_id.email}\">\n"
-" <span style=\"font-weight:bold; text-decoration:underline;\">${last_created_team.alias_id.name_get()[0][1] if last_created_team.alias_id.alias_domain else user.company_id.email}</span>\n"
-" </a>\n"
-" </p>\n"
-" </li>\n"
-" <li dir=\"ltr\">\n"
-" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-" <span>Track your opportunities in your sale funnel by simply dragging and dropping the cards from one column to another</span>\n"
-" </p>\n"
-" </li>\n"
-" </ul> <br>\n"
-" <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-" <li dir=\"ltr\">\n"
-" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-" <span>Automatically assign your leads to your salesmen with the lead scoring, </span>\n"
-" </p>\n"
-" </li>\n"
-" <li dir=\"ltr\">\n"
-" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-" <span>Keep in touch with your potential client with efficient email campaigns,</span>\n"
-" </p>\n"
-" </li>\n"
-" <li dir=\"ltr\">\n"
-" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-" <span>Gain high quality insight from surveys,</span>\n"
-" </p>\n"
-" </li>\n"
-" <li dir=\"ltr\">\n"
-" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-" <span>Get smart reporting and accurate dashboards,</span>\n"
-" </p>\n"
-" </li>\n"
-" <li dir=\"ltr\">\n"
-" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-" <span>And much more...</span>\n"
-" </p>\n"
-" </li>\n"
-" </ul>\n"
-" <br>\n"
-" <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-" <span style=\"font-weight:bold;\">Need Help?</span>\n"
-" <span style=\"font-style:italic;\">You’re not alone</span>\n"
-" </p>\n"
-" <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-" <span>We would be delighted to assist you along the way. Contact us through our\n"
-" <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-" You can also discover how to get the best out of Odoo CRM with our </span>\n"
-" <a target=\"_blank\" href=\"https://www.odoo.com/documentation/user/11.0/crm.html\">\n"
-" <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-" </span><span> or with our </span>\n"
-" <a target=\"_blank\" href=\"https://www.odoo.com/documentation\">\n"
-" <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-" </p>\n"
-" <br>\n"
-" <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-" </td>\n"
-" </tr>\n"
-" </tbody>\n"
-" </table>\n"
-" <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-" <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a target=\"_blank\" href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-" </div>\n"
-" </div>"
-msgstr ""
-
-#. module: crm
-#: model:mail.template,body_html:crm.email_template_opportunity_reminder_mail
-msgid "\n"
-"<p>Hello ${object.user_id and object.user_id.name or ''},</p>\n"
-"<p>The opportunity <strong>${object.name}</strong> did not have any activity since at least 5 days.</p>\n"
-"%if object.description:\n"
-"<p>Here is the description about the opportunity : </p><p><i>${object.description}</i>\n"
-"%endif\n"
-"</p><p>Thank you!</p>\n"
-""
-msgstr ""
-
-#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__meeting_count
#: model:ir.model.fields,field_description:crm.field_res_partner__meeting_count
#: model:ir.model.fields,field_description:crm.field_res_users__meeting_count
@@ -131,6 +23,18 @@ msgid "# Meetings"
msgstr ""
#. module: crm
+#: model:digest.tip,tip_description:crm.digest_tip_crm_0
+msgid "% endif"
+msgstr ""
+
+#. module: crm
+#: model:digest.tip,tip_description:crm.digest_tip_crm_0
+msgid "% set email = object.env['crm.team'].search([('alias_name','!=', False)],limit=1).alias_id.display_name\n"
+" % if email\n"
+" <strong style=\"font-size: 16px;\">Try the mail gateway</strong>"
+msgstr ""
+
+#. module: crm
#. openerp-web
#: code:addons/crm/static/src/js/tour.js:22
#, python-format
@@ -155,8 +59,8 @@ msgstr ""
#: code:addons/crm/models/crm_team.py:138
#, python-format
msgid "<p class='o_view_nocontent_smiling_face'>Add new opportunities</p><p>\n"
-" Looks like you are not a member of a sales channel. You should add yourself\n"
-" as a member of one of the sales channel.\n"
+" Looks like you are not a member of a Sales Team. You should add yourself\n"
+" as a member of one of the Sales Team.\n"
"</p>"
msgstr ""
@@ -329,7 +233,7 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__date_open
-msgid "Assigned"
+msgid "Assignation Date"
msgstr ""
#. module: crm
@@ -338,7 +242,12 @@ msgid "Avg. of Probability"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:402
+#: model:ir.model.fields,field_description:crm.field_crm_lead__is_blacklisted
+msgid "Blacklist"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/models/crm_lead.py:400
#, python-format
msgid "Boom! Team record for the past 30 days."
msgstr ""
@@ -350,6 +259,7 @@ msgstr ""
#. module: crm
#: model:ir.ui.menu,name:crm.crm_menu_root
+#: model:ir.ui.view,arch_db:crm.digest_digest_view_form
#: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
msgid "CRM"
msgstr ""
@@ -376,7 +286,7 @@ msgstr ""
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_team_act_tree
-msgid "Cases by Sales Channel"
+msgid "Cases by Sales Team"
msgstr ""
#. module: crm
@@ -409,6 +319,8 @@ msgstr ""
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_leads
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
+#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
+#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
msgid "City"
msgstr ""
@@ -440,6 +352,8 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__date_closed
+#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
+#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
msgid "Closed Date"
msgstr ""
@@ -510,6 +424,7 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__date_conversion
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
+#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
msgid "Conversion Date"
msgstr ""
@@ -561,6 +476,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_leads
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
+#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
msgid "Country"
msgstr ""
@@ -674,11 +590,12 @@ msgstr ""
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
+#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
msgid "Current"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:1156
+#: code:addons/crm/models/crm_lead.py:1160
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner__partner_id
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass__partner_id
#: model:ir.model.fields,field_description:crm.field_crm_lead__partner_id
@@ -698,7 +615,7 @@ msgid "Customer Autocomplete"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:1158
+#: code:addons/crm/models/crm_lead.py:1162
#, python-format
msgid "Customer Email"
msgstr ""
@@ -722,6 +639,11 @@ msgid "Date"
msgstr ""
#. module: crm
+#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
+msgid "Date Closed"
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__day_open
msgid "Days to Assign"
msgstr ""
@@ -757,6 +679,11 @@ msgid "Describe the lead..."
msgstr ""
#. module: crm
+#: model:ir.model,name:crm.model_digest_digest
+msgid "Digest"
+msgstr ""
+
+#. module: crm
#: model:ir.ui.view,arch_db:crm.view_create_opportunity_simplified
msgid "Discard"
msgstr ""
@@ -776,6 +703,13 @@ msgid "Display Name"
msgstr ""
#. module: crm
+#: code:addons/crm/models/digest.py:18
+#: code:addons/crm/models/digest.py:29
+#, python-format
+msgid "Do not have access, skip this data for user's digest email"
+msgstr ""
+
+#. module: crm
#: selection:crm.lead2opportunity.partner,action:0
#: selection:crm.lead2opportunity.partner.mass,action:0
#: selection:crm.partner.binding,action:0
@@ -784,6 +718,11 @@ msgstr ""
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_case_kanban_view_leads
+msgid "Dropdown menu"
+msgstr ""
+
+#. module: crm
+#: model:ir.ui.view,arch_db:crm.crm_case_kanban_view_leads
msgid "Edit"
msgstr ""
@@ -805,8 +744,13 @@ msgid "Email address of the contact"
msgstr ""
#. module: crm
+#: model:digest.tip,tip_description:crm.digest_tip_crm_0
+msgid "Email sent to <strong>${email}</strong> generate opportunities in your pipeline.<br>"
+msgstr ""
+
+#. module: crm
#: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
-msgid "Emails received to that address generate new leads not assigned to any sales channel yet. This can be made when converting them into opportunities. Incoming emails can be automatically assigned to specific sales channels. To do so, set an email alias on the sales channel."
+msgid "Emails received to that address generate new leads not assigned to any Sales Team yet. This can be made when converting them into opportunities. Incoming emails can be automatically assigned to specific Sales Teams. To do so, set an email alias on the Sales Team."
msgstr ""
#. module: crm
@@ -826,12 +770,13 @@ msgstr ""
#. module: crm
#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
-msgid "Exclude Opt Out"
+msgid "Exclude blacklisted"
msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__date_deadline
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
+#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
msgid "Expected Closing"
msgstr ""
@@ -861,11 +806,6 @@ msgid "Expected Revenue"
msgstr ""
#. module: crm
-#: model:ir.filters,name:crm.filter_opportunity_expected_revenue
-msgid "Expected Revenue by Channel"
-msgstr ""
-
-#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_case_tree_view_oppor
msgid "Expected Revenues"
msgstr ""
@@ -926,30 +866,21 @@ msgid "Format phone numbers based on national conventions"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:600
+#: code:addons/crm/models/crm_lead.py:598
#, python-format
msgid "From %s : %s"
msgstr ""
#. module: crm
+#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
msgid "Future Activities"
msgstr ""
#. module: crm
-#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
-msgid "Future Activities (7 days)"
-msgstr ""
-
-#. module: crm
-#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
-msgid "Future Activities (All)"
-msgstr ""
-
-#. module: crm
#: model:ir.ui.view,arch_db:crm.res_config_settings_view_form
msgid "Generate leads from incoming emails and assign them\n"
-" to a sales channel manually"
+" to a Sales Team manually"
msgstr ""
#. module: crm
@@ -968,7 +899,7 @@ msgid "Global CC"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:400
+#: code:addons/crm/models/crm_lead.py:398
#, python-format
msgid "Go, go, go! Congrats for your first deal."
msgstr ""
@@ -1049,13 +980,13 @@ msgid "If checked, some messages have a delivery error."
msgstr ""
#. module: crm
-#: model:ir.model.fields,help:crm.field_crm_lead__opt_out
-msgid "If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign. Filter 'Available for Mass Mailing' allows users to filter the leads when performing mass mailing."
+#: model:ir.model.fields,help:crm.field_res_partner__team_id
+msgid "If set, this Sales Team will be used for sales and assignations related to this partner"
msgstr ""
#. module: crm
-#: model:ir.model.fields,help:crm.field_res_partner__team_id
-msgid "If set, this sales channel will be used for sales and assignations related to this partner"
+#: model:ir.model.fields,help:crm.field_crm_lead__is_blacklisted
+msgid "If the email address is on the blacklist, the contact won't receive mass mailing anymore, from any list"
msgstr ""
#. module: crm
@@ -1069,6 +1000,12 @@ msgid "Import & Synchronize"
msgstr ""
#. module: crm
+#: code:addons/crm/models/crm_lead.py:1222
+#, python-format
+msgid "Import Template for Leads & Opportunities"
+msgstr ""
+
+#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_lost_reason_view_search
msgid "Include archived"
msgstr ""
@@ -1105,6 +1042,16 @@ msgid "Kanban State"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_digest_digest__kpi_crm_lead_created_value
+msgid "Kpi Crm Lead Created Value"
+msgstr ""
+
+#. module: crm
+#: model:ir.model.fields,field_description:crm.field_digest_digest__kpi_crm_opportunities_won_value
+msgid "Kpi Crm Opportunities Won Value"
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__date_action_last
msgid "Last Action"
msgstr ""
@@ -1124,12 +1071,6 @@ msgid "Last Modified on"
msgstr ""
#. module: crm
-#: model:ir.ui.view,arch_db:crm.crm_activity_report_view_search
-#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
-msgid "Last Month"
-msgstr ""
-
-#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__date_last_stage_update
msgid "Last Stage Update"
msgstr ""
@@ -1183,11 +1124,6 @@ msgid "Lead / Customer"
msgstr ""
#. module: crm
-#: model:mail.message.subtype,name:crm.mt_salesteam_lead
-msgid "Lead Created"
-msgstr ""
-
-#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_lead_tag_form
#: model:ir.ui.view,arch_db:crm.crm_lead_tag_tree
msgid "Lead Tags"
@@ -1247,7 +1183,7 @@ msgstr ""
#. module: crm
#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
-msgid "Leads that did not ask not to be included in mass mailing campaigns"
+msgid "Leads that did ask to not receive mass mailing anymore"
msgstr ""
#. module: crm
@@ -1303,6 +1239,7 @@ msgstr ""
#: model:ir.model.fields,field_description:crm.field_crm_lead_lost__lost_reason_id
#: model:ir.ui.view,arch_db:crm.crm_lead_lost_view_form
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
+#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
msgid "Lost Reason"
msgstr ""
@@ -1419,25 +1356,25 @@ msgid "Merge with existing opportunities"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:550
+#: code:addons/crm/models/crm_lead.py:548
#, python-format
msgid "Merged lead"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:582
+#: code:addons/crm/models/crm_lead.py:580
#, python-format
msgid "Merged leads"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:582
+#: code:addons/crm/models/crm_lead.py:580
#, python-format
msgid "Merged opportunities"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:550
+#: code:addons/crm/models/crm_lead.py:548
#, python-format
msgid "Merged opportunity"
msgstr ""
@@ -1495,6 +1432,11 @@ msgid "New"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_digest_digest__kpi_crm_lead_created
+msgid "New Leads/Opportunities"
+msgstr ""
+
+#. module: crm
#: model:ir.actions.act_window,name:crm.action_opportunity_form
msgid "New Opportunity"
msgstr ""
@@ -1531,7 +1473,7 @@ msgid "Next activity late"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:1178
+#: code:addons/crm/models/crm_lead.py:1182
#, python-format
msgid "No Subject"
msgstr ""
@@ -1620,6 +1562,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:crm.crm_activity_report_view_search
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
#: model:ir.ui.view,arch_db:crm.crm_case_tree_view_oppor
+#: model:ir.ui.view,arch_db:crm.crm_lead_view_graph
#: model:ir.ui.view,arch_db:crm.crm_team_salesteams_view_kanban
#: model:ir.ui.view,arch_db:crm.view_crm_lead2opportunity_partner
#: model:ir.ui.view,arch_db:crm.view_partners_form_crm1
@@ -1637,13 +1580,13 @@ msgid "Opportunities Analysis gives you an instant access to your opportunities
msgstr ""
#. module: crm
-#: model:ir.filters,name:crm.filter_opportunity_opportunities_cohort
-msgid "Opportunities Cohort"
+#: model:ir.model.fields,field_description:crm.field_crm_team__opportunities_amount
+msgid "Opportunities Revenues"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_team__opportunities_amount
-msgid "Opportunities Revenues"
+#: model:ir.model.fields,field_description:crm.field_digest_digest__kpi_crm_opportunities_won
+msgid "Opportunities Won"
msgstr ""
#. module: crm
@@ -1657,7 +1600,7 @@ msgid "Opportunities with a date of Expected Closing which is in the past"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:448
+#: code:addons/crm/models/crm_lead.py:446
#: code:addons/crm/models/crm_lead.py:880
#: selection:crm.activity.report,lead_type:0
#: selection:crm.lead,type:0
@@ -1675,6 +1618,7 @@ msgstr ""
#. module: crm
#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
msgid "Opportunity Created"
msgstr ""
@@ -1716,11 +1660,6 @@ msgid "Opportunity won"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead__opt_out
-msgid "Opt-Out"
-msgstr ""
-
-#. module: crm
#: model:ir.model.fields,help:crm.field_crm_team__alias_force_thread_id
msgid "Optional ID of a thread (record) to which all incoming messages will be attached, even if they did not reply to it. If set, this will disable the creation of new records completely."
msgstr ""
@@ -1792,7 +1731,7 @@ msgid "Phone Formatting"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_team.py:165
+#: code:addons/crm/models/crm_team.py:154
#: selection:crm.team,dashboard_graph_model:0
#: model:ir.actions.act_window,name:crm.crm_lead_opportunities_tree_view
#: model:ir.model.fields,field_description:crm.field_crm_team__use_opportunities
@@ -1808,6 +1747,7 @@ msgstr ""
#: model:ir.actions.act_window,name:crm.action_report_crm_opportunity_salesteam
#: model:ir.actions.act_window,name:crm.crm_opportunity_report_action
#: model:ir.actions.act_window,name:crm.crm_opportunity_report_action_graph
+#: model:ir.ui.view,arch_db:crm.crm_lead_view_pivot
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_graph
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_pivot
msgid "Pipeline Analysis"
@@ -1828,11 +1768,11 @@ msgid "Pipeline Analysis gives you an instant access to\n"
"your opportunities with information such as the expected revenue, planned cost,\n"
"missed deadlines or the number of interactions per opportunity. This report is\n"
"mainly used by the sales manager in order to periodically review the pipeline\n"
-"with the the sales channel."
+"with the the Sales Team."
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_team.py:234
+#: code:addons/crm/models/crm_team.py:223
#, python-format
msgid "Pipeline: Expected Revenue"
msgstr ""
@@ -1843,7 +1783,7 @@ msgid "Planned"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:654
+#: code:addons/crm/models/crm_lead.py:652
#, python-format
msgid "Please select more than one element (lead or opportunity) from the list view."
msgstr ""
@@ -1923,11 +1863,6 @@ msgid "Related Customer"
msgstr ""
#. module: crm
-#: model:mail.template,subject:crm.email_template_opportunity_reminder_mail
-msgid "Reminder: Lead ${object.name} from ${object.partner_id != False and object.partner_id.name or object.contact_name}"
-msgstr ""
-
-#. module: crm
#: model:ir.ui.menu,name:crm.crm_menu_report
msgid "Reporting"
msgstr ""
@@ -1966,17 +1901,19 @@ msgstr ""
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
-msgid "Sales Channel"
+msgid "Sales Team"
msgstr ""
#. module: crm
-#: model:ir.ui.menu,name:crm.sales_team_menu_report_crm
-msgid "Sales Channel Dashboard"
+#: code:addons/crm/models/crm_lead.py:1117
+#, python-format
+msgid "Sales Team Settings"
msgstr ""
#. module: crm
#: model:ir.ui.menu,name:crm.crm_team_config
-msgid "Sales Channels"
+#: model:ir.ui.menu,name:crm.sales_team_menu_report_crm
+msgid "Sales Teams"
msgstr ""
#. module: crm
@@ -2091,6 +2028,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:crm.crm_activity_report_view_search
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
#: model:ir.ui.view,arch_db:crm.crm_stage_form
+#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
msgid "Stage"
msgstr ""
@@ -2250,12 +2188,6 @@ msgid "These email addresses will be added to the CC field of all inbound and ou
msgstr ""
#. module: crm
-#: model:ir.ui.view,arch_db:crm.crm_activity_report_view_search
-#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
-msgid "This Month"
-msgstr ""
-
-#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_case_kanban_view_leads
msgid "This bar allows to filter the opportunities based on scheduled activities."
msgstr ""
@@ -2311,11 +2243,6 @@ msgid "Title"
msgstr ""
#. module: crm
-#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
-msgid "To Close This Month"
-msgstr ""
-
-#. module: crm
#: selection:crm.lead,activity_state:0
msgid "Today"
msgstr ""
@@ -2337,6 +2264,11 @@ msgid "Tracking"
msgstr ""
#. module: crm
+#: model:digest.tip,tip_description:crm.digest_tip_crm_0
+msgid "Try Now"
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_activity_report__lead_type
#: model:ir.model.fields,field_description:crm.field_crm_lead__type
msgid "Type"
@@ -2366,7 +2298,7 @@ msgid "Unassigned Leads"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_team.py:211
+#: code:addons/crm/models/crm_team.py:200
#, python-format
msgid "Undefined"
msgstr ""
@@ -2493,7 +2425,7 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,help:crm.field_crm_lead__team_id
-msgid "When sending mails, the default email address is taken from the sales channel."
+msgid "When sending mails, the default email address is taken from the Sales Team."
msgstr ""
#. module: crm
@@ -2524,22 +2456,12 @@ msgid "Won"
msgstr ""
#. module: crm
-#: model:ir.filters,name:crm.filter_opportunity_opportunities_won_per_team
-msgid "Won by Channel"
-msgstr ""
-
-#. module: crm
-#: model:ir.filters,name:crm.filter_opportunity_country
-msgid "Won by Country"
-msgstr ""
-
-#. module: crm
#: model:ir.model.fields,field_description:crm.field_res_users__target_sales_won
msgid "Won in Opportunities Target"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:404
+#: code:addons/crm/models/crm_lead.py:402
#, python-format
msgid "Yeah! Deal of the last 7 days for the team."
msgstr ""
@@ -2547,17 +2469,17 @@ msgstr ""
#. module: crm
#: code:addons/crm/models/crm_team.py:121
#, python-format
-msgid "You have to enable the Pipeline on your sales channel to be able to set it as a content for the graph"
+msgid "You have to enable the Pipeline on your Sales Team to be able to set it as a content for the graph"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:406
+#: code:addons/crm/models/crm_lead.py:404
#, python-format
msgid "You just beat your personal record for the past 30 days."
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:408
+#: code:addons/crm/models/crm_lead.py:406
#, python-format
msgid "You just beat your personal record for the past 7 days."
msgstr ""
@@ -2577,11 +2499,6 @@ msgid "You will be able to plan meetings and phone calls from\n"
msgstr ""
#. module: crm
-#: model:mail.template,subject:crm.mail_template_data_module_install_crm
-msgid "Your Odoo CRM application is running smoothly."
-msgstr ""
-
-#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_leads
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
msgid "ZIP"
diff --git a/addons/delivery/i18n/delivery.pot b/addons/delivery/i18n/delivery.pot
index 7731e230587..2305a24b047 100644
--- a/addons/delivery/i18n/delivery.pot
+++ b/addons/delivery/i18n/delivery.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -27,22 +27,39 @@ msgstr ""
#. module: delivery
#: model:mail.template,body_html:delivery.mail_template_data_delivery_confirmation
-msgid "<?xml version=\"1.0\"?>\n"
-"<data><p>Dear ${object.partner_id.name},</p>\n"
-"<p>We are glad to inform you that your order has been shipped.</p>\n"
-"<p>\n"
-"%if object.carrier_tracking_ref:\n"
-" Your tracking reference:\n"
-" %if object.carrier_tracking_url:\n"
-" <a href=\"${object.carrier_tracking_url}\" target=\"_blank\">${object.carrier_tracking_ref}</a>.\n"
-" %else:\n"
-" ${object.carrier_tracking_ref}.\n"
-" %endif\n"
-"%endif\n"
-"</p>\n"
-"<p>Find your delivery order attached for more details.</p>\n"
-"<p>Thank you,</p>\n"
-" </data>"
+msgid "<div style=\"margin: 0px; padding: 0px;\">\n"
+" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+" Hello ${object.partner_id.name},<br/><br/>\n"
+" We are glad to inform you that your order has been shipped.\n"
+" %if object.carrier_tracking_ref:\n"
+" Your tracking reference is\n"
+" <strong>\n"
+" %if object.carrier_tracking_url:\n"
+" <a href=\"${object.carrier_tracking_url}\" target=\"_blank\">${object.carrier_tracking_ref}</a>.\n"
+" %else:\n"
+" ${object.carrier_tracking_ref}.\n"
+" %endif\n"
+" </strong>\n"
+" %endif\n"
+" <br/><br/>\n"
+" Please find your delivery order attached for more details.<br/><br/>\n"
+" Thank you,<br/>\n"
+" % if user and user.signature:\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </p>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
+msgid "<i class=\"fa fa-arrow-right\"/> Add to order"
+msgstr ""
+
+#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
+msgid "<i class=\"fa fa-arrow-right\"/> Get rate"
msgstr ""
#. module: delivery
@@ -136,11 +153,6 @@ msgid "Carrier"
msgstr ""
#. module: delivery
-#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
-msgid "Check price"
-msgstr ""
-
-#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__company_id
msgid "Company"
msgstr ""
@@ -185,6 +197,11 @@ msgid "Define a new delivery method"
msgstr ""
#. module: delivery
+#: model:product.category,name:delivery.product_category_deliveries
+msgid "Deliveries"
+msgstr ""
+
+#. module: delivery
#: model:ir.ui.menu,name:delivery.menu_delivery
msgid "Delivery"
msgstr ""
@@ -351,12 +368,6 @@ msgid "Group By"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_product_product__hs_code
-#: model:ir.model.fields,field_description:delivery.field_product_template__hs_code
-msgid "HS Code"
-msgstr ""
-
-#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_product_packaging__height
msgid "Height"
msgstr ""
@@ -588,11 +599,6 @@ msgid "Pricing Rules"
msgstr ""
#. module: delivery
-#: model:ir.model,name:delivery.model_product_template
-msgid "Product Template"
-msgstr ""
-
-#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__delivery_type
#: model:ir.model.fields,field_description:delivery.field_stock_picking__delivery_type
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
@@ -653,11 +659,6 @@ msgid "Sequence"
msgstr ""
#. module: delivery
-#: model:ir.ui.view,arch_db:delivery.view_order_form_with_carrier
-msgid "Set price"
-msgstr ""
-
-#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier__prod_environment
msgid "Set to True if your credentials are certified for production."
msgstr ""
@@ -686,12 +687,6 @@ msgid "Shipping Weight:"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_product_product__hs_code
-#: model:ir.model.fields,help:delivery.field_product_template__hs_code
-msgid "Standardized code for international shipping and goods declaration"
-msgstr ""
-
-#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__state_ids
msgid "States"
msgstr ""
@@ -767,6 +762,12 @@ msgid "Unit of measurement for Weight"
msgstr ""
#. module: delivery
+#: model:product.product,uom_name:delivery.product_product_delivery
+#: model:product.template,uom_name:delivery.product_product_delivery_product_template
+msgid "Unit(s)"
+msgstr ""
+
+#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__variable
msgid "Variable"
msgstr ""
diff --git a/addons/digest/i18n/digest.pot b/addons/digest/i18n/digest.pot
new file mode 100644
index 00000000000..c3769b26292
--- /dev/null
+++ b/addons/digest/i18n/digest.pot
@@ -0,0 +1,525 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * digest
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~11.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: digest
+#: model:mail.template,body_html:digest.digest_mail_template
+msgid "\n"
+"<table style=\"width: 100%; border-spacing: 0; font-family: Helvetica,Arial,Verdana,sans-serif;\">\n"
+" <tr>\n"
+" <td align=\"center\" valign=\"top\" style=\"border-collapse: collapse; padding: 0\">\n"
+" % set company, user = ctx['company'], ctx['user']\n"
+" % set data = object.compute_kpis(company, user)\n"
+" % set tips = object.compute_tips(company, user)\n"
+" % set kpi_actions = object.compute_kpis_actions(company, user)\n"
+" % set kpis = data.yesterday.keys()\n"
+" <table style=\"width: 100%; max-width: 600px; border-spacing: 0; border: 1px solid #e7e7e7; border-bottom: none; color: #6e7172; line-height: 23px; text-align: left;\">\n"
+" <tr>\n"
+" <td style=\"border-collapse: collapse; padding: 10px 40px; text-align: left;\">\n"
+" <strong style=\"margin-left: -22px; color: #000000; font-size: 22px; line-height: 32px;\">${company.name} at a glance</strong>\n"
+" <div style=\"color: #000000; font-size: 15px; margin-left:-22px;\">${datetime.date.today().strftime('%B %d, %Y')}</div>\n"
+" </td>\n"
+" <td style=\"text-align: right; padding: 10px 40px\">\n"
+" <img style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" src=\"/logo.png?company=${company.id}\"/>\n"
+" </td>\n"
+" </tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align: center;\">\n"
+" <hr width=\"95%\" style=\"background-color: rgb(204,204,204); border: medium none; clear: both; display: block; font-size: 0px; min-height: 1px; line-height: 0; margin: 16px 0px 16px 14px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" % for kpi in kpis:\n"
+" <table style=\"border-spacing: 0; width: 100%; max-width: 600px;\">\n"
+" <tr>\n"
+" <td style=\"border-collapse: collapse; background-color: #ffffff; border-left: 1px solid #e7e7e7; border-right: 1px solid #e7e7e7; line-height: 21px; padding: 0 20px 10px 20px; text-align: left;\"><br/>\n"
+" <span style=\"color: #3d466e; font-size: 18px; font-weight: 500; line-height: 23px;\">${object.fields_get()[kpi]['string']}</span>\n"
+" %if kpi in kpi_actions:\n"
+" <span style=\"float: right;\">\n"
+" <a href=\"/web#action=${kpi_actions[kpi]}\">View more</a>\n"
+" </span>\n"
+" %endif\n"
+" </td>\n"
+" </tr>\n"
+" <tr>\n"
+" <td style=\"border-collapse: collapse; margin: 0; padding:0;\">\n"
+" <table style=\"width: 100%; border-spacing: 0; background-color: #f9f9f9; border: 1px solid #e7e7e7; border-top: none;\">\n"
+" <tr>\n"
+" <td style=\"border-collapse: collapse; margin: 0; padding: 0; display: block; border-top: 2px solid #56b3b5;\">\n"
+" <table style=\"width: 100%; max-width: 199px; border-spacing: 0;\">\n"
+" <tr>\n"
+" <td style=\"border-collapse: collapse; padding: 20px; text-align: center;\">\n"
+" <span style=\"color: #56b3b5; font-size: 35px; font-weight: bold; text-decoration: none; line-height: 36px;\">${data['yesterday'][kpi][kpi]}</span><br/>\n"
+" <span style=\"color: #888888; display: inline-block; font-size: 12px; line-height: 18px; text-transform: uppercase;\">Yesterday</span>\n"
+" % if data['yesterday'][kpi]['margin'] != 0.0:\n"
+" <span style=\"color: #888888; display: block; font-size: 12px; line-height: 18px; text-transform: uppercase;\">\n"
+" % if data['yesterday'][kpi]['margin'] > 0.0:\n"
+" <span style=\"color: #0bbc22;\">▲</span>${\"%.2f\" % data['yesterday'][kpi]['margin']} %\n"
+" % endif\n"
+" % if data['yesterday'][kpi]['margin'] < 0.0:\n"
+" <span style=\"color: #ff0000;\">▼</span>${\"%.2f\" % data['yesterday'][kpi]['margin']} %\n"
+" % endif\n"
+" </span>\n"
+" % endif\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" </td>\n"
+" <td style=\"border-collapse: collapse; margin: 0; padding: 0; border-top: 2px solid #9a5b82;\">\n"
+" <table style=\"width: 100%; max-width: 199px; border-spacing: 0; margin: 0; padding: 0;\">\n"
+" <tr>\n"
+" <td style=\"border-collapse: collapse; padding: 20px; text-align: center;\">\n"
+" <span style=\"color: #9a5b82; font-size: 35px; font-weight: bold; text-decoration: none; line-height: 36px;\">${data['lastweek'][kpi][kpi]}</span><br/>\n"
+" <span style=\"color: #888888; display: inline-block; font-size: 12px; line-height: 18px; text-transform: uppercase;\">Last 7 Days</span>\n"
+" % if data['lastweek'][kpi]['margin'] != 0.0:\n"
+" <span style=\"color: #888888; display: block; font-size: 12px; line-height: 18px; text-transform: uppercase;\">\n"
+" % if data['lastweek'][kpi]['margin'] > 0.0:\n"
+" <span style=\"color: #0bbc22;\">▲</span>${\"%.2f\" % data['lastweek'][kpi]['margin']} %\n"
+" % endif\n"
+" % if data['lastweek'][kpi]['margin'] < 0.0:\n"
+" <span style=\"color: #ff0000;\">▼</span>${\"%.2f\" % data['lastweek'][kpi]['margin']} %\n"
+" %endif\n"
+" </span>\n"
+" %endif\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" </td>\n"
+" <td style=\"border-collapse: collapse; margin: 0; padding: 0; border-top: 2px solid #56b3b5;\">\n"
+" <table style=\"width: 100%; max-width: 199px; border-spacing: 0; margin: 0; padding: 0;\">\n"
+" <tr>\n"
+" <td style=\"border-collapse: collapse; margin: 0; padding: 20; text-align: center;\">\n"
+" <span style=\"color: #56b3b5; font-size: 35px; font-weight: bold; text-decoration: none; line-height: 36px\">${data['lastmonth'][kpi][kpi]}</span><br/>\n"
+" <span style=\"color: #888888; display: inline-block; font-size: 12px; line-height: 18px; text-transform: uppercase;\">Last 30 Days</span>\n"
+" % if data['lastmonth'][kpi]['margin'] != 0.0:\n"
+" <span style=\"color: #888888; display: block; font-size: 12px; line-height: 18px; text-transform: uppercase;\">\n"
+" % if data['lastmonth'][kpi]['margin'] > 0.0:\n"
+" <span style=\"color: #0bbc22;\">▲</span>${\"%.2f\" % data['lastmonth'][kpi]['margin']} %\n"
+" % endif\n"
+" % if data['lastmonth'][kpi]['margin'] < 0.0:\n"
+" <span style=\"color: #ff0000;\">▼</span>${\"%.2f\" % data['lastmonth'][kpi]['margin']} %\n"
+" %endif\n"
+" </span>\n"
+" %endif\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" % endfor\n"
+" % if tips:\n"
+" <table style=\"width: 100%; max-width: 600px; margin-top: 5px; border: 1px solid #e7e7e7;\">\n"
+" <tr>\n"
+" <td style=\"border-collapse: collapse; background-color: #ffffff; line-height: 21px; padding: 0px 20px;\"><br/>\n"
+" <div style=\"color: #3d466e; line-height: 23px;\">${ctx['tip_description']|safe}</div>\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" % endif\n"
+" <table style=\"width: 100%; max-width: 600px; margin-top: 5px; border: 1px solid #e7e7e7;\">\n"
+" <tr>\n"
+" <td style=\"border-collapse: collapse; background-color: #ffffff; line-height: 21px; padding: 0 20px 10px 20px; text-align: center;\"><br/>\n"
+" <div style=\"color: #3d466e; font-size: 16px; font-weight: 600; line-height: 23px;\">Run your bussiness from anywhere with Odoo Mobile.</div>\n"
+" </td>\n"
+" </tr>\n"
+" <tr>\n"
+" <td>\n"
+" <div style=\"text-align: center;\"><a href=\"https://play.google.com/store/apps/details?id=com.odoo.mobile\" target=\"_blank\"><img src=\"/digest/static/src/img/google_play.png\" style=\"display: inline-block; height: 30px; margin-left: auto; margin-right: 12px;\"/></a><a href=\"https://itunes.apple.com/us/app/odoo/id1272543640\" target=\"_blank\"><img src=\"/digest/static/src/img/app_store.png\" style=\"display: inline-block; height: 30px; margin-left: 12px; margin-right: auto;\"/></a>\n"
+" </div>\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" <table style=\"margin-top: 5px; border: 1px solid #e7e7e7; font-size: 15px; width: 100%; max-width: 600px;\">\n"
+" <tr>\n"
+" <td style=\"border-collapse: collapse; margin: 0; padding: 10px 20px;\">\n"
+" % if ctx['user'].has_group('base.group_system'): \n"
+" <div style=\"margin-top: 20px;\"> \n"
+" Want to customize the email?\n"
+" <a href=\"/web#view_type=form&amp;model=digest.digest&amp;id=${object.id}\" target=\"_blank\" style=\"color: #875A7B;\">Choose the metrics you care about</a>\n"
+" </div>\n"
+" <br />\n"
+" % endif\n"
+" <p style=\"font-size: 11px; margin-top: 10px;\">\n"
+" <strong>\n"
+" Send by\n"
+" <a href=\"https://www.odoo.com\" style=\"text-decoration: none; color: #875A7B;\">Odoo</a> - <a href=\"/web#view_type=form&amp;model=digest.digest&amp;id=${object.id}\" target=\"_blank\" style=\"color: #888888;\">Unsubscribe</a>\n"
+" </strong>\n"
+" </p>\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: digest
+#: model:digest.tip,tip_description:digest.digest_tip_mail_0
+msgid "${', '.join(users.mapped('name'))} signed up. Say hello in the"
+msgstr ""
+
+#. module: digest
+#: model:digest.tip,tip_description:digest.digest_tip_mail_0
+msgid "% set users = object.env['res.users'].search([], limit=10, order='id desc')\n"
+" % set channel_id = object.env.ref('mail.channel_all_employees').id\n"
+" <strong style=\"font-size: 16px;\">Did you know...?</strong>"
+msgstr ""
+
+#. module: digest
+#: model:digest.tip,tip_description:digest.digest_tip_mail_1
+msgid "<strong style=\"font-size: 16px;\">Get things done with activities</strong>"
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.digest_digest_view_form
+msgid "Activate"
+msgstr ""
+
+#. module: digest
+#: selection:digest.digest,state:0
+msgid "Activated"
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.res_config_settings_view_form
+msgid "Add new users as recipient of a periodic email with key metrics"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_tip__group_id
+msgid "Authorized Group"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest__available_fields
+msgid "Available Fields"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest__company_id
+msgid "Company"
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.res_config_settings_view_form
+msgid "Configure Digest Emails"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest__kpi_res_users_connected
+msgid "Connected Users"
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.digest_digest_view_form
+msgid "Create or edit the mail template: you may get computed KPI's value using these fields:"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest__create_uid
+#: model:ir.model.fields,field_description:digest.field_digest_tip__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest__create_date
+#: model:ir.model.fields,field_description:digest.field_digest_tip__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.digest_digest_view_form
+msgid "Deactivate for everyone"
+msgstr ""
+
+#. module: digest
+#: selection:digest.digest,state:0
+msgid "Deactivated"
+msgstr ""
+
+#. module: digest
+#: model:ir.model,name:digest.model_digest_digest
+msgid "Digest"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_res_config_settings__digest_id
+#: model:ir.ui.view,arch_db:digest.res_config_settings_view_form
+msgid "Digest Email"
+msgstr ""
+
+#. module: digest
+#: model:ir.actions.act_window,name:digest.digest_digest_action
+#: model:ir.actions.server,name:digest.ir_cron_digest_scheduler_action_ir_actions_server
+#: model:ir.cron,cron_name:digest.ir_cron_digest_scheduler_action
+#: model:ir.cron,name:digest.ir_cron_digest_scheduler_action
+#: model:ir.model.fields,field_description:digest.field_res_config_settings__digest_emails
+#: model:ir.ui.menu,name:digest.digest_menu
+msgid "Digest Emails"
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.portal_digest_unsubscribed
+msgid "Digest Subscriptions"
+msgstr ""
+
+#. module: digest
+#: model:ir.model,name:digest.model_digest_tip
+msgid "Digest Tips"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest__display_name
+#: model:ir.model.fields,field_description:digest.field_digest_tip__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest__template_id
+msgid "Email Template"
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.digest_digest_view_form
+msgid "General"
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.digest_digest_view_search
+msgid "Group by"
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.digest_digest_view_form
+msgid "How to customize your digest?"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest__id
+#: model:ir.model.fields,field_description:digest.field_digest_tip__id
+msgid "ID"
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.digest_digest_view_form
+msgid "In order to build your customized digest, follow these steps:"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest__is_subscribed
+msgid "Is user subscribed"
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.digest_digest_view_form
+#: model:ir.ui.view,arch_db:digest.digest_digest_view_tree
+msgid "KPI Digest"
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.digest_digest_view_form
+msgid "KPIs"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest__kpi_mail_message_total_value
+msgid "Kpi Mail Message Total Value"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest__kpi_res_users_connected_value
+msgid "Kpi Res Users Connected Value"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest____last_update
+#: model:ir.model.fields,field_description:digest.field_digest_tip____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest__write_uid
+#: model:ir.model.fields,field_description:digest.field_digest_tip__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest__write_date
+#: model:ir.model.fields,field_description:digest.field_digest_tip__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest__kpi_mail_message_total
+msgid "Messages"
+msgstr ""
+
+#. module: digest
+#: selection:digest.digest,periodicity:0
+msgid "Monthly"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest__name
+msgid "Name"
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.res_config_settings_view_form
+msgid "New users are automatically added as recipient of the following digest email."
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest__next_run_date
+msgid "Next Send Date"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest__periodicity
+#: model:ir.ui.view,arch_db:digest.digest_digest_view_search
+msgid "Periodicity"
+msgstr ""
+
+#. module: digest
+#: selection:digest.digest,periodicity:0
+msgid "Quarterly"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest__user_ids
+#: model:ir.model.fields,field_description:digest.field_digest_tip__user_ids
+msgid "Recipients"
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.digest_digest_view_form
+msgid "Select your KPIs in the KPI's tab."
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.digest_digest_view_form
+msgid "Send Now"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_tip__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_digest__state
+msgid "Status"
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.digest_digest_view_form
+msgid "Subscribe"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,field_description:digest.field_digest_tip__tip_description
+msgid "Tip description"
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.digest_digest_view_form
+msgid "Unsubscribe me"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,help:digest.field_digest_tip__sequence
+msgid "Used to display digest tip in email template base on order"
+msgstr ""
+
+#. module: digest
+#: model:ir.model,name:digest.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: digest
+#: model:ir.model.fields,help:digest.field_digest_tip__user_ids
+msgid "Users having already received this tip"
+msgstr ""
+
+#. module: digest
+#: selection:digest.digest,periodicity:0
+msgid "Weekly"
+msgstr ""
+
+#. module: digest
+#: model:digest.digest,name:digest.digest_digest_default
+msgid "Weekly Digest"
+msgstr ""
+
+#. module: digest
+#: model:digest.tip,tip_description:digest.digest_tip_mail_0
+msgid "You can ping colleagues by tagging them in your messages using \"@\". They will be instantly notified.<br>"
+msgstr ""
+
+#. module: digest
+#: model:digest.tip,tip_description:digest.digest_tip_mail_1
+msgid "You don't have any activity scheduled. Use activities on any business document to schedule meetings, calls and todos."
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.portal_digest_unsubscribed
+msgid "You have been successfully unsubscribed from"
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.digest_digest_view_form
+msgid "You may want to add new computed fields with Odoo Studio:"
+msgstr ""
+
+#. module: digest
+#: model:digest.tip,tip_description:digest.digest_tip_mail_0
+msgid "company's discussion channel."
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.digest_digest_view_form
+msgid "first create a boolean field called\n"
+" <code>x_kpi_myfield</code>\n"
+" and display it in the KPI's tab;"
+msgstr ""
+
+#. module: digest
+#: model:ir.model,name:digest.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.digest_digest_view_form
+msgid "then create a computed field called\n"
+" <code>x_kpi_myfield_value</code>\n"
+" that will compute your customized KPI."
+msgstr ""
+
+#. module: digest
+#: model:ir.ui.view,arch_db:digest.digest_digest_view_form
+msgid "you must create 2 fields on the\n"
+" <code>digest</code>\n"
+" object:"
+msgstr ""
+
diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot
index 0f080dca90e..7d95f3a5bd7 100644
--- a/addons/event/i18n/event.pot
+++ b/addons/event/i18n/event.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -27,6 +27,12 @@ msgid "%s (copy)"
msgstr ""
#. module: event
+#: model:ir.ui.view,arch_db:event.view_event_kanban
+msgid "<b><i class=\"fa fa-clock-o\"/>\n"
+" To</b>"
+msgstr ""
+
+#. module: event
#: model:mail.template,body_html:event.event_registration_mail_template_badge
msgid "<div>\n"
" Dear ${object.name},<br/>\n"
@@ -42,12 +48,6 @@ msgid "<div>\n"
msgstr ""
#. module: event
-#: model:ir.ui.view,arch_db:event.view_event_kanban
-msgid "<i class=\"fa fa-clock-o\"/>\n"
-" <b>To</b>"
-msgstr ""
-
-#. module: event
#: model:ir.ui.view,arch_db:event.event_event_report_template_badge
#: model:ir.ui.view,arch_db:event.event_registration_report_template_badge
msgid "<i>to</i>"
@@ -56,11 +56,16 @@ msgstr ""
#. module: event
#: model:ir.ui.view,arch_db:event.view_event_form
msgid "<span attrs=\"{'invisible': [('seats_availability', '=', 'unlimited')]}\" class=\"oe_read_only\">\n"
-" to \n"
+" to\n"
" </span>"
msgstr ""
#. module: event
+#: model:ir.ui.view,arch_db:event.view_event_confirm
+msgid "<span class=\"o_form_label\">Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?</span>"
+msgstr ""
+
+#. module: event
#: model:mail.template,body_html:event.event_subscription
msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
"% set date_begin = format_tz(object.event_id.date_begin, tz='UTC', format='%Y%m%dT%H%M%SZ')\n"
@@ -131,7 +136,7 @@ msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-t
" <table style=\"width:100%;\">\n"
" <tr>\n"
" <td style=\"vertical-align:top;\">\n"
-" <img src=\"/web_editor/font_to_img/61555/rgb(81,81,102)/34\" style=\"padding:4px;max-width:inherit;\" height=\"34\"/>\n"
+" <img src=\"/web_editor/font_to_img/61555/rgb(81,81,102)/34\" style=\"padding:4px;max-width:inherit;\" height=\"34\" alt=\"\"/>\n"
" </td>\n"
" <td style=\"padding: 0px 10px 0px 10px;width:50%;line-height:20px;vertical-align:top;\">\n"
" <div><strong>From</strong> ${object.event_id.date_begin_located}</div>\n"
@@ -140,7 +145,7 @@ msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-t
" </td>\n"
" % if object.event_id.address_id.country_id.name:\n"
" <td style=\"vertical-align:top;\">\n"
-" <img src=\"/web_editor/font_to_img/61505/rgb(81,81,102)/34\" style=\"padding:4px;max-width:inherit;\" height=\"34\"/>\n"
+" <img src=\"/web_editor/font_to_img/61505/rgb(81,81,102)/34\" style=\"padding:4px;max-width:inherit;\" height=\"34\" alt=\"\"/>\n"
" </td>\n"
" <td style=\"padding: 0px 10px 0px 10px;width:50%;vertical-align:top;\">\n"
" % set location = ''\n"
@@ -203,10 +208,10 @@ msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-t
" <tr>\n"
" <td style=\"padding:25px 0px;\">\n"
" <strong>Add this event to your calendar</strong>\n"
-" <a href=\"https://www.google.com/calendar/render?action=TEMPLATE&amp;text=${object.event_id.name}&amp;dates=${date_begin}/${date_end}&amp;location=${location}\" style=\"padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;\" target=\"new\"><img src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-align:middle;\" height=\"16\"/> Google</a>\n"
-" <a href=\"https://bay02.calendar.live.com/calendar/calendar.aspx?rru=addevent&amp;summary=${object.event_id.name}&amp;dtstart=${date_begin}&amp;dtend=${date_end}&amp;location=${location}\" style=\"padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;\" target=\"new\"><img src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-align:middle;\" height=\"16\"/> Outlook</a>\n"
+" <a href=\"https://www.google.com/calendar/render?action=TEMPLATE&amp;text=${object.event_id.name}&amp;dates=${date_begin}/${date_end}&amp;location=${location}\" style=\"padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;\" target=\"new\"><img src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-align:middle;\" height=\"16\" alt=\"\"/> Google</a>\n"
+" <a href=\"https://bay02.calendar.live.com/calendar/calendar.aspx?rru=addevent&amp;summary=${object.event_id.name}&amp;dtstart=${date_begin}&amp;dtend=${date_end}&amp;location=${location}\" style=\"padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;\" target=\"new\"><img src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-align:middle;\" height=\"16\" alt=\"\"/> Outlook</a>\n"
" <a href=\"https://calendar.yahoo.com/?v=60&amp;view=d&amp;type=20&amp;title=${object.event_id.name}&amp;in_loc=${location}&amp;st=${format_tz(object.event_id.date_begin, tz='UTC', format='%Y%m%dT%H%M%S')}&amp;et=${format_tz(object.event_id.date_end, tz='UTC', format='%Y%m%dT%H%M%S')}\" style=\"padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;\" target=\"new\">\n"
-" <img src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-align:middle;\" height=\"16\"/> Yahoo</a>\n"
+" <img src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-align:middle;\" height=\"16\" alt=\"\"/> Yahoo</a>\n"
" </td>\n"
" </tr>\n"
" </table>\n"
@@ -219,7 +224,7 @@ msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-t
" <table style=\"width:100%;\"><tr><td>\n"
" <div>\n"
" <a href=\"https://maps.google.com/maps?q=${location}\" target=\"new\">\n"
-" <img src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&amp;size=598x200&amp;maptype=roadmap&amp;format=png&amp;visual_refresh=true&amp;markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\" style=\"vertical-align:bottom; width: 100%;\"/>\n"
+" <img src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&amp;size=598x200&amp;maptype=roadmap&amp;format=png&amp;visual_refresh=true&amp;markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\" style=\"vertical-align:bottom; width: 100%;\" alt=\"Google Maps\"/>\n"
" </a>\n"
" </div>\n"
" </td></tr></table>\n"
@@ -318,7 +323,7 @@ msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-t
" <table style=\"width:100%;\">\n"
" <tr>\n"
" <td style=\"vertical-align:top;\">\n"
-" <img src=\"/web_editor/font_to_img/61555/rgb(81,81,102)/34\" style=\"padding:4px;max-width:inherit;\" height=\"34\"/>\n"
+" <img src=\"/web_editor/font_to_img/61555/rgb(81,81,102)/34\" style=\"padding:4px;max-width:inherit;\" height=\"34\" alt=\"\"/>\n"
" </td>\n"
" <td style=\"padding: 0px 10px 0px 10px;width:50%;line-height:20px;vertical-align:top;\">\n"
" <div><strong>From</strong> ${object.event_id.date_begin_located}</div>\n"
@@ -327,7 +332,7 @@ msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-t
" </td>\n"
" % if object.event_id.address_id.country_id.name:\n"
" <td style=\"vertical-align:top;\">\n"
-" <img src=\"/web_editor/font_to_img/61505/rgb(81,81,102)/34\" style=\"padding:4px;max-width:inherit;\" height=\"34\"/>\n"
+" <img src=\"/web_editor/font_to_img/61505/rgb(81,81,102)/34\" style=\"padding:4px;max-width:inherit;\" height=\"34\" alt=\"\"/>\n"
" </td>\n"
" <td style=\"padding: 0px 10px 0px 10px;width:50%;vertical-align:top;\">\n"
" % set location = ''\n"
@@ -390,10 +395,9 @@ msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-t
" <tr>\n"
" <td style=\"padding:25px 0px;\">\n"
" <strong>Add this event to your calendar</strong>\n"
-" <a href=\"https://www.google.com/calendar/render?action=TEMPLATE&amp;text=${object.event_id.name}&amp;dates=${date_begin}/${date_end}&amp;location=${location}\" style=\"padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;\" target=\"new\"><img src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-align:middle;\" height=\"16\"/> Google</a>\n"
-" <a href=\"https://bay02.calendar.live.com/calendar/calendar.aspx?rru=addevent&amp;summary=${object.event_id.name}&amp;dtstart=${date_begin}&amp;dtend=${date_end}&amp;location=${location}\" style=\"padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;\" target=\"new\"><img src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-align:middle;\" height=\"16\"/> Outlook</a>\n"
+" <a href=\"https://www.google.com/calendar/render?action=TEMPLATE&amp;text=${object.event_id.name}&amp;dates=${date_begin}/${date_end}&amp;location=${location}\" style=\"padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;\" target=\"new\"><img src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-align:middle;\" height=\"16\" alt=\"\"/> Google</a>\n"
" <a href=\"https://calendar.yahoo.com/?v=60&amp;view=d&amp;type=20&amp;title=${object.event_id.name}&amp;in_loc=${location}&amp;st=${format_tz(object.event_id.date_begin, tz='UTC', format='%Y%m%dT%H%M%S')}&amp;et=${format_tz(object.event_id.date_end, tz='UTC', format='%Y%m%dT%H%M%S')}\" style=\"padding:3px 5px;border:1px solid #875A7B;color:#875A7B;text-decoration:none;border-radius:3px;\" target=\"new\">\n"
-" <img src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-align:middle;\" height=\"16\"/> Yahoo</a>\n"
+" <img src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-align:middle;\" height=\"16\" alt=\"\"/> Yahoo</a>\n"
" </td>\n"
" </tr>\n"
" </table>\n"
@@ -406,7 +410,7 @@ msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-t
" <table style=\"width:100%;\"><tr><td>\n"
" <div>\n"
" <a href=\"https://maps.google.com/maps?q=${location}\" target=\"new\">\n"
-" <img src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&amp;size=598x200&amp;maptype=roadmap&amp;format=png&amp;visual_refresh=true&amp;markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\" style=\"vertical-align:bottom; width: 100%;\"/>\n"
+" <img src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&amp;size=598x200&amp;maptype=roadmap&amp;format=png&amp;visual_refresh=true&amp;markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\" style=\"vertical-align:bottom; width: 100%;\" alt=\"Google Maps\"/>\n"
" </a>\n"
" </div>\n"
" </td></tr></table>\n"
@@ -490,11 +494,13 @@ msgstr ""
#. module: event
#: selection:event.registration,state:0
#: model:ir.ui.view,arch_db:event.view_event_registration_form
+#: model:ir.ui.view,arch_db:event.view_registration_search
msgid "Attended"
msgstr ""
#. module: event
#: model:ir.model.fields,field_description:event.field_event_registration__date_closed
+#: model:ir.ui.view,arch_db:event.view_registration_search
msgid "Attended Date"
msgstr ""
@@ -616,7 +622,7 @@ msgid "Company"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:493
+#: code:addons/event/models/event.py:504
#, python-format
msgid "Compose Email"
msgstr ""
@@ -650,6 +656,7 @@ msgstr ""
#: selection:event.event,state:0
#: selection:event.registration,state:0
#: model:ir.ui.view,arch_db:event.view_event_search
+#: model:ir.ui.view,arch_db:event.view_registration_search
msgid "Confirmed"
msgstr ""
@@ -746,6 +753,11 @@ msgid "Done"
msgstr ""
#. module: event
+#: model:ir.ui.view,arch_db:event.view_event_kanban
+msgid "Dropdown menu"
+msgstr ""
+
+#. module: event
#: model:ir.model.fields,field_description:event.field_event_registration__email
msgid "Email"
msgstr ""
@@ -874,6 +886,7 @@ msgstr ""
#. module: event
#: model:ir.model.fields,field_description:event.field_event_registration__event_begin_date
+#: model:ir.ui.view,arch_db:event.view_registration_search
msgid "Event Start Date"
msgstr ""
@@ -1107,6 +1120,12 @@ msgid "Location"
msgstr ""
#. module: event
+#: model:ir.ui.view,arch_db:event.event_event_report_template_badge
+#: model:ir.ui.view,arch_db:event.event_registration_report_template_badge
+msgid "Logo"
+msgstr ""
+
+#. module: event
#: model:ir.model.fields,field_description:event.field_event_mail__mail_registration_ids
msgid "Mail Registration"
msgstr ""
@@ -1475,11 +1494,6 @@ msgid "Status"
msgstr ""
#. module: event
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr ""
-
-#. module: event
#: code:addons/event/models/event.py:269
#, python-format
msgid "The closing date cannot be earlier than the beginning date."
@@ -1533,6 +1547,7 @@ msgstr ""
#: selection:event.event,state:0
#: selection:event.registration,state:0
#: model:ir.ui.view,arch_db:event.view_event_search
+#: model:ir.ui.view,arch_db:event.view_registration_search
msgid "Unconfirmed"
msgstr ""
@@ -1608,11 +1623,6 @@ msgid "WARNING: Event Scheduler Error for event: %s"
msgstr ""
#. module: event
-#: model:ir.ui.view,arch_db:event.view_event_confirm
-msgid "Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"
-msgstr ""
-
-#. module: event
#: selection:event.mail,interval_unit:0
#: selection:event.type.mail,interval_unit:0
msgid "Week(s)"
@@ -1651,25 +1661,25 @@ msgid "event.confirm"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:515
+#: code:addons/event/models/event.py:526
#, python-format
msgid "in %d days"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:519
+#: code:addons/event/models/event.py:530
#, python-format
msgid "next month"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:517
+#: code:addons/event/models/event.py:528
#, python-format
msgid "next week"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:521
+#: code:addons/event/models/event.py:532
#, python-format
msgid "on "
msgstr ""
@@ -1680,13 +1690,13 @@ msgid "res.config.settings"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:511
+#: code:addons/event/models/event.py:522
#, python-format
msgid "today"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:513
+#: code:addons/event/models/event.py:524
#, python-format
msgid "tomorrow"
msgstr ""
diff --git a/addons/event_sale/i18n/event_sale.pot b/addons/event_sale/i18n/event_sale.pot
index f0c0541213f..7e91475439e 100644
--- a/addons/event_sale/i18n/event_sale.pot
+++ b/addons/event_sale/i18n/event_sale.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -144,11 +144,12 @@ msgstr ""
#. module: event_sale
#: model:ir.ui.view,arch_db:event_sale.event_sale_product_template_form
+#: model:product.category,name:event_sale.product_category_events
msgid "Events"
msgstr ""
#. module: event_sale
-#: code:addons/event_sale/models/event.py:228
+#: code:addons/event_sale/models/event.py:254
#, python-format
msgid "Free"
msgstr ""
@@ -209,7 +210,7 @@ msgid "Maximum Available Seats"
msgstr ""
#. module: event_sale
-#: code:addons/event_sale/models/event.py:223
+#: code:addons/event_sale/models/event.py:249
#: model:ir.model.fields,field_description:event_sale.field_event_event_ticket__name
#: model:ir.model.fields,field_description:event_sale.field_registration_editor_line__name
#, python-format
@@ -217,7 +218,7 @@ msgid "Name"
msgstr ""
#. module: event_sale
-#: code:addons/event_sale/models/event.py:179
+#: code:addons/event_sale/models/event.py:205
#, python-format
msgid "No more available seats for this ticket"
msgstr ""
@@ -229,7 +230,7 @@ msgid "No more available seats for this ticket type."
msgstr ""
#. module: event_sale
-#: code:addons/event_sale/models/event.py:224
+#: code:addons/event_sale/models/event.py:250
#, python-format
msgid "None"
msgstr ""
@@ -245,13 +246,13 @@ msgid "Original Registration"
msgstr ""
#. module: event_sale
-#: code:addons/event_sale/models/event.py:233
+#: code:addons/event_sale/models/event.py:259
#, python-format
msgid "Paid"
msgstr ""
#. module: event_sale
-#: code:addons/event_sale/models/event.py:234
+#: code:addons/event_sale/models/event.py:260
#, python-format
msgid "Payment"
msgstr ""
@@ -360,13 +361,13 @@ msgid "Source Sales Order"
msgstr ""
#. module: event_sale
-#: code:addons/event_sale/models/event.py:231
+#: code:addons/event_sale/models/event.py:257
#, python-format
msgid "The registration must be paid"
msgstr ""
#. module: event_sale
-#: code:addons/event_sale/models/event.py:224
+#: code:addons/event_sale/models/event.py:250
#, python-format
msgid "Ticket"
msgstr ""
@@ -396,7 +397,7 @@ msgid "Tickets"
msgstr ""
#. module: event_sale
-#: code:addons/event_sale/models/event.py:230
+#: code:addons/event_sale/models/event.py:256
#, python-format
msgid "To pay"
msgstr ""
@@ -407,6 +408,12 @@ msgid "Unconfirmed Seat Reservations"
msgstr ""
#. module: event_sale
+#: model:product.product,uom_name:event_sale.product_product_event
+#: model:product.template,uom_name:event_sale.product_product_event_product_template
+msgid "Unit(s)"
+msgstr ""
+
+#. module: event_sale
#: selection:event.event.ticket,seats_availability:0
msgid "Unlimited"
msgstr ""
diff --git a/addons/fleet/i18n/fleet.pot b/addons/fleet/i18n/fleet.pot
index 052e3d2f0bd..66b2272d2d5 100644
--- a/addons/fleet/i18n/fleet.pot
+++ b/addons/fleet/i18n/fleet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:06+0000\n"
+"PO-Revision-Date: 2018-08-24 09:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -101,6 +101,11 @@ msgid "Assignation Logs"
msgstr ""
#. module: fleet
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_kanban
+msgid "Attention: renewal overdue"
+msgstr ""
+
+#. module: fleet
#: selection:fleet.vehicle,transmission:0
msgid "Automatic"
msgstr ""
@@ -114,6 +119,11 @@ msgid "Automatically Generated"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__brand_id
+msgid "Brand"
+msgstr ""
+
+#. module: fleet
#: model:ir.model,name:fleet.model_fleet_vehicle_model_brand
msgid "Brand of the vehicle"
msgstr ""
@@ -971,10 +981,12 @@ msgstr ""
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model__brand_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_brand__name
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_view_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_search
msgid "Make"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle__brand_id
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_model__brand_id
msgid "Make of the vehicle"
msgstr ""
@@ -1127,7 +1139,7 @@ msgid "No"
msgstr ""
#. module: fleet
-#: code:addons/fleet/models/fleet_vehicle.py:84
+#: code:addons/fleet/models/fleet_vehicle.py:85
#, python-format
msgid "No Plate"
msgstr ""
@@ -1265,6 +1277,11 @@ msgid "Odoo helps you managing the costs for your different vehicles\n"
msgstr ""
#. module: fleet
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_brand_view_kanban
+msgid "Open"
+msgstr ""
+
+#. module: fleet
#: selection:fleet.vehicle.cost,cost_type:0
msgid "Other"
msgstr ""
@@ -1348,7 +1365,7 @@ msgid "Refueling Details"
msgstr ""
#. module: fleet
-#: code:addons/fleet/models/fleet_vehicle_cost.py:201
+#: code:addons/fleet/models/fleet_vehicle_cost.py:209
#: model:ir.actions.act_window,name:fleet.act_renew_contract
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
#, python-format
@@ -1647,6 +1664,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_view_search
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_odometer_view_search
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_kanban
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_search
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_tree
msgid "Vehicle"
@@ -1769,6 +1787,11 @@ msgid "Warning Date"
msgstr ""
#. module: fleet
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_kanban
+msgid "Warning: renewal due soon"
+msgstr ""
+
+#. module: fleet
#: selection:fleet.vehicle.log.contract,cost_frequency:0
msgid "Weekly"
msgstr ""
diff --git a/addons/gamification/i18n/gamification.pot b/addons/gamification/i18n/gamification.pot
index 3e58efd2ee9..19127354817 100644
--- a/addons/gamification/i18n/gamification.pot
+++ b/addons/gamification/i18n/gamification.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -121,7 +121,7 @@ msgid "<?xml version=\"1.0\"?>\n"
"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
" <table width=\"590\" border=\"0\" cellpadding=\"0\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
" <tr><td style=\"text-align: center; font-size: 14px;\">\n"
-" Powered by <a target=\"_blank\" href=\"https://www.odoo.com\" style=\"color: #875A7B;\">Odoo</a>\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=gamification\" style=\"color: #875A7B;\">Odoo</a>\n"
" </td></tr>\n"
" </table>\n"
"</td></tr>\n"
@@ -1244,6 +1244,11 @@ msgid "Mail Group Following"
msgstr ""
#. module: gamification
+#: model:ir.ui.view,arch_db:gamification.view_challenge_kanban
+msgid "Member"
+msgstr ""
+
+#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_badge__message_has_error
#: model:ir.model.fields,field_description:gamification.field_gamification_challenge__message_has_error
msgid "Message Delivery error"
@@ -1429,6 +1434,11 @@ msgid "Optimisation"
msgstr ""
#. module: gamification
+#: model:ir.ui.view,arch_db:gamification.badge_kanban_view
+msgid "Owner"
+msgstr ""
+
+#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_badge__owner_ids
msgid "Owners"
msgstr ""
diff --git a/addons/google_calendar/i18n/google_calendar.pot b/addons/google_calendar/i18n/google_calendar.pot
index 79c33797ad3..74d08017a98 100644
--- a/addons/google_calendar/i18n/google_calendar.pot
+++ b/addons/google_calendar/i18n/google_calendar.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:10+0000\n"
-"PO-Revision-Date: 2018-03-22 14:10+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,11 +21,6 @@ msgid "<i class=\"fa fa-fw fa-arrow-right\"/>Tutorial"
msgstr ""
#. module: google_calendar
-#: model:ir.ui.menu,name:google_calendar.menu_calendar_google_tech_config
-msgid "API Credentials"
-msgstr ""
-
-#. module: google_calendar
#. openerp-web
#: code:addons/google_calendar/static/src/js/google_calendar.js:89
#, python-format
@@ -54,11 +49,6 @@ msgid "An error occured while disconnecting events from your previous account. P
msgstr ""
#. module: google_calendar
-#: model:ir.model,name:google_calendar.model_calendar_attendee
-msgid "Attendee information"
-msgstr ""
-
-#. module: google_calendar
#: model:ir.ui.view,arch_db:google_calendar.view_users_form
msgid "Calendar"
msgstr ""
@@ -69,6 +59,11 @@ msgid "Calendar ID"
msgstr ""
#. module: google_calendar
+#: model:ir.model,name:google_calendar.model_calendar_attendee
+msgid "Calendar Registration"
+msgstr ""
+
+#. module: google_calendar
#: model:ir.ui.view,arch_db:google_calendar.res_config_settings_view_form
msgid "Client ID"
msgstr ""
diff --git a/addons/google_drive/i18n/google_drive.pot b/addons/google_drive/i18n/google_drive.pot
index 01312d05b2c..b7e786c0586 100644
--- a/addons/google_drive/i18n/google_drive.pot
+++ b/addons/google_drive/i18n/google_drive.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -213,9 +213,9 @@ msgstr ""
#. module: google_drive
#: model:ir.ui.view,arch_db:google_drive.view_google_drive_config_form
msgid "The name of the attached document can use fixed or variable data. To distinguish between documents in\n"
-" Google Drive, use fixed words and fields. For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+" Google Drive, use fixed words and fields. For instance, in the example above, if you wrote Deco_Addict_%(name)s_Sales\n"
" in the Google Drive name field, the document in your Google Drive and in Odoo attachment will be named\n"
-" 'Agrolait_SO0001_Sales'."
+" 'Deco_Addict_SO0001_Sales'."
msgstr ""
#. module: google_drive
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index 13144cc100b..ddcf55f0944 100644
--- a/addons/hr/i18n/hr.pot
+++ b/addons/hr/i18n/hr.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:12+0000\n"
-"PO-Revision-Date: 2018-08-02 09:12+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -42,6 +42,37 @@ msgid "<span>To Do</span>"
msgstr ""
#. module: hr
+#: model:mail.template,body_html:hr.mail_template_data_unknown_employee_email_address
+msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div>\n"
+" Hi,<br/>\n"
+" Your document has not been created because your email address is not recognized. Please send emails with the email address recorded on your employee information, or contact your HR manager.\n"
+" </div>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td></tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=hr\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_department__message_needaction
#: model:ir.model.fields,field_description:hr.field_hr_employee__message_needaction
#: model:ir.model.fields,field_description:hr.field_hr_job__message_needaction
@@ -371,7 +402,6 @@ msgstr ""
#: model:ir.model.fields,field_description:hr.field_hr_department__message_follower_ids
#: model:ir.model.fields,field_description:hr.field_hr_employee__message_follower_ids
#: model:ir.model.fields,field_description:hr.field_hr_job__message_follower_ids
-#: model:ir.ui.view,arch_db:hr.hr_kanban_view_employees
msgid "Followers"
msgstr ""
@@ -466,6 +496,12 @@ msgid "If the active field is set to False, it will allow you to hide the resour
msgstr ""
#. module: hr
+#: code:addons/hr/models/hr.py:279
+#, python-format
+msgid "Import Template for Employees"
+msgstr ""
+
+#. module: hr
#: model:ir.ui.view,arch_db:hr.view_job_filter
msgid "In Position"
msgstr ""
@@ -611,7 +647,6 @@ msgstr ""
#: model:ir.model.fields,field_description:hr.field_hr_department__message_ids
#: model:ir.model.fields,field_description:hr.field_hr_employee__message_ids
#: model:ir.model.fields,field_description:hr.field_hr_job__message_ids
-#: model:ir.ui.view,arch_db:hr.hr_kanban_view_employees
msgid "Messages"
msgstr ""
@@ -1019,7 +1054,6 @@ msgstr ""
#: model:ir.model.fields,field_description:hr.field_hr_department__message_unread
#: model:ir.model.fields,field_description:hr.field_hr_employee__message_unread
#: model:ir.model.fields,field_description:hr.field_hr_job__message_unread
-#: model:ir.ui.view,arch_db:hr.hr_kanban_view_employees
#: model:ir.ui.view,arch_db:hr.view_department_filter
#: model:ir.ui.view,arch_db:hr.view_employee_filter
#: model:ir.ui.view,arch_db:hr.view_job_filter
@@ -1135,7 +1169,7 @@ msgid "You cannot create a recursive hierarchy."
msgstr ""
#. module: hr
-#: code:addons/hr/models/hr.py:307
+#: code:addons/hr/models/hr.py:314
#, python-format
msgid "You cannot create recursive departments."
msgstr ""
@@ -1146,11 +1180,6 @@ msgid "Your document has not been created"
msgstr ""
#. module: hr
-#: model:mail.template,body_html:hr.mail_template_data_unknown_employee_email_address
-msgid "Your document has not been created because your email address is not recognized. Please send emails with the email address recorded on your employee information, or contact your HR manager."
-msgstr ""
-
-#. module: hr
#: model:ir.ui.view,arch_db:hr.view_department_form
msgid "department"
msgstr ""
diff --git a/addons/hr_attendance/i18n/hr_attendance.pot b/addons/hr_attendance/i18n/hr_attendance.pot
index 917d52dbbd2..f1a41ff018d 100644
--- a/addons/hr_attendance/i18n/hr_attendance.pot
+++ b/addons/hr_attendance/i18n/hr_attendance.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:12+0000\n"
-"PO-Revision-Date: 2018-08-02 09:12+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,19 +16,19 @@ msgstr ""
"Plural-Forms: \n"
#. module: hr_attendance
-#: code:addons/hr_attendance/models/hr_attendance.py:56
+#: code:addons/hr_attendance/models/hr_attendance.py:52
#, python-format
msgid "\"Check Out\" time cannot be earlier than \"Check In\" time."
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/models/hr_attendance.py:30
+#: code:addons/hr_attendance/models/hr_attendance.py:27
#, python-format
msgid "%(empl_name)s from %(check_in)s"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/models/hr_attendance.py:35
+#: code:addons/hr_attendance/models/hr_attendance.py:32
#, python-format
msgid "%(empl_name)s from %(check_in)s to %(check_out)s"
msgstr ""
@@ -41,6 +41,11 @@ msgid "<b>Warning! Last check in was over 12 hours ago.</b><br/>If this isn't ri
msgstr ""
#. module: hr_attendance
+#: model:ir.ui.view,arch_db:hr_attendance.res_config_settings_view_form
+msgid "<span class=\"o_form_label\">Employee PIN</span>"
+msgstr ""
+
+#. module: hr_attendance
#: model:ir.ui.view,arch_db:hr_attendance.view_employee_form_inherit_hr_attendance
msgid "<span class=\"o_stat_text\">Attendance</span>"
msgstr ""
@@ -99,19 +104,27 @@ msgid "Attendances"
msgstr ""
#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:4
+#: model:ir.ui.view,arch_db:hr_attendance.view_employee_form_inherit_hr_attendance
+#, python-format
+msgid "Available"
+msgstr ""
+
+#. module: hr_attendance
#: model:ir.model.fields,field_description:hr_attendance.field_hr_employee__barcode
msgid "Badge ID"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/models/hr_attendance.py:86
+#: code:addons/hr_attendance/models/hr_attendance.py:82
#, python-format
msgid "Cannot create new attendance record for %(empl_name)s, the employee hasn't checked out since %(datetime)s"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/models/hr_attendance.py:73
-#: code:addons/hr_attendance/models/hr_attendance.py:99
+#: code:addons/hr_attendance/models/hr_attendance.py:69
+#: code:addons/hr_attendance/models/hr_attendance.py:95
#, python-format
msgid "Cannot create new attendance record for %(empl_name)s, the employee was already checked in on %(datetime)s"
msgstr ""
@@ -139,6 +152,11 @@ msgid "Check In / Check Out"
msgstr ""
#. module: hr_attendance
+#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
+msgid "Check In Date"
+msgstr ""
+
+#. module: hr_attendance
#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance__check_out
msgid "Check Out"
msgstr ""
@@ -155,7 +173,7 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:122
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:124
#, python-format
msgid "Checked in at"
msgstr ""
@@ -167,15 +185,15 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:113
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:115
#, python-format
msgid "Checked out at"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:46
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:73
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:47
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:75
#, python-format
msgid "Click to"
msgstr ""
@@ -210,11 +228,6 @@ msgstr ""
#. module: hr_attendance
#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
-msgid "Current Month"
-msgstr ""
-
-#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
msgid "Date"
msgstr ""
@@ -246,6 +259,7 @@ msgstr ""
#: model:ir.model,name:hr_attendance.model_hr_employee
#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance__employee_id
#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
+#: model:ir.ui.view,arch_db:hr_attendance.hr_employees_view_kanban
msgid "Employee"
msgstr ""
@@ -256,7 +270,6 @@ msgstr ""
#. module: hr_attendance
#: model:ir.model.fields,field_description:hr_attendance.field_res_config_settings__group_attendance_use_pin
-#: model:ir.ui.view,arch_db:hr_attendance.res_config_settings_view_form
msgid "Employee PIN"
msgstr ""
@@ -285,21 +298,7 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/my_attendances.js:29
-#, python-format
-msgid "Error : Could not find employee linked to user"
-msgstr ""
-
-#. module: hr_attendance
-#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:48
-#, python-format
-msgid "Error : Could not find employee linked to user."
-msgstr ""
-
-#. module: hr_attendance
-#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:94
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:96
#, python-format
msgid "Error: could not find corresponding employee."
msgstr ""
@@ -320,8 +319,9 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:62
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:135
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:63
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:64
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:137
#, python-format
msgid "Go back"
msgstr ""
@@ -357,8 +357,8 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:111
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:129
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:113
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:131
#, python-format
msgid "Goodbye"
msgstr ""
@@ -420,7 +420,7 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:134
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:136
#, python-format
msgid "Invalid request, please return to the main menu."
msgstr ""
@@ -499,8 +499,13 @@ msgid "No employee corresponding to barcode %(barcode)s"
msgstr ""
#. module: hr_attendance
+#: model:ir.ui.view,arch_db:hr_attendance.view_employee_form_inherit_hr_attendance
+msgid "Not available"
+msgstr ""
+
+#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:130
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:132
#, python-format
msgid "OK"
msgstr ""
@@ -522,14 +527,14 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:76
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:78
#, python-format
msgid "Please enter your PIN to"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:94
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:96
#, python-format
msgid "Please return to the main menu."
msgstr ""
@@ -569,6 +574,23 @@ msgid "Settings"
msgstr ""
#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:46
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:74
+#, python-format
+msgid "Sign in"
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:45
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:73
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:98
+#, python-format
+msgid "Sign out"
+msgstr ""
+
+#. module: hr_attendance
#: model:ir.ui.view,arch_db:hr_attendance.view_employee_filter_inherit_hr_attendance
msgid "Signed In"
msgstr ""
@@ -620,11 +642,6 @@ msgid "The user will have to enter his PIN to check in and out manually at the c
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
-msgid "Today"
-msgstr ""
-
-#. module: hr_attendance
#: model:ir.ui.view,arch_db:hr_attendance.res_config_settings_view_form
msgid "Use PIN codes to check in in Kiosk Mode"
msgstr ""
@@ -637,14 +654,21 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
#: code:addons/hr_attendance/static/src/xml/attendance.xml:44
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:70
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:71
#, python-format
msgid "Want to check out?"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:120
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:49
+#, python-format
+msgid "Warning : Your user should be linked to an employee to use attendance. Please contact your administrator."
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:122
#, python-format
msgid "Welcome"
msgstr ""
@@ -659,7 +683,7 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
#: code:addons/hr_attendance/static/src/xml/attendance.xml:44
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:70
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:71
#, python-format
msgid "Welcome!"
msgstr ""
@@ -676,25 +700,30 @@ msgid "Wrong PIN"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/models/hr_attendance.py:107
+#: code:addons/hr_attendance/models/hr_attendance.py:103
#, python-format
msgid "You cannot duplicate an attendance."
msgstr ""
#. module: hr_attendance
+#: model:ir.ui.view,arch_db:hr_attendance.print_employee_badge
+msgid "barcode"
+msgstr ""
+
+#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:46
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:73
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:76
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:47
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:75
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:78
#, python-format
msgid "check in"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:46
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:73
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:76
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:47
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:75
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:78
#, python-format
msgid "check out"
msgstr ""
diff --git a/addons/hr_contract/i18n/hr_contract.pot b/addons/hr_contract/i18n/hr_contract.pot
index 8e5e205c940..08cdae032e5 100644
--- a/addons/hr_contract/i18n/hr_contract.pot
+++ b/addons/hr_contract/i18n/hr_contract.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -197,6 +197,11 @@ msgstr ""
#. module: hr_contract
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_kanban
+msgid "Dropdown menu"
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_kanban
msgid "Edit Contract"
msgstr ""
diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot
index 0fed92484c7..4eb51f01897 100644
--- a/addons/hr_expense/i18n/hr_expense.pot
+++ b/addons/hr_expense/i18n/hr_expense.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:12+0000\n"
-"PO-Revision-Date: 2018-08-02 09:12+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -93,7 +93,7 @@ msgid "<strong>Validated By:</strong>"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/wizard/hr_expense_sheet_register_payment.py:83
+#: code:addons/hr_expense/wizard/hr_expense_sheet_register_payment.py:104
#, python-format
msgid "A payment of %s %s with the reference <a href='/mail/view?%s'>%s</a> related to your expense %s has been made."
msgstr ""
@@ -104,11 +104,6 @@ msgid "Account"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_accountant
-msgid "Accountant"
-msgstr ""
-
-#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.product_product_expense_form_view
msgid "Accounting"
msgstr ""
@@ -263,7 +258,6 @@ msgid "Confirmed Expenses"
msgstr ""
#. module: hr_expense
-#: model:ir.actions.server,name:hr_expense.hr_expense_submit_action_server
#: model:ir.ui.view,arch_db:hr_expense.hr_expense_view_form
msgid "Create Report"
msgstr ""
@@ -456,7 +450,7 @@ msgid "Expense Report Summary"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_my_reports
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_report
#: model:ir.ui.view,arch_db:hr_expense.hr_department_view_kanban
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_tree
@@ -469,19 +463,12 @@ msgid "Expense Reports Analysis"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_to_approve
-msgid "Expense Reports To Approve"
-msgstr ""
-
-#. module: hr_expense
#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_all_to_pay
-#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_to_pay
msgid "Expense Reports To Pay"
msgstr ""
#. module: hr_expense
#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_all_to_post
-#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_to_post
msgid "Expense Reports To Post"
msgstr ""
@@ -572,13 +559,13 @@ msgid "Expenses in Draft"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:567
+#: code:addons/hr_expense/models/hr_expense.py:569
#, python-format
msgid "Expenses must be paid by the same entity (Company or employee)."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:622
+#: code:addons/hr_expense/models/hr_expense.py:624
#, python-format
msgid "Expenses must have an expense journal specified to generate accounting entries."
msgstr ""
@@ -600,11 +587,6 @@ msgid "Expenses to Process"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_my_expenses_to_submit
-msgid "Expenses to Submit"
-msgstr ""
-
-#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__is_refused
msgid "Explicitely Refused by manager or acccountant"
msgstr ""
@@ -795,19 +777,20 @@ msgid "Messages"
msgstr ""
#. module: hr_expense
+#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_my_all
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_my_reports
+msgid "My Expense Reports"
+msgstr ""
+
+#. module: hr_expense
#: model:ir.actions.act_window,name:hr_expense.hr_expense_actions_my_unsubmitted
#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_my_expenses
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_my_expenses_to_submit
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
msgid "My Expenses"
msgstr ""
#. module: hr_expense
-#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_my_refused
-msgid "My Refused Reports"
-msgstr ""
-
-#. module: hr_expense
-#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_my_all
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
msgid "My Reports"
msgstr ""
@@ -828,23 +811,12 @@ msgid "Name"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
-msgid "New Expense"
-msgstr ""
-
-#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:185
+#: code:addons/hr_expense/models/hr_expense.py:187
#, python-format
msgid "New Expense Report"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
-#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
-msgid "New Mail"
-msgstr ""
-
-#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__activity_date_deadline
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__activity_date_deadline
msgid "Next Activity Deadline"
@@ -863,13 +835,13 @@ msgid "Next Activity Type"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:243
+#: code:addons/hr_expense/models/hr_expense.py:245
#, python-format
msgid "No Expense account found for the product %s (or for its category), please configure one."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:260
+#: code:addons/hr_expense/models/hr_expense.py:262
#, python-format
msgid "No Home Address found for the employee %s, please configure one."
msgstr ""
@@ -880,8 +852,8 @@ msgid "No approved employee expenses"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:256
-#: code:addons/hr_expense/models/hr_expense.py:367
+#: code:addons/hr_expense/models/hr_expense.py:258
+#: code:addons/hr_expense/models/hr_expense.py:369
#, python-format
msgid "No credit account found for the %s journal, please configure one."
msgstr ""
@@ -892,21 +864,11 @@ msgid "No expense reports to approve"
msgstr ""
#. module: hr_expense
-#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_my_refused
-msgid "No refused reports to display"
-msgstr ""
-
-#. module: hr_expense
#: model:ir.actions.act_window,help:hr_expense.action_unsubmitted_expense
msgid "No unreported employee expenses"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
-msgid "Not in a report"
-msgstr ""
-
-#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__description
#: model:ir.ui.view,arch_db:hr_expense.hr_expense_view_form
msgid "Notes..."
@@ -972,14 +934,14 @@ msgid "Once your <b>Expense report</b> is ready, you can submit it to your manag
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:704
+#: code:addons/hr_expense/models/hr_expense.py:706
#, python-format
msgid "Only HR Officers or the concerned employee can reset to draft."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:665
-#: code:addons/hr_expense/models/hr_expense.py:686
+#: code:addons/hr_expense/models/hr_expense.py:667
+#: code:addons/hr_expense/models/hr_expense.py:688
#, python-format
msgid "Only Managers and HR Officers can approve expenses"
msgstr ""
@@ -1040,7 +1002,7 @@ msgid "Planned"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:247
+#: code:addons/hr_expense/models/hr_expense.py:249
#, python-format
msgid "Please configure Default Expense account for Product expense: `property_account_expense_categ_id`."
msgstr ""
@@ -1107,6 +1069,11 @@ msgid "Reason to refuse Expense"
msgstr ""
#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard__partner_bank_account_id
+msgid "Recipient Bank Account"
+msgstr ""
+
+#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
msgid "Recording"
msgstr ""
@@ -1131,6 +1098,7 @@ msgstr ""
#: selection:hr.expense,state:0
#: selection:hr.expense.sheet,state:0
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
msgid "Refused"
msgstr ""
@@ -1141,11 +1109,6 @@ msgid "Refused Expenses"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_my_reports_refused
-msgid "Refused Reports"
-msgstr ""
-
-#. module: hr_expense
#: model:ir.actions.act_window,name:hr_expense.hr_expense_sheet_register_payment_wizard_action
#: model:ir.ui.view,arch_db:hr_expense.hr_expense_sheet_register_payment_view_form
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
@@ -1217,6 +1180,11 @@ msgid "Setup your domain alias"
msgstr ""
#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_register_payment_wizard__show_partner_bank_account
+msgid "Show Partner Bank Account"
+msgstr ""
+
+#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
msgid "Show all records which has next action date is before today"
@@ -1255,6 +1223,11 @@ msgid "Status of the expense."
msgstr ""
#. module: hr_expense
+#: model:ir.actions.server,name:hr_expense.hr_expense_submit_action_server
+msgid "Submit Report"
+msgstr ""
+
+#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
msgid "Submit to Manager"
msgstr ""
@@ -1282,6 +1255,11 @@ msgid "Technical field used to hide the payment method if the selected journal h
msgstr ""
#. module: hr_expense
+#: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet_register_payment_wizard__show_partner_bank_account
+msgid "Technical field used to know whether the field `partner_bank_account_id` needs to be displayed or not in the payments form views"
+msgstr ""
+
+#. module: hr_expense
#. openerp-web
#: code:addons/hr_expense/static/src/js/tour.js:54
#, python-format
@@ -1294,7 +1272,7 @@ msgid "The journal used when the expense is done."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/wizard/hr_expense_sheet_register_payment.py:35
+#: code:addons/hr_expense/wizard/hr_expense_sheet_register_payment.py:48
#, python-format
msgid "The payment amount must be strictly positive."
msgstr ""
@@ -1305,28 +1283,34 @@ msgid "The payment method used when the expense is paid by the company."
msgstr ""
#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_to_approve
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_to_approve
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
msgid "To Approve"
msgstr ""
#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_to_pay
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
msgid "To Pay"
msgstr ""
#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_to_post
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
msgid "To Post"
msgstr ""
#. module: hr_expense
#: selection:hr.expense,state:0
-#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
msgid "To Submit"
msgstr ""
#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+msgid "To report"
+msgstr ""
+
+#. module: hr_expense
#: selection:hr.expense,activity_state:0
#: selection:hr.expense.sheet,activity_state:0
msgid "Today"
@@ -1367,6 +1351,12 @@ msgid "Unit of Measure"
msgstr ""
#. module: hr_expense
+#: model:product.product,uom_name:hr_expense.product_product_fixed_cost
+#: model:product.template,uom_name:hr_expense.product_product_fixed_cost_product_template
+msgid "Unit(s)"
+msgstr ""
+
+#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__message_unread
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__message_unread
msgid "Unread Messages"
@@ -1433,19 +1423,19 @@ msgid "Website communication history"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:673
+#: code:addons/hr_expense/models/hr_expense.py:675
#, python-format
msgid "You can only approve your department expenses"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:619
+#: code:addons/hr_expense/models/hr_expense.py:621
#, python-format
msgid "You can only generate accounting entry for approved expense(s)."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:694
+#: code:addons/hr_expense/models/hr_expense.py:696
#, python-format
msgid "You can only refuse your department expenses"
msgstr ""
@@ -1456,13 +1446,13 @@ msgid "You can setup a generic email alias to create incoming expenses easily. W
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:574
+#: code:addons/hr_expense/models/hr_expense.py:576
#, python-format
msgid "You cannot add expenses of another employee."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:670
+#: code:addons/hr_expense/models/hr_expense.py:672
#, python-format
msgid "You cannot approve your own expenses"
msgstr ""
@@ -1474,13 +1464,13 @@ msgid "You cannot delete a posted or approved expense."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:586
+#: code:addons/hr_expense/models/hr_expense.py:588
#, python-format
msgid "You cannot delete a posted or paid expense."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:691
+#: code:addons/hr_expense/models/hr_expense.py:693
#, python-format
msgid "You cannot refuse your own expenses"
msgstr ""
diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index b8651ef19dc..088c18b0788 100644
--- a/addons/hr_holidays/i18n/hr_holidays.pot
+++ b/addons/hr_holidays/i18n/hr_holidays.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:12+0000\n"
-"PO-Revision-Date: 2018-08-02 09:12+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -110,6 +110,18 @@ msgid "<span attrs=\"{'invisible': [('request_unit_all', '!=', 'period')]}\">To
msgstr ""
#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_new_request
+#: model:ir.ui.view,arch_db:hr_holidays.edit_new_allocation
+msgid "<span class=\"ml8\">Days</span>"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_new_request
+#: model:ir.ui.view,arch_db:hr_holidays.edit_new_allocation
+msgid "<span class=\"ml8\">Hours</span>"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.ui.view,arch_db:hr_holidays.report_holidayssummary
msgid "<strong>Departments and Employees</strong>"
msgstr ""
@@ -159,6 +171,7 @@ msgstr ""
#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__accrual
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__accrual
msgid "Accrual"
msgstr ""
@@ -260,11 +273,6 @@ msgid "Allocated Days"
msgstr ""
#. module: hr_holidays
-#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_status_form
-msgid "Allocation"
-msgstr ""
-
-#. module: hr_holidays
#: model:mail.activity.type,name:hr_holidays.mail_act_leave_allocation_approval
msgid "Allocation Approval"
msgstr ""
@@ -314,6 +322,11 @@ msgid "Allocation Second Approve"
msgstr ""
#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_status_form
+msgid "Allocation Type"
+msgstr ""
+
+#. module: hr_holidays
#: code:addons/hr_holidays/models/hr.py:139
#, python-format
msgid "Allocation for %s"
@@ -398,11 +411,6 @@ msgid "Assign Leaves"
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__employee_applicability
-msgid "Available For Employee :"
-msgstr ""
-
-#. module: hr_holidays
#: selection:hr.leave.type,color_name:0
msgid "Black"
msgstr ""
@@ -413,6 +421,11 @@ msgid "Blue"
msgstr ""
#. module: hr_holidays
+#: selection:hr.leave.type,employee_applicability:0
+msgid "Both"
+msgstr ""
+
+#. module: hr_holidays
#: selection:hr.holidays.summary.dept,holiday_type:0
#: selection:hr.holidays.summary.employee,holiday_type:0
msgid "Both Approved and Confirmed"
@@ -465,6 +478,16 @@ msgid "Can Approve"
msgstr ""
#. module: hr_holidays
+#: selection:hr.leave.type,employee_applicability:0
+msgid "Can be allocated"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.leave.type,employee_applicability:0
+msgid "Can be requested"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__can_reset
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__can_reset
msgid "Can reset"
@@ -550,6 +573,7 @@ msgid "Create a new leave allocation request"
msgstr ""
#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.hr_leave_action_my_tree
#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
#: model:ir.actions.act_window,help:hr_holidays.open_company_allocation
#: model:ir.actions.act_window,help:hr_holidays.open_department_holidays_approve
@@ -672,6 +696,12 @@ msgid "Double Validation"
msgstr ""
#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_new_request
+#: model:ir.ui.view,arch_db:hr_holidays.edit_new_allocation
+msgid "Duration"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__number_of_days_temp
msgid "Duration (Days)"
msgstr ""
@@ -704,6 +734,11 @@ msgid "Employee"
msgstr ""
#. module: hr_holidays
+#: selection:hr.leave.type,validation_type:0
+msgid "Employee Manager"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__category_id
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__category_id
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_report__category_id
@@ -730,6 +765,11 @@ msgid "End of validity period should be greater than start of validity period"
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__limit
+msgid "Exceed Allocation"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_leave_allocation_filter
msgid "Filters only on allocations that belong to an leave type that is 'active' (active field is True)"
msgstr ""
@@ -837,7 +877,7 @@ msgstr ""
#. module: hr_holidays
#: selection:hr.leave.type,validation_type:0
-msgid "Human Resource Responsible"
+msgid "Human Resource officer"
msgstr ""
#. module: hr_holidays
@@ -890,11 +930,6 @@ msgid "If you want to change the number of days you should use the 'period' mode
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__accrual
-msgid "Is Accrual"
-msgstr ""
-
-#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__message_is_follower
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__message_is_follower
msgid "Is Follower"
@@ -1112,8 +1147,8 @@ msgid "Leaves Refused"
msgstr ""
#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
+#: model:ir.actions.act_window,name:hr_holidays.hr_leave_action_my_tree
+#: model:ir.ui.menu,name:hr_holidays.hr_leave_menu_my
msgid "Leaves Request"
msgstr ""
@@ -1221,7 +1256,6 @@ msgid "Magenta"
msgstr ""
#. module: hr_holidays
-#: selection:hr.leave.type,validation_type:0
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__manager_id
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
#: model:res.groups,name:hr_holidays.group_hr_holidays_manager
@@ -1287,6 +1321,7 @@ msgid "Messages"
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__employee_applicability
#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_new_request
#: model:ir.ui.view,arch_db:hr_holidays.edit_new_allocation
#: model:ir.ui.view,arch_db:hr_holidays.view_holiday
@@ -1345,6 +1380,12 @@ msgid "New"
msgstr ""
#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
+msgid "New Request"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__activity_date_deadline
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__activity_date_deadline
msgid "Next Activity Deadline"
@@ -1438,16 +1479,12 @@ msgid "Officer"
msgstr ""
#. module: hr_holidays
-#: selection:hr.leave.type,employee_applicability:0
-msgid "On Leave As Well As On Allocation"
-msgstr ""
-
-#. module: hr_holidays
#: model:ir.model.fields,help:hr_holidays.field_hr_leave_type__categ_id
msgid "Once a leave is validated, Odoo will create a corresponding meeting of this type in the calendar."
msgstr ""
#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.hr_leave_action_my_tree
#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
#: model:ir.actions.act_window,help:hr_holidays.open_department_holidays_approve
msgid "Once you have recorded your leave request, it will be sent\n"
@@ -1457,16 +1494,6 @@ msgid "Once you have recorded your leave request, it will be sent\n"
msgstr ""
#. module: hr_holidays
-#: selection:hr.leave.type,employee_applicability:0
-msgid "Only On Allocation"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.leave.type,employee_applicability:0
-msgid "Only On Leave"
-msgstr ""
-
-#. module: hr_holidays
#: code:addons/hr_holidays/models/hr_leave.py:559
#: code:addons/hr_holidays/models/hr_leave_allocation.py:412
#, python-format
@@ -1956,11 +1983,6 @@ msgid "Unit of time between two intervals"
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__limit
-msgid "Unlimited"
-msgstr ""
-
-#. module: hr_holidays
#: model:hr.leave.type,name:hr_holidays.holiday_status_unpaid
msgid "Unpaid"
msgstr ""
diff --git a/addons/hr_org_chart/i18n/hr_org_chart.pot b/addons/hr_org_chart/i18n/hr_org_chart.pot
index b3f13bfb9d2..d4d1d8b1e54 100644
--- a/addons/hr_org_chart/i18n/hr_org_chart.pot
+++ b/addons/hr_org_chart/i18n/hr_org_chart.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:10+0000\n"
-"PO-Revision-Date: 2018-03-22 14:10+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -62,6 +62,13 @@ msgstr ""
#. module: hr_org_chart
#. openerp-web
+#: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:66
+#, python-format
+msgid "More managers"
+msgstr ""
+
+#. module: hr_org_chart
+#. openerp-web
#: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:87
#, python-format
msgid "No hierarchy position."
@@ -74,6 +81,13 @@ msgstr ""
#. module: hr_org_chart
#. openerp-web
+#: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:155
+#, python-format
+msgid "Redirect"
+msgstr ""
+
+#. module: hr_org_chart
+#. openerp-web
#: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:140
#, python-format
msgid "Subordinates of %s"
diff --git a/addons/hr_payroll/i18n/hr_payroll.pot b/addons/hr_payroll/i18n/hr_payroll.pot
index 61c0af4536e..7cc0e14a332 100644
--- a/addons/hr_payroll/i18n/hr_payroll.pot
+++ b/addons/hr_payroll/i18n/hr_payroll.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:12+0000\n"
-"PO-Revision-Date: 2018-08-02 09:12+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -33,6 +33,16 @@ msgid "* When the payslip is created the status is 'Draft'\n"
msgstr ""
#. module: hr_payroll
+#: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
+msgid "<span class=\"o_form_label\">Payroll Rules</span>"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payslip_by_employees
+msgid "<span colspan=\"4\" nolabel=\"1\">This wizard will generate payslips for all selected employee(s) based on the dates and credit note specified on Payslips Run.</span>"
+msgstr ""
+
+#. module: hr_payroll
#: model:ir.ui.view,arch_db:hr_payroll.report_payslip
#: model:ir.ui.view,arch_db:hr_payroll.report_payslipdetails
msgid "<strong>Address</strong>"
@@ -606,7 +616,7 @@ msgid "Error! You cannot create recursive hierarchy of Salary Rule Category."
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_salary_rule.py:177
+#: code:addons/hr_payroll/models/hr_salary_rule.py:178
#, python-format
msgid "Error! You cannot create recursive hierarchy of Salary Rules."
msgstr ""
@@ -980,11 +990,6 @@ msgid "Payroll Entries"
msgstr ""
#. module: hr_payroll
-#: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
-msgid "Payroll Rules"
-msgstr ""
-
-#. module: hr_payroll
#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_structure_filter
msgid "Payroll Structures"
msgstr ""
@@ -1386,11 +1391,6 @@ msgid "This will be used to compute the % fields values; in general it is on bas
msgstr ""
#. module: hr_payroll
-#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payslip_by_employees
-msgid "This wizard will generate payslips for all selected employee(s) based on the dates and credit note specified on Payslips Run."
-msgstr ""
-
-#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_line__total
#: model:ir.ui.view,arch_db:hr_payroll.report_contributionregister
#: model:ir.ui.view,arch_db:hr_payroll.report_payslip
@@ -1461,31 +1461,31 @@ msgid "Working Schedule"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_salary_rule.py:209
+#: code:addons/hr_payroll/models/hr_salary_rule.py:210
#, python-format
msgid "Wrong percentage base or quantity defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_salary_rule.py:215
+#: code:addons/hr_payroll/models/hr_salary_rule.py:216
#, python-format
msgid "Wrong python code defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_salary_rule.py:238
+#: code:addons/hr_payroll/models/hr_salary_rule.py:239
#, python-format
msgid "Wrong python condition defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_salary_rule.py:202
+#: code:addons/hr_payroll/models/hr_salary_rule.py:203
#, python-format
msgid "Wrong quantity defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_salary_rule.py:232
+#: code:addons/hr_payroll/models/hr_salary_rule.py:233
#, python-format
msgid "Wrong range condition defined for salary rule %s (%s)."
msgstr ""
@@ -1509,7 +1509,7 @@ msgid "You must select employee(s) to generate payslip(s)."
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payslip.py:524
+#: code:addons/hr_payroll/models/hr_payslip.py:525
#, python-format
msgid "You must set a contract to create a payslip line."
msgstr ""
diff --git a/addons/hr_recruitment/i18n/hr_recruitment.pot b/addons/hr_recruitment/i18n/hr_recruitment.pot
index 1b582a9f4ac..54cee9dac06 100644
--- a/addons/hr_recruitment/i18n/hr_recruitment.pot
+++ b/addons/hr_recruitment/i18n/hr_recruitment.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:12+0000\n"
-"PO-Revision-Date: 2018-08-02 09:12+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,389 +16,255 @@ msgstr ""
"Plural-Forms: \n"
#. module: hr_recruitment
-#: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_refuse
-msgid "\n"
-" <div style=\"background-color:#F3F5F6;color:#515166;font-family:Arial,Helvetica,sans-serif;font-size:14px;\">\n"
-" <table style=\"width:600px;margin:10px auto;\">\n"
-" <tbody>\n"
-" <tr>\n"
-" <td>\n"
-" <a href=\"/\">\n"
-" <img src=\"/logo\" alt=\"${object.company_id.name}\" style=\"vertical-align:baseline;max-width:100px;\" />\n"
-" </a>\n"
-" </td>\n"
-" <td style=\"text-align:right;vertical-align:middle;\">\n"
-" % if 'website_url' in object.job_id and object.job_id.website_url:\n"
-" <a href=\"${object.job_id.website_url}\" style=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-decoration: none; color: #fff; border-radius: 5px; font-size:16px;\">Job Description</a>\n"
-" % endif\n"
-" </td>\n"
-" </tr>\n"
-" </tbody>\n"
-" </table>\n"
-" <table style=\"width:600px;margin:0px auto;background-color:white;padding:8px; border:1px solid #e1e1e1;\">\n"
-" <tr>\n"
-" <td style=\"font-size:16px; font-weight:300;\">\n"
-" <p style=\"font-size:16px;\">\n"
-" Hi,\n"
-" </p><p style=\"font-size:16px;\">\n"
-" Thank you for your interest in joining the\n"
-" <b>${object.company_id.name}</b> team. We wanted to\n"
-" let you know that, although your resume is competitive,\n"
-" our hiring team reviewed your application and <b>did not\n"
-" select it for further consideration</b>.\n"
-" </p><p style=\"font-size:16px;\">\n"
-" Please note that recruiting is hard, and we can do\n"
-" mistake. Do not hesitate to reply to this email if you\n"
-" think we did a mistake, or if you want more information\n"
-" about our decision.\n"
-" </p><p style=\"font-size:16px;\">\n"
-" We will, however, keep your resume on record and get in\n"
-" touch with you about future opportunities that may be a\n"
-" better fit for your skills and experience.\n"
-" </p>\n"
-" <p style=\"font-size:16px;\">\n"
-" We wish you all the best in your job search and hope we\n"
-" will have the chance to consider you for another role\n"
-" in the future.\n"
-" </p>\n"
-" <p style=\"font-size:16px;\">\n"
-" Regards,\n"
-" </p>\n"
-"\n"
-" <p style=\"color:grey;\">-- <br/>\n"
-" % if object.user_id:\n"
-" <strong>${object.user_id.name}</strong><br/>\n"
-" Email: ${object.user_id.email or ''}<br/>\n"
-" Phone: ${object.user_id.phone or ''}\n"
-" % else:\n"
-" ${object.company_id.name}<br/>\n"
-" The HR Team\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" <table style=\"width:600px;margin:0px auto;text-align:center;\">\n"
-" <tbody>\n"
-" <tr>\n"
-" <td style=\"padding-top:10px;font-size: 12px;\">\n"
-" <div>Sent by ${object.company_id.name}</div>\n"
-" % if 'website_url' in object.job_id and object.job_id.website_url:\n"
-" <div>\n"
-" Discover <a href=\"/jobs\" style=\"text-decoration:none;color:#717188;\">our others jobs</a>.\n"
-" </div>\n"
-" % endif\n"
-" </td>\n"
-" </tr>\n"
-" </tbody>\n"
-" </table>\n"
-"\n"
-" </div>\n"
-" "
+#: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job
+msgid "<span class=\"o_stat_text\">Meetings</span>"
msgstr ""
#. module: hr_recruitment
-#: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_interest
-msgid "\n"
-" <div style=\"background-color:#F3F5F6;color:#515166;font-family:Arial,Helvetica,sans-serif;font-size:14px;\">\n"
-" <table style=\"width:600px;margin:10px auto;\">\n"
-" <tbody>\n"
-" <tr>\n"
-" <td>\n"
-" <a href=\"/\">\n"
-" <img src=\"/logo\" alt=\"${object.company_id.name}\" style=\"vertical-align:baseline;max-width:100px;\" />\n"
-" </a>\n"
-" </td>\n"
-" <td style=\"text-align:right;vertical-align:middle;\">\n"
-" % if 'website_url' in object.job_id and object.job_id.website_url:\n"
-" <a href=\"${object.job_id.website_url}\" style=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-decoration: none; color: #fff; border-radius: 5px; font-size:16px;\">Job Description</a>\n"
-" % endif\n"
-" </td>\n"
-" </tr>\n"
-" </tbody>\n"
-" </table>\n"
-" <table style=\"width:600px;margin:0px auto;background-color:white;padding:8px;border:1px solid #e1e1e1;\">\n"
-" <tr>\n"
-" <td style=\"font-size:16px; font-weight:300;\">\n"
-" <div style=\"text-align: center\">\n"
-" <h2>Congratulations!</h2>\n"
-" <div style=\"color:grey;\">Your resume has been positively reviewed.</div>\n"
-" <img src=\"/hr_recruitment/static/src/img/congratulations.png\" alt=\"Congratulations!\" style=\"width:175px;margin:20px 0;\"/>\n"
-" </div>\n"
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_survey
+msgid "<span class=\"o_stat_text\">Trackers</span>"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_stage_kanban
+msgid "<span>Folded in Recruitment Pipe: </span>"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:digest.tip,tip_description:hr_recruitment.digest_tip_hr_recruitment_0
+msgid "<strong style=\"font-size: 16px;\">Try the mail gateway</strong>"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_congratulations
+msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"background-color: white; border-collapse: collapse; margin-left: 20px;\">\n"
+" <tr>\n"
+" <td valign=\"top\" style=\"padding: 0px 10px;\">\n"
+" <div style=\"font-size: 13px; margin: 0px; padding: 0px;\">\n"
+" Hello,\n"
+" <br/><br/>\n"
+" We confirm we successfully received your application to the job\n"
+" \"<a href=\"${object.job_id.website_url or ''}\" style=\"color:#9A6C8E;\"><strong>${object.job_id.name}</strong></a>\" at <strong>${object.company_id.name}</strong>.\n"
+" <br/><br/>\n"
+" We will come back to you shortly.\n"
"\n"
-" <p style=\"font-size:16px;\">\n"
-" We just reviewed your resume, and it caught our\n"
-" attention. As we think you might be great for the\n"
-" position, your application has been short listed for a\n"
-" call or an interview.\n"
-" </p>\n"
+" % if 'website_url' in object.job_id and object.job_id.website_url:\n"
+" <div style=\"margin: 16px 8px 16px 8px;\">\n"
+" <a href=\"${object.job_id.website_url}\" style=\"background-color: #875a7b; text-decoration: none; color: #fff; padding: 8px 16px 8px 16px; border-radius: 5px;\">Job Description</a>\n"
+" </div>\n"
+" % endif\n"
"\n"
-" % if object.user_id:\n"
-" <p style=\"font-size:16px;\">\n"
-" You will soon be contacted by:\n"
-" </p>\n"
-" <table style=\"width:100%; border:0px solid white;\">\n"
-" <tr>\n"
-" <td width=\"75\">\n"
-" <img src=\"/web/image/res.users/${object.user_id.id}/image_small\" alt=\"Avatar\" style=\"vertical-align:baseline;max-width:64px;\" />\n"
-" </td><td style=\"font-size:15px;\">\n"
-" <strong>${object.user_id.name}</strong><br/>\n"
-" <span>Email: ${object.user_id.email or ''}</span><br/>\n"
-" <span>Phone: ${object.user_id.phone or ''}</span>\n"
-" </td>\n"
-" </tr>\n"
+" <hr width=\"97%\" style=\"background-color: rgb(204,204,204); border: medium none; clear: both; display: block; font-size: 0px; min-height: 1px; line-height: 0; margin: 16px 0px 16px 0px;\"/>\n"
+" % if object.user_id:\n"
+" <h3 style=\"color:#9A6C8E;\"><strong>Your Contact:</strong></h3>\n"
+" <table>\n"
+" <tr>\n"
+" <td width=\"75\">\n"
+" <img src=\"/web/image/res.users/${object.user_id.id}/image_small\" alt=\"Avatar\" style=\"vertical-align:baseline;max-width:64px;\"/>\n"
+" </td>\n"
+" <td>\n"
+" <strong>${object.user_id.name}</strong><br/>\n"
+" <span>Email: ${object.user_id.email or ''}</span><br/>\n"
+" <span>Phone: ${object.user_id.phone or ''}</span>\n"
+" </td>\n"
+" </tr>\n"
" </table>\n"
-" % endif\n"
-" <p style=\"font-size:16px;margin:24px 0;\">\n"
-" See you soon,\n"
-" </p><p style=\"font-size:16px;color: grey;\">\n"
-" -- <br/>\n"
-" Odoo HR Team\n"
-" </p>\n"
-"\n"
-" <hr style=\"margin: 30px 0\"/>\n"
-" <h3 style=\"color:#9A6C8E;\"><strong>What is the next step?</strong></h3>\n"
-" <p style=\"font-size:16px;\">\n"
-" We usually <strong>answer applications within 3 days</strong>.\n"
-" The next step is either a call or a meeting in our offices.\n"
-" </p><p style=\"font-size:16px;\">\n"
-" Feel free to <strong>contact us if you want a faster\n"
-" feedback</strong> or if you don't get news from us\n"
-" quickly enough (just reply to this email).\n"
-" </p>\n"
-" <hr style=\"margin: 30px 0\"/>\n"
-"\n"
-" <h3 style=\"color:#9A6C8E;\"><strong>Want to learn about us?</strong></h3>\n"
-" <ol>\n"
-" <li><a style=\"color:#1CC5A9\" href=\"https://www.odoo.com/blog/odoo-news-5/post/the-odoo-story-56\">Founders' story</a></li>\n"
-" <li><a style=\"color:#1CC5A9\" href=\"https://www.slideshare.net/openobject/the-odoo-culture\">The Odoo Culture</a></li>\n"
-" <li><a style=\"color:#1CC5A9\" href=\"https://www.odoo.com/page/about-us\">About us</a></li>\n"
-" </ol>\n"
-"\n"
-" <hr style=\"margin: 30px 0\"/>\n"
-"\n"
-" % set location = ''\n"
-" % if object.job_id.address_id.name:\n"
-" <p style=\"margin:0px 0px 0px 0px;\"><strong>${object.job_id.address_id.name}</strong></p>\n"
-" % endif\n"
-" % if object.job_id.address_id.street:\n"
-" <p style=\"margin:0px 0px 0px 0px;\">${object.job_id.address_id.street}</p>\n"
-" % set location = object.job_id.address_id.street\n"
-" % endif\n"
-" % if object.job_id.address_id.street2:\n"
-" <p style=\"margin:0px 0px 0px 0px;\">${object.job_id.address_id.street2}</p>\n"
-" % set location = '%s, %s' % (location, object.job_id.address_id.street2)\n"
-" % endif\n"
-" <p style=\"margin:0px 0px 0px 0px;\">\n"
-" % if object.job_id.address_id.city:\n"
-" ${object.job_id.address_id.city},\n"
-" % set location = '%s, %s' % (location, object.job_id.address_id.city)\n"
-" % endif\n"
-" % if object.job_id.address_id.state_id.name:\n"
-" ${object.job_id.address_id.state_id.name},\n"
-" % set location = '%s, %s' % (location, object.job_id.address_id.state_id.name)\n"
-" % endif\n"
-" % if object.job_id.address_id.zip:\n"
-" ${object.job_id.address_id.zip}\n"
-" % set location = '%s, %s' % (location, object.job_id.address_id.zip)\n"
-" % endif\n"
-" </p>\n"
-" % if object.job_id.address_id.country_id.name:\n"
-" <p style=\"margin:0px 0px 0px 0px;\">${object.job_id.address_id.country_id.name}</p>\n"
-" % set location = '%s, %s' % (location, object.job_id.address_id.country_id.name)\n"
-" % endif\n"
+" <hr width=\"97%\" style=\"background-color: rgb(204,204,204); border: medium none; clear: both; display: block; font-size: 0px; min-height: 1px; line-height: 0; margin: 16px 0px 16px 0px;\"/>\n"
+" % endif\n"
"\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
+" <h3 style=\"color:#9A6C8E;\"><strong>What is the next step?</strong></h3>\n"
+" We usually <strong>answer applications within 3 days.</strong><br/><br/>\n"
+" Feel free to <strong>contact us if you want a faster\n"
+" feedback</strong> or if you don't get news from us\n"
+" quickly enough (just reply to this email).\n"
"\n"
-" % if object.job_id.address_id:\n"
-" <div style=\"width:598px;margin:0px auto;border-left:1px solid #dddddd;border-right:1px solid #dddddd;border-bottom:1px solid #dddddd;\">\n"
-" <a href=\"https://maps.google.com/maps?q=${location}\" target=\"new\">\n"
-" <img src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&size=598x200&maptype=roadmap&format=png&visual_refresh=true&markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\" style=\"vertical-align:bottom;\"/>\n"
-" </a>\n"
+" <hr width=\"97%\" style=\"background-color: rgb(204,204,204); border: medium none; clear: both; display: block; font-size: 0px; min-height: 1px; line-height: 0; margin: 17px 0px 16px 0px;\"/>\n"
+" % set location = ''\n"
+" % if object.job_id.address_id.name:\n"
+" <strong>${object.job_id.address_id.name}</strong><br/>\n"
+" % endif\n"
+" % if object.job_id.address_id.street:\n"
+" ${object.job_id.address_id.street}<br/>\n"
+" % set location = object.job_id.address_id.street\n"
+" % endif\n"
+" % if object.job_id.address_id.street2:\n"
+" ${object.job_id.address_id.street2}<br/>\n"
+" % set location = '%s, %s' % (location, object.job_id.address_id.street2)\n"
+" % endif\n"
+" % if object.job_id.address_id.city:\n"
+" ${object.job_id.address_id.city},\n"
+" % set location = '%s, %s' % (location, object.job_id.address_id.city)\n"
+" % endif\n"
+" % if object.job_id.address_id.state_id.name:\n"
+" ${object.job_id.address_id.state_id.name},\n"
+" % set location = '%s, %s' % (location, object.job_id.address_id.state_id.name)\n"
+" % endif\n"
+" % if object.job_id.address_id.zip:\n"
+" ${object.job_id.address_id.zip}\n"
+" % set location = '%s, %s' % (location, object.job_id.address_id.zip)\n"
+" % endif\n"
+" <br/>\n"
+" % if object.job_id.address_id.country_id.name:\n"
+" ${object.job_id.address_id.country_id.name}<br/>\n"
+" % set location = '%s, %s' % (location, object.job_id.address_id.country_id.name)\n"
+" % endif\n"
+" <br/>\n"
+" % if object.job_id.address_id:\n"
+" <a href=\"https://maps.google.com/maps?q=${location}\" target=\"new\">\n"
+" <img src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&amp;size=598x200&amp;maptype=roadmap&amp;format=png&amp;visual_refresh=true&amp;markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\" style=\"vertical-align:bottom;\"/>\n"
+" </a>\n"
+" % endif\n"
" </div>\n"
-" % endif\n"
-" <table style=\"width:600px;margin:0px auto;text-align:center;\">\n"
-" <tbody>\n"
-" <tr>\n"
-" <td style=\"padding-top:10px;font-size: 12px;\">\n"
-" <div>Sent by ${object.company_id.name}</div>\n"
-" % if 'website_url' in object.job_id and object.job_id.website_url:\n"
-" <div>\n"
-" Discover <a href=\"/jobs\" style=\"text-decoration:none;color:#717188;\">all our jobs</a>.\n"
-" </div>\n"
-" % endif\n"
-" </td>\n"
-" </tr>\n"
-" </tbody>\n"
-" </table>\n"
-"\n"
-"\n"
-" </div>\n"
-" "
+" </td>\n"
+" </tr>\n"
+"</table>"
msgstr ""
#. module: hr_recruitment
-#: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_congratulations
-msgid "\n"
-" <div style=\"background-color:#F3F5F6;color:#515166;font-family:Arial,Helvetica,sans-serif;font-size:14px;\">\n"
-" <table style=\"width:600px;margin:10px auto;\">\n"
-" <tbody>\n"
-" <tr>\n"
-" <td>\n"
-" <a href=\"/\">\n"
-" <img src=\"/logo\" alt=\"${object.company_id.name}\" style=\"vertical-align:baseline;max-width:100px;\" />\n"
-" </a>\n"
-" </td>\n"
-" <td style=\"text-align:right;vertical-align:middle;\">\n"
-" % if 'website_url' in object.job_id and object.job_id.website_url:\n"
-" <a href=\"${object.job_id.website_url}\" style=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-decoration: none; color: #fff; border-radius: 5px; font-size:16px;\">Job Description</a>\n"
-" % endif\n"
-" </td>\n"
-" </tr>\n"
-" </tbody>\n"
-" </table>\n"
-" <table style=\"width:600px;margin:0px auto;background-color:white;padding:8px;border:1px solid #e1e1e1;\">\n"
-" <tr>\n"
-" <td style=\"font-size:16px; font-weight:300;\">\n"
-" <p style=\"font-size:16px;\">\n"
-" Hi,\n"
-" </p><p style=\"font-size:16px;\">\n"
-" We confirm we successfully received your application to the job\n"
-"\n"
-" \"<a href=\"${object.job_id.website_url or ''}\" style=\"color:#9A6C8E;\"><strong>${object.job_id.name}</strong></a>\"\n"
-" at <strong>${object.company_id.name}</strong>.\n"
-" </p>\n"
-" <p style=\"font-size:16px;\">\n"
-" We will come back to you shortly.\n"
-" </p>\n"
+#: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_interest
+msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"background-color: white; border-collapse: collapse; margin-left: 20px;\">\n"
+" <tr>\n"
+" <td valign=\"top\" style=\"padding: 0px 10px;\">\n"
+" <div style=\"text-align: center\">\n"
+" <h2>Congratulations!</h2>\n"
+" <div style=\"color:grey;\">Your resume has been positively reviewed.</div>\n"
+" <img src=\"/hr_recruitment/static/src/img/congratulations.png\" alt=\"Congratulations!\" style=\"width:175px;margin:20px 0;\"/>\n"
+" </div>\n"
+" <div style=\"font-size: 13px; margin: 0px; padding: 0px;\">\n"
+" We just reviewed your resume, and it caught our\n"
+" attention. As we think you might be great for the\n"
+" position, your application has been short listed for a\n"
+" call or an interview.\n"
+" <br/><br/>\n"
+" % if 'website_url' in object.job_id and object.job_id.website_url:\n"
+" <div style=\"margin: 16px 8px 16px 8px;\">\n"
+" <a href=\"${object.job_id.website_url}\" style=\"background-color: #875a7b; text-decoration: none; color: #fff; padding: 8px 16px 8px 16px; border-radius: 5px;\">Job Description</a>\n"
+" </div>\n"
+" % endif\n"
"\n"
-" <hr style=\"margin: 30px 0\"/>\n"
-" % if object.user_id:\n"
-" <h3 style=\"color:#9A6C8E;\"><strong>Your Contact:</strong></h3>\n"
-" <table style=\"width:100%; border:0px solid white;\">\n"
-" <tr>\n"
-" <td width=\"75\">\n"
-" <img src=\"/web/image/res.users/${object.user_id.id}/image_small\" alt=\"Avatar\" style=\"vertical-align:baseline;max-width:64px;\" />\n"
-" </td><td style=\"font-size:15px;\">\n"
-" <strong>${object.user_id.name}</strong><br/>\n"
-" <span>Email: ${object.user_id.email or ''}</span><br/>\n"
-" <span>Phone: ${object.user_id.phone or ''}</span>\n"
-" </td>\n"
-" </tr>\n"
+" % if object.user_id:\n"
+" You will soon be contacted by:\n"
+" <table>\n"
+" <tr>\n"
+" <td width=\"75\">\n"
+" <img src=\"/web/image/res.users/${object.user_id.id}/image_small\" alt=\"Avatar\" style=\"vertical-align:baseline;max-width:64px;\"/>\n"
+" </td>\n"
+" <td>\n"
+" <strong>${object.user_id.name}</strong><br/>\n"
+" <span>Email: ${object.user_id.email or ''}</span><br/>\n"
+" <span>Phone: ${object.user_id.phone or ''}</span>\n"
+" </td>\n"
+" </tr>\n"
" </table>\n"
+" <br/><br/>\n"
+" % endif\n"
+" See you soon,\n"
+" <div style=\"font-size: 11px; color: grey;\">\n"
+" -- <br/>\n"
+" The HR Team\n"
+" % if 'website_url' in object.job_id and object.job_id.website_url\n"
+" Discover <a href=\"/jobs\" style=\"text-decoration:none;color:#717188;\">all our jobs</a>.<br/>\n"
" % endif\n"
+" </div>\n"
"\n"
-" <hr style=\"margin: 30px 0\"/>\n"
-"\n"
-" <h3 style=\"color:#9A6C8E;\"><strong>What is the next step?</strong></h3>\n"
-" <p>We usually <strong>answer applications within 3 days.</strong></p>\n"
-" <p>\n"
-" Feel free to <strong>contact us if you want a faster\n"
-" feedback</strong> or if you don't get news from us\n"
-" quickly enough (just reply to this email).\n"
-" </p>\n"
-" <hr style=\"margin: 30px 0\"/>\n"
+" <hr width=\"97%\" style=\"background-color: rgb(204,204,204); border: medium none; clear: both; display: block; font-size: 0px; min-height: 1px; line-height: 0; margin: 16px 0px 16px 0px;\"/>\n"
+" <h3 style=\"color:#9A6C8E;\"><strong>What is the next step?</strong></h3>\n"
+" We usually <strong>answer applications within 3 days</strong>.\n"
+" <br/><br/>\n"
+" The next step is either a call or a meeting in our offices.\n"
+" <br/>\n"
+" Feel free to <strong>contact us if you want a faster\n"
+" feedback</strong> or if you don't get news from us\n"
+" quickly enough (just reply to this email).\n"
+" <br/>\n"
"\n"
-" <h3 style=\"color:#9A6C8E;\"><strong>Want to learn more?</strong></h3>\n"
-" <ol>\n"
-" <li><a style=\"color:#1CC5A9\" href=\"https://www.odoo.com/blog/odoo-news-5/post/the-odoo-story-56\">Founders' story</a></li>\n"
-" <li><a style=\"color:#1CC5A9\" href=\"https://www.slideshare.net/openobject/the-odoo-culture\">The Odoo Culture</a></li>\n"
-" <li><a style=\"color:#1CC5A9\" href=\"https://www.odoo.com/page/about-us\">About us</a></li>\n"
-" </ol>\n"
+" <hr width=\"97%\" style=\"background-color: rgb(204,204,204); border: medium none; clear: both; display: block; font-size: 0px; min-height: 1px; line-height: 0; margin: 17px 0px 16px 0px;\"/>\n"
+" % set location = ''\n"
+" % if object.job_id.address_id.name:\n"
+" <strong>${object.job_id.address_id.name}</strong><br/>\n"
+" % endif\n"
+" % if object.job_id.address_id.street:\n"
+" ${object.job_id.address_id.street}<br/>\n"
+" % set location = object.job_id.address_id.street\n"
+" % endif\n"
+" % if object.job_id.address_id.street2:\n"
+" ${object.job_id.address_id.street2}<br/>\n"
+" % set location = '%s, %s' % (location, object.job_id.address_id.street2)\n"
+" % endif\n"
+" % if object.job_id.address_id.city:\n"
+" ${object.job_id.address_id.city},\n"
+" % set location = '%s, %s' % (location, object.job_id.address_id.city)\n"
+" % endif\n"
+" % if object.job_id.address_id.state_id.name:\n"
+" ${object.job_id.address_id.state_id.name},\n"
+" % set location = '%s, %s' % (location, object.job_id.address_id.state_id.name)\n"
+" % endif\n"
+" % if object.job_id.address_id.zip:\n"
+" ${object.job_id.address_id.zip}\n"
+" % set location = '%s, %s' % (location, object.job_id.address_id.zip)\n"
+" % endif\n"
+" <br/>\n"
+" % if object.job_id.address_id.country_id.name:\n"
+" ${object.job_id.address_id.country_id.name}<br/>\n"
+" % set location = '%s, %s' % (location, object.job_id.address_id.country_id.name)\n"
+" % endif\n"
+" <br/>\n"
"\n"
-" <hr style=\"margin: 30px 0\"/>\n"
-"\n"
-" % set location = ''\n"
-" % if object.job_id.address_id.name:\n"
-" <p style=\"margin:0px 0px 0px 0px;\"><strong>${object.job_id.address_id.name}</strong></p>\n"
-" % endif\n"
-" % if object.job_id.address_id.street:\n"
-" <p style=\"margin:0px 0px 0px 0px;\">${object.job_id.address_id.street}</p>\n"
-" % set location = object.job_id.address_id.street\n"
-" % endif\n"
-" % if object.job_id.address_id.street2:\n"
-" <p style=\"margin:0px 0px 0px 0px;\">${object.job_id.address_id.street2}</p>\n"
-" % set location = '%s, %s' % (location, object.job_id.address_id.street2)\n"
-" % endif\n"
-" <p style=\"margin:0px 0px 0px 0px;\">\n"
-" % if object.job_id.address_id.city:\n"
-" ${object.job_id.address_id.city},\n"
-" % set location = '%s, %s' % (location, object.job_id.address_id.city)\n"
-" % endif\n"
-" % if object.job_id.address_id.state_id.name:\n"
-" ${object.job_id.address_id.state_id.name},\n"
-" % set location = '%s, %s' % (location, object.job_id.address_id.state_id.name)\n"
-" % endif\n"
-" % if object.job_id.address_id.zip:\n"
-" ${object.job_id.address_id.zip}\n"
-" % set location = '%s, %s' % (location, object.job_id.address_id.zip)\n"
-" % endif\n"
-" </p>\n"
-" % if object.job_id.address_id.country_id.name:\n"
-" <p style=\"margin:0px 0px 0px 0px;\">${object.job_id.address_id.country_id.name}</p>\n"
-" % set location = '%s, %s' % (location, object.job_id.address_id.country_id.name)\n"
-" % endif\n"
-"\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-"\n"
-" % if object.job_id.address_id:\n"
-" <div style=\"width:598px;margin:0px auto;border-left:1px solid #dddddd;border-right:1px solid #dddddd;border-bottom:1px solid #dddddd;\">\n"
-" <a href=\"https://maps.google.com/maps?q=${location}\" target=\"new\">\n"
-" <img src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&size=598x200&maptype=roadmap&format=png&visual_refresh=true&markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\" style=\"vertical-align:bottom;\"/>\n"
-" </a>\n"
+" % if object.job_id.address_id:\n"
+" <a href=\"https://maps.google.com/maps?q=${location}\" target=\"new\">\n"
+" <img src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&amp;size=598x200&amp;maptype=roadmap&amp;format=png&amp;visual_refresh=true&amp;markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\" style=\"vertical-align:bottom;\"/>\n"
+" </a>\n"
+" % endif\n"
" </div>\n"
-" % endif\n"
-" <table style=\"width:600px;margin:0px auto;text-align:center;\">\n"
-" <tbody>\n"
-" <tr>\n"
-" <td style=\"padding-top:10px;font-size: 12px;\">\n"
-" <div>Sent by ${object.company_id.name}</div>\n"
-" % if 'website_url' in object.job_id and object.job_id.website_url:\n"
-" <div>\n"
-" Discover <a href=\"/jobs\" style=\"text-decoration:none;color:#717188;\">all our jobs</a>.\n"
-" </div>\n"
-" % endif\n"
-" </td>\n"
-" </tr>\n"
-" </tbody>\n"
-" </table>\n"
-"\n"
-"\n"
-" </div>\n"
-" "
-msgstr ""
-
-#. module: hr_recruitment
-#: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_employee
-msgid "\n"
-"<p>Dear all,</p>\n"
-"<p>I’m very pleased to announce that <strong> ${object.name} </strong> will be\n"
-"joining us as a ${object.job_id.name}\n"
-"%if object.department_id:\n"
-" in ${object.department_id.name}.\n"
-"%endif\n"
-".</p>\n"
-"<p>Please welcome him/her and help him/her finding his/her marks.</p>"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job
-msgid "<span class=\"o_stat_text\">Meetings</span>"
+" </td>\n"
+" </tr>\n"
+"</table>"
msgstr ""
#. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_survey
-msgid "<span class=\"o_stat_text\">Trackers</span>"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_stage_kanban
-msgid "<span>Folded in Recruitment Pipe: </span>"
+#: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_refuse
+msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr>\n"
+" <td valign=\"top\">\n"
+" <div style=\"font-size: 13px; margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" Thank you for your interest in joining the\n"
+" <b>${object.company_id.name}</b> team. We wanted to\n"
+" let you know that, although your resume is competitive,\n"
+" our hiring team reviewed your application and <b>did not\n"
+" select it for further consideration</b>.\n"
+" <br/><br/>\n"
+" Please note that recruiting is hard, and we can do\n"
+" mistake. Do not hesitate to reply to this email if you\n"
+" think we did a mistake, or if you want more information\n"
+" about our decision.\n"
+" <br/><br/>\n"
+" We will, however, keep your resume on record and get in\n"
+" touch with you about future opportunities that may be a\n"
+" better fit for your skills and experience.\n"
+" <br/><br/>\n"
+" We wish you all the best in your job search and hope we\n"
+" will have the chance to consider you for another role\n"
+" in the future.\n"
+" <br/><br/>\n"
+" Thank you,\n"
+" <div style=\"font-size: 11px; color: grey;\">\n"
+" % if object.user_id:\n"
+" -- <br/>\n"
+" <strong>${object.user_id.name}</strong><br/>\n"
+" Email: ${object.user_id.email or ''}<br/>\n"
+" Phone: ${object.user_id.phone or ''}\n"
+" % else:\n"
+" -- <br/>\n"
+" ${object.company_id.name}<br/>\n"
+" The HR Team\n"
+" % endif\n"
+" </div>\n"
+" </div>\n"
+" </td>\n"
+" </tr>\n"
+"</table>\n"
+" "
msgstr ""
#. module: hr_recruitment
@@ -616,7 +482,7 @@ msgid "Bachelor Degree"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:67
+#: code:addons/hr_recruitment/models/hr_recruitment.py:65
#: model:hr.recruitment.stage,legend_blocked:hr_recruitment.stage_job1
#: model:hr.recruitment.stage,legend_blocked:hr_recruitment.stage_job2
#: model:hr.recruitment.stage,legend_blocked:hr_recruitment.stage_job3
@@ -688,14 +554,14 @@ msgid "Configuration"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:370
+#: code:addons/hr_recruitment/models/hr_recruitment.py:372
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__partner_id
#, python-format
msgid "Contact"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:372
+#: code:addons/hr_recruitment/models/hr_recruitment.py:374
#, python-format
msgid "Contact Email"
msgstr ""
@@ -852,6 +718,11 @@ msgid "Description"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_digest_digest
+msgid "Digest"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form
msgid "Discard"
msgstr ""
@@ -866,6 +737,12 @@ msgid "Display Name"
msgstr ""
#. module: hr_recruitment
+#: code:addons/hr_recruitment/models/digest.py:16
+#, python-format
+msgid "Do not have access, skip this data for user's digest email"
+msgstr ""
+
+#. module: hr_recruitment
#: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
msgid "Doctoral Degree"
msgstr ""
@@ -890,6 +767,11 @@ msgid "Don't forget to specify the department if your recruitment process\n"
msgstr ""
#. module: hr_recruitment
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_kanban_view_applicant
+msgid "Dropdown menu"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban
msgid "Edit"
msgstr ""
@@ -935,6 +817,7 @@ msgstr ""
#. module: hr_recruitment
#: model:ir.actions.act_window,name:hr_recruitment.action_hr_job_no_employee
+#: model:ir.model.fields,field_description:hr_recruitment.field_digest_digest__kpi_hr_recruitment_new_colleagues
#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_survey
msgid "Employees"
msgstr ""
@@ -1110,7 +993,7 @@ msgid "If the active field is set to false, it will allow you to hide the case w
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:71
+#: code:addons/hr_recruitment/models/hr_recruitment.py:69
#: model:hr.recruitment.stage,legend_normal:hr_recruitment.stage_job1
#: model:hr.recruitment.stage,legend_normal:hr_recruitment.stage_job2
#: model:hr.recruitment.stage,legend_normal:hr_recruitment.stage_job3
@@ -1150,11 +1033,6 @@ msgid "Job"
msgstr ""
#. module: hr_recruitment
-#: model:mail.template,subject:hr_recruitment.email_template_data_applicant_congratulations
-msgid "Job Application Confirmation: ${object.job_id.name | safe}"
-msgstr ""
-
-#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.crm_case_pivot_view_job
msgid "Job Applications"
msgstr ""
@@ -1243,6 +1121,11 @@ msgid "Kanban Valid"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_digest_digest__kpi_hr_recruitment_new_colleagues_value
+msgid "Kpi Hr Recruitment New Colleagues Value"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant____last_update
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_category____last_update
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_degree____last_update
@@ -1374,7 +1257,7 @@ msgid "New Applications"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:446
+#: code:addons/hr_recruitment/models/hr_recruitment.py:448
#, python-format
msgid "New Employee %s Hired"
msgstr ""
@@ -1390,6 +1273,11 @@ msgid "New Hired Employee"
msgstr ""
#. module: hr_recruitment
+#: model:digest.tip,tip_description:hr_recruitment.digest_tip_hr_recruitment_0
+msgid "New applicants can be generated from incoming emails. You just need to set email aliases in configuration of job positions.<br>"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.actions.act_window,name:hr_recruitment.hr_employee_action_from_department
msgid "Newly Hired Employees"
msgstr ""
@@ -1421,7 +1309,7 @@ msgid "Next Activity Type"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:388
+#: code:addons/hr_recruitment/models/hr_recruitment.py:390
#, python-format
msgid "No Subject"
msgstr ""
@@ -1590,7 +1478,7 @@ msgid "Publish available jobs on your website"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:69
+#: code:addons/hr_recruitment/models/hr_recruitment.py:67
#: model:hr.recruitment.stage,legend_done:hr_recruitment.stage_job1
#: model:hr.recruitment.stage,legend_done:hr_recruitment.stage_job2
#: model:hr.recruitment.stage,legend_done:hr_recruitment.stage_job3
@@ -1615,6 +1503,7 @@ msgstr ""
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_res_users__group_hr_recruitment_user
#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_root
+#: model:ir.ui.view,arch_db:hr_recruitment.digest_digest_view_form
#: model:ir.ui.view,arch_db:hr_recruitment.res_config_settings_view_form
msgid "Recruitment"
msgstr ""
@@ -1760,6 +1649,11 @@ msgid "Sequence"
msgstr ""
#. module: hr_recruitment
+#: model:digest.tip,tip_description:hr_recruitment.digest_tip_hr_recruitment_0
+msgid "Set Email Aliases"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_configuration
#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_global_settings
msgid "Settings"
@@ -1925,11 +1819,6 @@ msgid "These people will receive email."
msgstr ""
#. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
-msgid "This Year"
-msgstr ""
-
-#. module: hr_recruitment
#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant__campaign_id
msgid "This is a name that helps you keep track of your different campaign efforts, e.g. Fall_Drive, Christmas_Special"
msgstr ""
@@ -2058,11 +1947,6 @@ msgid "Website communication history"
msgstr ""
#. module: hr_recruitment
-#: model:mail.template,subject:hr_recruitment.email_template_data_applicant_employee
-msgid "Welcome ${object.name} "
-msgstr ""
-
-#. module: hr_recruitment
#: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_no_employee
msgid "With just a quick glance on the Odoo employee screen, you\n"
" can easily find all the information you need for each person;\n"
@@ -2076,17 +1960,14 @@ msgid "You can define here the labels that will be displayed for the kanban stat
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:450
+#: code:addons/hr_recruitment/models/hr_recruitment.py:451
#, python-format
msgid "You must define an Applied Job and a Contact Name for this applicant."
msgstr ""
#. module: hr_recruitment
+#: model:mail.template,subject:hr_recruitment.email_template_data_applicant_congratulations
#: model:mail.template,subject:hr_recruitment.email_template_data_applicant_interest
-msgid "Your Application: ${object.job_id.name | safe}"
-msgstr ""
-
-#. module: hr_recruitment
#: model:mail.template,subject:hr_recruitment.email_template_data_applicant_refuse
msgid "Your Job Application: ${object.job_id.name | safe}"
msgstr ""
@@ -2097,7 +1978,7 @@ msgid "e.g. Sales Manager"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:298
+#: code:addons/hr_recruitment/models/hr_recruitment.py:296
#, python-format
msgid "job applicant"
msgstr ""
diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot
index 02e00209a3b..5cbdd8e4be6 100644
--- a/addons/hr_timesheet/i18n/hr_timesheet.pot
+++ b/addons/hr_timesheet/i18n/hr_timesheet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:12+0000\n"
-"PO-Revision-Date: 2018-08-02 09:12+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,6 +32,26 @@ msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
+msgid "<span>Date</span>"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
+msgid "<span>Description</span>"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
+msgid "<span>Responsible</span>"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
+msgid "<span>Time</span>"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
msgid "<span>Timesheet Entries</span>"
msgstr ""
@@ -66,7 +86,7 @@ msgstr ""
#. module: hr_timesheet
#: model:ir.model,name:hr_timesheet.model_account_analytic_account
#: model:ir.model.fields,field_description:hr_timesheet.field_project_project__analytic_account_id
-#: model:ir.model.fields,field_description:hr_timesheet.field_project_task__analytic_account_id
+#: model:ir.model.fields,field_description:hr_timesheet.field_project_task__analytic_account_active
msgid "Analytic Account"
msgstr ""
@@ -109,6 +129,11 @@ msgid "By Task"
msgstr ""
#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_account_analytic_account__company_uom_id
msgid "Company UOM"
msgstr ""
@@ -134,8 +159,8 @@ msgid "Currency"
msgstr ""
#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
#: model:ir.ui.view,arch_db:hr_timesheet.portal_my_task
-#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
msgid "Date"
msgstr ""
@@ -146,7 +171,6 @@ msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.portal_my_task
-#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
msgid "Description"
msgstr ""
@@ -157,11 +181,16 @@ msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.portal_my_task
-#: model:ir.ui.view,arch_db:hr_timesheet.view_task_form2_inherited
msgid "Duration"
msgstr ""
#. module: hr_timesheet
+#: code:addons/hr_timesheet/models/hr_timesheet.py:95
+#, python-format
+msgid "Duration (%s)"
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_report_project_task_user__hours_effective
msgid "Effective Hours"
msgstr ""
@@ -174,6 +203,11 @@ msgid "Employee"
msgstr ""
#. module: hr_timesheet
+#: model:ir.model.fields,field_description:hr_timesheet.field_res_config_settings__timesheet_encode_uom_id
+msgid "Encoding Unit"
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
msgid "Google Chrome Store"
msgstr ""
@@ -189,11 +223,26 @@ msgid "Group By"
msgstr ""
#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_ir_http
+msgid "HTTP routing"
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_project_task__effective_hours
msgid "Hours Spent"
msgstr ""
#. module: hr_timesheet
+#: model:ir.model.fields,help:hr_timesheet.field_project_task__analytic_account_active
+msgid "If the active field is set to False, it will allow you to hide the account without removing it."
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.view_task_tree2_inherited
+msgid "Initially Planned Hours"
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_res_config_settings__module_project_timesheet_holidays
#: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
msgid "Leaves"
@@ -201,7 +250,6 @@ msgstr ""
#. module: hr_timesheet
#: model:ir.model.fields,help:hr_timesheet.field_project_project__analytic_account_id
-#: model:ir.model.fields,help:hr_timesheet.field_project_task__analytic_account_id
msgid "Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc."
msgstr ""
@@ -229,6 +277,11 @@ msgid "Please remove existing tasks in the project linked to the accounts you wa
msgstr ""
#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_uom_uom
+msgid "Product Unit of Measure"
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_project_task__progress
#: model:ir.model.fields,field_description:hr_timesheet.field_report_project_task_user__progress
msgid "Progress"
@@ -252,6 +305,12 @@ msgid "Project Count"
msgstr ""
#. module: hr_timesheet
+#: model:ir.model.fields,field_description:hr_timesheet.field_res_company__project_time_mode_id
+#: model:ir.model.fields,field_description:hr_timesheet.field_res_config_settings__project_time_mode_id
+msgid "Project Time Unit"
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_account_analytic_account__project_ids
#: model:ir.ui.view,arch_db:hr_timesheet.account_analytic_account_view_form_inherit
msgid "Projects"
@@ -285,11 +344,15 @@ msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.portal_my_task
-#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
msgid "Responsible"
msgstr ""
#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
+msgid "Set time unit used to record your timesheets"
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.actions.act_window,name:hr_timesheet.hr_timesheet_config_settings_action
#: model:ir.ui.menu,name:hr_timesheet.hr_timesheet_config_settings_menu_action
msgid "Settings"
@@ -329,41 +392,35 @@ msgid "Tasks by user and project"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/models/hr_timesheet.py:84
+#: code:addons/hr_timesheet/models/hr_timesheet.py:113
#, python-format
-msgid "The project you are timesheeting on is not linked to a active analytic account. Please the project configuration."
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
-msgid "This Month"
+msgid "The project you are timesheeting on is not linked to an active analytic account. Set one on the project configuration."
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
-msgid "This Week"
-msgstr ""
-
-#. module: hr_timesheet
-#: code:addons/hr_timesheet/models/project.py:156
+#: code:addons/hr_timesheet/models/project.py:146
#, python-format
msgid "This task must be part of a project because they some timesheets are linked to it."
msgstr ""
#. module: hr_timesheet
#: model:ir.model.fields,help:hr_timesheet.field_account_analytic_account__company_uom_id
+#: model:ir.model.fields,help:hr_timesheet.field_res_company__project_time_mode_id
+#: model:ir.model.fields,help:hr_timesheet.field_res_config_settings__project_time_mode_id
msgid "This will set the unit of measure used in projects and tasks.\n"
"If you use the timesheet linked to projects, don't forget to setup the right unit of measure in your employees."
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
-msgid "Time"
+#: model:ir.model.fields,help:hr_timesheet.field_res_company__timesheet_encode_uom_id
+#: model:ir.model.fields,help:hr_timesheet.field_res_config_settings__timesheet_encode_uom_id
+msgid "This will set the unit of measure used to encode timesheet. This will simply provide tools\n"
+" and widgets to help the encoding. All reporting will still be expressed in hours (default value)."
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_tree
-msgid "Time (Hours)"
+#: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
+msgid "Time Encoding"
msgstr ""
#. module: hr_timesheet
@@ -381,11 +438,6 @@ msgid "Timesheet Activities"
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
-msgid "Timesheet Apps"
-msgstr ""
-
-#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_hr_employee__timesheet_cost
msgid "Timesheet Cost"
msgstr ""
@@ -396,6 +448,11 @@ msgid "Timesheet Date"
msgstr ""
#. module: hr_timesheet
+#: model:ir.model.fields,field_description:hr_timesheet.field_res_company__timesheet_encode_uom_id
+msgid "Timesheet Encoding Unit"
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.actions.act_window,name:hr_timesheet.project_task_action_view_timesheet
#: model:ir.actions.report,name:hr_timesheet.timesheet_report
msgid "Timesheet Entries"
@@ -442,14 +499,9 @@ msgid "Total remaining time, can be re-estimated periodically by the assignee of
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_tree
-msgid "Total time"
-msgstr ""
-
-#. module: hr_timesheet
#: code:addons/hr_timesheet/models/project.py:51
#, python-format
-msgid "Unkwon Analytic Account"
+msgid "Unknown Analytic Account"
msgstr ""
#. module: hr_timesheet
@@ -468,6 +520,21 @@ msgid "Validated leaves create timesheets automatically."
msgstr ""
#. module: hr_timesheet
+#: model:ir.model.fields,field_description:hr_timesheet.field_uom_uom__timesheet_widget
+msgid "Widget"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.model.fields,help:hr_timesheet.field_uom_uom__timesheet_widget
+msgid "Widget used in the webclient when this unit is the one used to encode timesheets."
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.view_task_form2_inherited
+msgid "You can not log timesheets on this project since is linked to an inactive analytic account. Please change it, or reactivate the current one to timesheet on the project."
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line
#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_by_project
#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_report
@@ -479,11 +546,6 @@ msgid "You can register and track your workings hours by project every\n"
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.view_task_form2_inherited
-msgid "Your project is linked to an inactive analytic account. Change it, or reactivate the current one to timesheet on the project."
-msgstr ""
-
-#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_employee_view_form_inherit_timesheet
msgid "per hour"
msgstr ""
diff --git a/addons/im_livechat/i18n/im_livechat.pot b/addons/im_livechat/i18n/im_livechat.pot
index aa6fdb28b41..5bb7561b456 100644
--- a/addons/im_livechat/i18n/im_livechat.pot
+++ b/addons/im_livechat/i18n/im_livechat.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:06+0000\n"
+"PO-Revision-Date: 2018-08-24 09:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -60,7 +60,7 @@ msgstr ""
#. module: im_livechat
#. openerp-web
-#: code:addons/im_livechat/static/src/js/im_livechat.js:52
+#: code:addons/im_livechat/static/src/js/im_livechat.js:60
#, python-format
msgid "Ask something ..."
msgstr ""
@@ -123,6 +123,7 @@ msgstr ""
#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel__livechat_channel_id
#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_operator__livechat_channel_id
#: model:ir.model.fields,field_description:im_livechat.field_mail_channel__livechat_channel_id
+#: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban
#: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_search
#: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_operator_view_search
#: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_search
@@ -168,7 +169,7 @@ msgstr ""
#. module: im_livechat
#. openerp-web
-#: code:addons/im_livechat/static/src/js/im_livechat.js:54
+#: code:addons/im_livechat/static/src/js/im_livechat.js:62
#, python-format
msgid "Chat with one of our collaborators"
msgstr ""
@@ -191,21 +192,6 @@ msgid "Conversation"
msgstr ""
#. module: im_livechat
-#. openerp-web
-#: code:addons/im_livechat/static/src/js/copy_clipboard.js:32
-#, python-format
-msgid "Copied !"
-msgstr ""
-
-#. module: im_livechat
-#. openerp-web
-#: code:addons/im_livechat/static/src/xml/copy_clipboard.xml:6
-#: code:addons/im_livechat/static/src/xml/copy_clipboard.xml:12
-#, python-format
-msgid "Copy Text"
-msgstr ""
-
-#. module: im_livechat
#: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
msgid "Copy and paste this code into your website, within the &lt;head&gt; tag:"
msgstr ""
@@ -244,6 +230,7 @@ msgstr ""
#. module: im_livechat
#: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_search
+#: model:ir.ui.view,arch_db:im_livechat.rating_rating_view_search_livechat
msgid "Creation Date"
msgstr ""
@@ -348,6 +335,11 @@ msgid "Group By..."
msgstr ""
#. module: im_livechat
+#: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban
+msgid "Happy face"
+msgstr ""
+
+#. module: im_livechat
#: selection:im_livechat.channel.rule,action:0
msgid "Hide the button"
msgstr ""
@@ -366,7 +358,7 @@ msgstr ""
#. module: im_livechat
#. openerp-web
-#: code:addons/im_livechat/static/src/js/im_livechat.js:55
+#: code:addons/im_livechat/static/src/js/im_livechat.js:63
#, python-format
msgid "How may I help you?"
msgstr ""
@@ -413,11 +405,6 @@ msgid "Last 24h"
msgstr ""
#. module: im_livechat
-#: model:ir.ui.view,arch_db:im_livechat.rating_rating_view_search_livechat
-msgid "Last 7 days"
-msgstr ""
-
-#. module: im_livechat
#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel____last_update
#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule____last_update
#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel____last_update
@@ -438,12 +425,6 @@ msgid "Last Updated on"
msgstr ""
#. module: im_livechat
-#: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_search
-#: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_operator_view_search
-msgid "Last Week"
-msgstr ""
-
-#. module: im_livechat
#: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban
msgid "Leave"
msgstr ""
@@ -545,6 +526,11 @@ msgid "Name"
msgstr ""
#. module: im_livechat
+#: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban
+msgid "Neutral face"
+msgstr ""
+
+#. module: im_livechat
#: model:ir.actions.act_window,help:im_livechat.rating_rating_action_livechat_report
msgid "No customer ratings on live chat session yet"
msgstr ""
@@ -557,7 +543,7 @@ msgstr ""
#. module: im_livechat
#. openerp-web
-#: code:addons/im_livechat/static/src/js/im_livechat.js:157
+#: code:addons/im_livechat/static/src/js/im_livechat.js:226
#, python-format
msgid "None of our collaborators seems to be available, please try again later."
msgstr ""
@@ -608,7 +594,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban
msgid "Operators\n"
" <br/>\n"
-" <i class=\"fa fa-comments\"/>"
+" <i class=\"fa fa-comments\" role=\"img\" aria-label=\"Comments\" title=\"Comments\"/>"
msgstr ""
#. module: im_livechat
@@ -656,7 +642,7 @@ msgstr ""
#. module: im_livechat
#. openerp-web
-#: code:addons/im_livechat/static/src/js/im_livechat.js:354
+#: code:addons/im_livechat/static/src/js/im_livechat.js:420
#, python-format
msgid "Rating: %s"
msgstr ""
@@ -703,6 +689,11 @@ msgid "Rules"
msgstr ""
#. module: im_livechat
+#: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_kanban
+msgid "Sad face"
+msgstr ""
+
+#. module: im_livechat
#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel__script_external
msgid "Script (external)"
msgstr ""
@@ -759,6 +750,12 @@ msgid "Small-sized photo of the group. It is automatically resized as a 64x64px
msgstr ""
#. module: im_livechat
+#: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_search
+#: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_operator_view_search
+msgid "Start Date"
+msgstr ""
+
+#. module: im_livechat
#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel__start_date
#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_operator__start_date
msgid "Start Date of session"
@@ -851,6 +848,7 @@ msgid "UUID"
msgstr ""
#. module: im_livechat
+#: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
#: model:res.groups,name:im_livechat.im_livechat_group_user
msgid "User"
msgstr ""
@@ -869,7 +867,7 @@ msgstr ""
#. module: im_livechat
#. openerp-web
#: code:addons/im_livechat/controllers/main.py:37
-#: code:addons/im_livechat/static/src/js/im_livechat.js:53
+#: code:addons/im_livechat/static/src/js/im_livechat.js:61
#, python-format
msgid "Visitor"
msgstr ""
diff --git a/addons/im_livechat_mail_bot/i18n/im_livechat_mail_bot.pot b/addons/im_livechat_mail_bot/i18n/im_livechat_mail_bot.pot
new file mode 100644
index 00000000000..9fb7b483951
--- /dev/null
+++ b/addons/im_livechat_mail_bot/i18n/im_livechat_mail_bot.pot
@@ -0,0 +1,90 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * im_livechat_mail_bot
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~11.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: im_livechat_mail_bot
+#: selection:res.users,odoobot_state:0
+msgid "Disabled"
+msgstr ""
+
+#. module: im_livechat_mail_bot
+#: code:addons/im_livechat_mail_bot/models/mail_bot.py:18
+#, python-format
+msgid "Good, you can customize canned responses in the live chat application.<br/><br/><b>It's the end of this overview</b>, enjoy discovering Odoo!"
+msgstr ""
+
+#. module: im_livechat_mail_bot
+#: selection:res.users,odoobot_state:0
+msgid "Idle"
+msgstr ""
+
+#. module: im_livechat_mail_bot
+#: selection:res.users,odoobot_state:0
+msgid "Not initialized"
+msgstr ""
+
+#. module: im_livechat_mail_bot
+#: code:addons/im_livechat_mail_bot/models/mail_bot.py:21
+#, python-format
+msgid "Not sure wat you are doing. Please press : and wait for the propositions. Select one of them and press enter."
+msgstr ""
+
+#. module: im_livechat_mail_bot
+#: model:ir.model.fields,field_description:im_livechat_mail_bot.field_res_users__odoobot_state
+msgid "OdooBot Status"
+msgstr ""
+
+#. module: im_livechat_mail_bot
+#: selection:res.users,odoobot_state:0
+msgid "Onboarding attachement"
+msgstr ""
+
+#. module: im_livechat_mail_bot
+#: selection:res.users,odoobot_state:0
+msgid "Onboarding canned"
+msgstr ""
+
+#. module: im_livechat_mail_bot
+#: selection:res.users,odoobot_state:0
+msgid "Onboarding command"
+msgstr ""
+
+#. module: im_livechat_mail_bot
+#: selection:res.users,odoobot_state:0
+msgid "Onboarding emoji"
+msgstr ""
+
+#. module: im_livechat_mail_bot
+#: selection:res.users,odoobot_state:0
+msgid "Onboarding ping"
+msgstr ""
+
+#. module: im_livechat_mail_bot
+#: code:addons/im_livechat_mail_bot/models/mail_bot.py:15
+#, python-format
+msgid "That's me! 🎉<br/>Try to type \":\" to use canned responses."
+msgstr ""
+
+#. module: im_livechat_mail_bot
+#: model:ir.model,name:im_livechat_mail_bot.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: im_livechat_mail_bot
+#: model:ir.model,name:im_livechat_mail_bot.model_mail_bot
+msgid "mail.bot"
+msgstr ""
+
diff --git a/addons/iot/i18n/iot.pot b/addons/iot/i18n/iot.pot
new file mode 100644
index 00000000000..4bb55ee46e6
--- /dev/null
+++ b/addons/iot/i18n/iot.pot
@@ -0,0 +1,210 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * iot
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~11.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: iot
+#: selection:iot.device,connection:0
+msgid "Bluetooth"
+msgstr ""
+
+#. module: iot
+#: selection:iot.device,type:0
+msgid "Camera"
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,field_description:iot.field_iot_device__connection
+msgid "Connection"
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,field_description:iot.field_iot_box__create_uid
+#: model:ir.model.fields,field_description:iot.field_iot_device__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,field_description:iot.field_iot_box__create_date
+#: model:ir.model.fields,field_description:iot.field_iot_device__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: iot
+#: selection:iot.device,type:0
+msgid "Device"
+msgstr ""
+
+#. module: iot
+#: model:ir.ui.view,arch_db:iot.iot_device_search
+msgid "Device type"
+msgstr ""
+
+#. module: iot
+#: model:ir.actions.act_window,name:iot.iot_device_action
+#: model:ir.model.fields,field_description:iot.field_iot_box__device_ids
+#: model:ir.ui.menu,name:iot.iot_device_menu_action
+#: model:ir.ui.view,arch_db:iot.iot_box_view_form
+msgid "Devices"
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,field_description:iot.field_iot_box__display_name
+#: model:ir.model.fields,field_description:iot.field_iot_device__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: iot
+#: model:ir.ui.view,arch_db:iot.iot_device_search
+msgid "Group By"
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,field_description:iot.field_iot_box__id
+#: model:ir.model.fields,field_description:iot.field_iot_device__id
+msgid "ID"
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,field_description:iot.field_iot_box__ip
+msgid "IP Address"
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,field_description:iot.field_iot_device__identifier
+msgid "Identifier"
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,field_description:iot.field_iot_box__identifier
+msgid "Identifier (Mac Address)"
+msgstr ""
+
+#. module: iot
+#: model:ir.ui.menu,name:iot.iot_menu_root
+msgid "IoT"
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,field_description:iot.field_iot_device__iot_id
+msgid "IoT Box"
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,field_description:iot.field_ir_actions_report__device_id
+#: model:ir.ui.view,arch_db:iot.iot_device_search
+msgid "IoT Device"
+msgstr ""
+
+#. module: iot
+#: model:ir.actions.act_window,name:iot.iot_box_action
+#: model:ir.ui.menu,name:iot.iot_box_menu_action
+msgid "Iot Boxes"
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,field_description:iot.field_iot_box____last_update
+#: model:ir.model.fields,field_description:iot.field_iot_device____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,field_description:iot.field_iot_box__write_uid
+#: model:ir.model.fields,field_description:iot.field_iot_device__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,field_description:iot.field_iot_box__write_date
+#: model:ir.model.fields,field_description:iot.field_iot_device__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,field_description:iot.field_iot_box__name
+#: model:ir.model.fields,field_description:iot.field_iot_device__name
+msgid "Name"
+msgstr ""
+
+#. module: iot
+#: selection:iot.device,connection:0
+msgid "Network"
+msgstr ""
+
+#. module: iot
+#: selection:iot.device,type:0
+msgid "Printer"
+msgstr ""
+
+#. module: iot
+#: model:ir.ui.view,arch_db:iot.iot_device_view_form
+msgid "Printer Reports"
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,field_description:iot.field_iot_device__report_ids
+msgid "Reports"
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,field_description:iot.field_iot_box__screen_url
+msgid "Screen URL"
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,field_description:iot.field_iot_device__type
+msgid "Type"
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,help:iot.field_iot_device__connection
+msgid "Type of connection."
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,help:iot.field_iot_device__type
+msgid "Type of device."
+msgstr ""
+
+#. module: iot
+#: selection:iot.device,connection:0
+msgid "USB"
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,help:iot.field_iot_box__screen_url
+msgid "Url of the page that will be displayed by hdmi port of the box."
+msgstr ""
+
+#. module: iot
+#: model:ir.model.fields,help:iot.field_ir_actions_report__device_id
+msgid "When setting a device here, the report will be printed through this device on the iotbox"
+msgstr ""
+
+#. module: iot
+#: model:ir.model,name:iot.model_iot_box
+msgid "iot.box"
+msgstr ""
+
+#. module: iot
+#: model:ir.model,name:iot.model_iot_device
+msgid "iot.device"
+msgstr ""
+
+#. module: iot
+#: model:ir.model,name:iot.model_ir_actions_report
+msgid "ir.actions.report"
+msgstr ""
+
diff --git a/addons/lunch/i18n/lunch.pot b/addons/lunch/i18n/lunch.pot
index 6d831dbe83e..6c4e00ddb4f 100644
--- a/addons/lunch/i18n/lunch.pot
+++ b/addons/lunch/i18n/lunch.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,6 +26,115 @@ msgid "<strong>Total</strong>"
msgstr ""
#. module: lunch
+#: model:mail.template,body_html:lunch.lunch_order_mail_supplier
+msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Lunch Order</span><br/>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" t-att-alt=\"'%s' % company.name\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr>\n"
+" <td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div>\n"
+" % set lines = ctx['lines']\n"
+" % set order = ctx['order']\n"
+" % set supplier = user.env['res.partner'].browse(order['supplier_id'])\n"
+" % set currency = user.env['res.currency'].browse(order['currency_id'])\n"
+" <p>\n"
+" Dear ${order['supplier_name']},\n"
+" </p><p>\n"
+" Here is, today orders for ${order['company_name']}:\n"
+" </p>\n"
+"\n"
+" <ul>\n"
+" % for line in lines:\n"
+" <li>\n"
+" <strong>\n"
+" ${line['product']}\n"
+" (x${line['quantity']})\n"
+" </strong>\n"
+" % if line['note']:\n"
+" <em>(${line['note']})</em>\n"
+" % endif\n"
+" <div style=\"display: inline-block; float:right\">\n"
+" ${format_amount(line['price'], currency)}\n"
+" </div>\n"
+" </li>\n"
+" % endfor\n"
+" </ul>\n"
+"\n"
+" <p>Amounting in <strong>${format_amount(order['amount_total'], currency)}</strong>.</p>\n"
+" <p>Do not hesitate to contact us if you have any question.</p>\n"
+" </div>\n"
+" </td>\n"
+" </tr>\n"
+" <tr>\n"
+" <td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" ${user.company_id.phone}\n"
+" % if user.company_id.phone and (user.company_id.email or user.company_id.website)\n"
+" |\n"
+" % endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a>\n"
+" % endif\n"
+" % if user.company_id.email and user.company_id.website\n"
+" |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">\n"
+" ${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: lunch
#: model:ir.actions.act_window,help:lunch.lunch_cashmove_action_control_accounts
msgid "A cashmove can either be an expense or a payment.<br>\n"
" An expense is automatically created at the order receipt.<br>\n"
@@ -51,7 +160,7 @@ msgid "Add"
msgstr ""
#. module: lunch
-#: code:addons/lunch/models/lunch.py:294
+#: code:addons/lunch/models/lunch.py:425
#, python-format
msgid "Alert"
msgstr ""
@@ -86,6 +195,11 @@ msgid "Archived"
msgstr ""
#. module: lunch
+#: model:ir.model.fields,field_description:lunch.field_lunch_product__available
+msgid "Available"
+msgstr ""
+
+#. module: lunch
#: model:ir.model.fields,field_description:lunch.field_lunch_order__balance_visible
msgid "Balance Visible"
msgstr ""
@@ -156,16 +270,16 @@ msgstr ""
#. module: lunch
#: model:ir.actions.act_window,help:lunch.lunch_order_line_action_control_suppliers
-msgid "Click on the <span class=\"fa fa-phone text-success\"></span> to announce that the order is ordered.<br>\n"
-" Click on the <span class=\"fa fa-check text-success\"></span> to announce that the order is received.<br>\n"
-" Click on the <span class=\"fa fa-times-circle text-danger\"></span> red X to announce that the order isn't available."
+msgid "Click on the <span class=\"fa fa-phone text-success\" title=\"Order button\"></span> to announce that the order is ordered.<br>\n"
+" Click on the <span class=\"fa fa-check text-success\" title=\"Receive button\"></span> to announce that the order is received.<br>\n"
+" Click on the <span class=\"fa fa-times-circle text-danger\" title=\"Cancel button\"></span> red X to announce that the order isn't available."
msgstr ""
#. module: lunch
#: model:ir.actions.act_window,help:lunch.lunch_order_line_action_by_supplier
-msgid "Click on the <span class=\"fa fa-phone text-success\"></span> to announce that the order is ordered.<br>\n"
-" Click on the <span class=\"fa fa-check text-success\"></span> to announce that the order is received.<br>\n"
-" Click on the <span class=\"fa fa-times-circle text-danger\"></span> to announce that the order isn't available."
+msgid "Click on the <span class=\"fa fa-phone text-success\" title=\"Order button\"></span> to announce that the order is ordered.<br>\n"
+" Click on the <span class=\"fa fa-check text-success\" title=\"Receive button\"></span> to announce that the order is received.<br>\n"
+" Click on the <span class=\"fa fa-times-circle text-danger\" title=\"Cancel button\"></span> to announce that the order isn't available."
msgstr ""
#. module: lunch
@@ -241,6 +355,7 @@ msgstr ""
#: model:ir.model.fields,field_description:lunch.field_lunch_cashmove__date
#: model:ir.model.fields,field_description:lunch.field_lunch_order__date
#: model:ir.model.fields,field_description:lunch.field_lunch_order_line__date
+#: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_search
msgid "Date"
msgstr ""
@@ -341,7 +456,7 @@ msgstr ""
#. module: lunch
#: model:ir.actions.act_window,help:lunch.lunch_cashmove_action_account
-msgid "Here you can see your cash moves.<br>A cash moves can be either an expense or a payment.\n"
+msgid "Here you can see your cash moves.<br>A cash move can either be an expense or a payment.\n"
" An expense is automatically created when an order is received while a payment is a reimbursement to the company encoded by the manager."
msgstr ""
@@ -373,6 +488,11 @@ msgid "ID"
msgstr ""
#. module: lunch
+#: model:ir.model.fields,help:lunch.field_lunch_alert__partner_id
+msgid "If specified, the selected vendor can be ordered only on selected days"
+msgstr ""
+
+#. module: lunch
#: model:ir.model.fields,field_description:lunch.field_lunch_cashmove__state
msgid "Is an order or a payment"
msgstr ""
@@ -428,13 +548,13 @@ msgid "Lunch Alert"
msgstr ""
#. module: lunch
-#: code:addons/lunch/models/lunch.py:265
+#: code:addons/lunch/models/lunch.py:393
#, python-format
msgid "Lunch Cashmove"
msgstr ""
#. module: lunch
-#: code:addons/lunch/models/lunch.py:66
+#: code:addons/lunch/models/lunch.py:67
#: model:ir.actions.report,name:lunch.action_report_lunch_order
#: model:ir.model,name:lunch.model_lunch_order
#: model:ir.ui.view,arch_db:lunch.report_lunch_order
@@ -558,19 +678,19 @@ msgid "Nothing to order today"
msgstr ""
#. module: lunch
-#: code:addons/lunch/models/lunch.py:225
+#: code:addons/lunch/models/lunch.py:318
#, python-format
msgid "Only your lunch manager cancels the orders."
msgstr ""
#. module: lunch
-#: code:addons/lunch/models/lunch.py:194
+#: code:addons/lunch/models/lunch.py:287
#, python-format
msgid "Only your lunch manager processes the orders."
msgstr ""
#. module: lunch
-#: code:addons/lunch/models/lunch.py:214
+#: code:addons/lunch/models/lunch.py:307
#, python-format
msgid "Only your lunch manager sets the orders as received."
msgstr ""
@@ -617,6 +737,11 @@ msgid "Orders by Vendor"
msgstr ""
#. module: lunch
+#: model:mail.template,subject:lunch.lunch_order_mail_supplier
+msgid "Orders for ${ctx['order']['company_name']}"
+msgstr ""
+
+#. module: lunch
#: model:ir.ui.view,arch_db:lunch.lunch_cashmove_view_search
#: selection:lunch.cashmove,state:0
msgid "Payment"
@@ -710,6 +835,16 @@ msgid "Products Tree"
msgstr ""
#. module: lunch
+#: model:ir.ui.view,arch_db:lunch.lunch_alert_view_form
+msgid "Products from this vendor can <strong>not</strong> be ordered at that moment."
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.view,arch_db:lunch.lunch_alert_view_form
+msgid "Products from this vendor can be ordered at that moment."
+msgstr ""
+
+#. module: lunch
#: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_kanban
#: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_tree
msgid "Receive"
@@ -744,12 +879,7 @@ msgstr ""
#. module: lunch
#: model:ir.ui.view,arch_db:lunch.lunch_alert_view_form
-msgid "Schedule Date"
-msgstr ""
-
-#. module: lunch
-#: model:ir.ui.view,arch_db:lunch.lunch_alert_view_form
-msgid "Schedule Hour"
+msgid "Schedule"
msgstr ""
#. module: lunch
@@ -802,7 +932,7 @@ msgid "The company this user is currently working for."
msgstr ""
#. module: lunch
-#: code:addons/lunch/models/lunch.py:129
+#: code:addons/lunch/models/lunch.py:130
#, python-format
msgid "The date of your order is in the past."
msgstr ""
@@ -825,11 +955,6 @@ msgid "Thursday"
msgstr ""
#. module: lunch
-#: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_search
-msgid "Today"
-msgstr ""
-
-#. module: lunch
#: model:ir.ui.menu,name:lunch.lunch_order_line_menu_by_supplier
msgid "Today's Orders"
msgstr ""
@@ -867,9 +992,29 @@ msgid "Users"
msgstr ""
#. module: lunch
+#: code:addons/lunch/models/lunch.py:234
+#, python-format
+msgid "Validate order for one company at a time to send emails (mixed orders from %s and %s)"
+msgstr ""
+
+#. module: lunch
+#: code:addons/lunch/models/lunch.py:239
+#, python-format
+msgid "Validate order for one currency at a time to send emails (mixed orders from %s and %s)"
+msgstr ""
+
+#. module: lunch
+#: code:addons/lunch/models/lunch.py:229
+#, python-format
+msgid "Validate order for one supplier at a time to send emails (mixed orders from %s and %s)"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model.fields,field_description:lunch.field_lunch_alert__partner_id
#: model:ir.model.fields,field_description:lunch.field_lunch_order_line__supplier
#: model:ir.model.fields,field_description:lunch.field_lunch_order_line_lucky__supplier_ids
#: model:ir.model.fields,field_description:lunch.field_lunch_product__supplier
+#: model:ir.ui.view,arch_db:lunch.lunch_alert_view_form
#: model:ir.ui.view,arch_db:lunch.lunch_product_view_search
msgid "Vendor"
msgstr ""
@@ -880,6 +1025,12 @@ msgid "Vendor Orders by Date"
msgstr ""
#. module: lunch
+#: code:addons/lunch/models/lunch.py:192
+#, python-format
+msgid "Vendor(s) '%s' is not available today"
+msgstr ""
+
+#. module: lunch
#: model:ir.model.fields,field_description:lunch.field_lunch_alert__wednesday
msgid "Wednesday"
msgstr ""
diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot
index 11a038d7241..20b632529bf 100644
--- a/addons/mail/i18n/mail.pot
+++ b/addons/mail/i18n/mail.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:12+0000\n"
-"PO-Revision-Date: 2018-08-02 09:12+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,14 +16,14 @@ msgstr ""
"Plural-Forms: \n"
#. module: mail
-#: code:addons/mail/models/mail_channel.py:888
+#: code:addons/mail/models/mail_channel.py:917
#, python-format
msgid " This channel is private. People must be invited to join it."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:1879
+#: code:addons/mail/static/src/js/services/mail_manager.js:974
#, python-format
msgid "%d Messages"
msgstr ""
@@ -42,56 +42,89 @@ msgid "%s (copy)"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:261
+#. openerp-web
+#: code:addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js:133
+#, python-format
+msgid "%s and %s are typing..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:265
#, python-format
msgid "%s created"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:225
+#: code:addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js:131
+#, python-format
+msgid "%s is typing..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js:137
+#, python-format
+msgid "%s, %s and more are typing..."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_activity.py:374
+#, python-format
+msgid "%s: %s assigned to you"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+#: model:ir.ui.view,arch_db:mail.mail_notification_paynow
+msgid "&amp;nbsp;"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:291
#, python-format
msgid "&nbsp;("
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:174
+#: code:addons/mail/static/src/xml/thread.xml:309
#, python-format
msgid "(from"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:49
+#: code:addons/mail/static/src/xml/activity.xml:56
#, python-format
msgid ", due on"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:364
+#: code:addons/mail/static/src/xml/thread.xml:524
#, python-format
msgid "-------- Show older messages --------"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:78
+#: code:addons/mail/static/src/xml/systray.xml:88
#, python-format
msgid "0 Future"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:74
+#: code:addons/mail/static/src/xml/systray.xml:84
#, python-format
msgid "0 Late"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:76
+#: code:addons/mail/static/src/xml/systray.xml:86
#, python-format
msgid "0 Today"
msgstr ""
@@ -111,36 +144,36 @@ msgid "<?xml version=\"1.0\"?>\n"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:892
+#: code:addons/mail/models/mail_channel.py:922
#, python-format
msgid "<br><br>\n"
-" You can mention someone by typing <b>@username</b>, this will grab its attention.<br>\n"
-" You can mention a channel by typing <b>#channel</b>.<br>\n"
-" You can execute a command by typing <b>/command</b>.<br>\n"
-" You can insert canned responses in your message by typing <b>:shortcut</b>.<br>"
+" Type <b>@username</b> to mention someone, and grab his attention.<br>\n"
+" Type <b>#channel</b>.to mention a channel.<br>\n"
+" Type <b>/command</b> to execute a command.<br>\n"
+" Type <b>:shortcut</b> to insert canned responses in your message.<br>"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:712
+#: code:addons/mail/models/mail_channel.py:717
#, python-format
msgid "<div class=\"o_mail_notification\">%(author)s invited %(new_partner)s to <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%(channel_id)s\">#%(channel_name)s</a></div>"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:798
+#: code:addons/mail/models/mail_channel.py:824
#, python-format
msgid "<div class=\"o_mail_notification\">created <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:719
-#: code:addons/mail/models/mail_channel.py:772
+#: code:addons/mail/models/mail_channel.py:724
+#: code:addons/mail/models/mail_channel.py:798
#, python-format
msgid "<div class=\"o_mail_notification\">joined <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:292
+#: code:addons/mail/models/mail_channel.py:294
#, python-format
msgid "<div class=\"o_mail_notification\">left <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
msgstr ""
@@ -179,13 +212,20 @@ msgid "<p>Channels make it easy to organize information across different topics
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/models/threads/create_mode_document_thread.js:65
+#, python-format
+msgid "<p>Creating a new record...</p>"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
msgid "<span attrs=\"{'invisible': [('composition_mode', '!=', 'mass_mail')]}\">\n"
" <strong>Email mass mailing</strong> on\n"
" <span attrs=\"{'invisible': [('use_active_domain', '=', True)]}\">the selected records</span>\n"
" <span attrs=\"{'invisible': [('use_active_domain', '=', False)]}\">the current search filter</span>.\n"
" </span>\n"
-" <span attrs=\"{'invisible':['|', ('model', '=', False), ('composition_mode', '=', 'mass_mail')]}\">Followers of the document and</span>"
+" <span name=\"document_followers_text\" attrs=\"{'invisible':['|', ('model', '=', False), ('composition_mode', '=', 'mass_mail')]}\">Followers of the document and</span>"
msgstr ""
#. module: mail
@@ -204,6 +244,11 @@ msgid "<span class=\"fa fa-info-circle\"/> Caution: It won't be possible to send
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
+msgid "<span class=\"o_form_label\">Activities</span>"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_form
msgid "<span class=\"o_stat_text\">Add</span>\n"
" <span class=\"o_stat_text\">Context Action</span>"
@@ -216,11 +261,6 @@ msgid "<span class=\"o_stat_text\">Remove</span>\n"
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
-msgid "<span class=\"oe_inline ml4\">days</span>"
-msgstr ""
-
-#. module: mail
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
msgid "<strong>\n"
" All records matching your current search filter will be mailed,\n"
@@ -259,28 +299,34 @@ msgid "A Python dictionary that will be evaluated to provide default values when
msgstr ""
#. module: mail
+#: code:addons/mail/models/ir_actions.py:68
+#, python-format
+msgid "A next activity can only be planned on models that use the chatter"
+msgstr ""
+
+#. module: mail
#: model:ir.actions.act_window,help:mail.mail_shortcode_action
msgid "A shortcode is a keyboard shortcut. For instance, you type #gm and it will be transformed into \"Good Morning\"."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:148
-#: code:addons/mail/static/src/xml/thread.xml:251
+#: code:addons/mail/static/src/xml/discuss.xml:191
+#: code:addons/mail/static/src/xml/thread.xml:389
#, python-format
msgid "Accept"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:148
+#: code:addons/mail/static/src/xml/discuss.xml:191
#, python-format
msgid "Accept selected messages"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:251
+#: code:addons/mail/static/src/xml/thread.xml:389
#, python-format
msgid "Accept |"
msgstr ""
@@ -297,6 +343,7 @@ msgid "Access Groups"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_needaction
#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction
#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction
#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction
@@ -316,6 +363,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity_type__active
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__active
#: model:ir.ui.view,arch_db:mail.view_mail_alias_search
msgid "Active"
msgstr ""
@@ -327,14 +375,13 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:87
+#: code:addons/mail/static/src/xml/systray.xml:97
#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_ids
#: model:ir.model.fields,field_description:mail.field_res_partner__activity_ids
#: model:ir.model.fields,field_description:mail.field_res_users__activity_ids
#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
-#: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
#: model:mail.message.subtype,name:mail.mt_activities
#, python-format
msgid "Activities"
@@ -342,12 +389,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:60
+#: code:addons/mail/static/src/js/views/activity/activity_view.js:15
+#: code:addons/mail/static/src/xml/chatter.xml:70
+#: code:addons/mail/static/src/xml/systray.xml:74
#: model:ir.model,name:mail.model_mail_activity
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_type_id
#: model:ir.model.fields,field_description:mail.field_mail_activity__activity_type_id
#: model:ir.ui.view,arch_db:mail.mail_activity_view_calendar
#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
+#: model:ir.ui.view,arch_db:mail.view_server_action_form_template
#, python-format
msgid "Activity"
msgstr ""
@@ -378,6 +429,11 @@ msgid "Activity Types"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_user_type
+msgid "Activity User Type"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/activity.xml:37
#, python-format
@@ -386,22 +442,27 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:93
+#: code:addons/mail/static/src/xml/discuss.xml:117
#, python-format
msgid "Add"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:64
+#: code:addons/mail/static/src/xml/followers.xml:63
#: model:ir.model.fields,field_description:mail.field_ir_actions_server__channel_ids
#, python-format
msgid "Add Channels"
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_blacklist_view_form
+msgid "Add Email Blacklist"
+msgstr ""
+
+#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:61
+#: code:addons/mail/static/src/xml/followers.xml:62
#: selection:ir.actions.server,state:0
#: model:ir.model.fields,field_description:mail.field_ir_actions_server__partner_ids
#: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
@@ -410,7 +471,7 @@ msgid "Add Followers"
msgstr ""
#. module: mail
-#: code:addons/mail/models/ir_actions.py:36
+#: code:addons/mail/models/ir_actions.py:62
#, python-format
msgid "Add Followers can only be done on a mail thread model"
msgstr ""
@@ -430,26 +491,38 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:47
-#: code:addons/mail/static/src/xml/discuss.xml:200
+#: code:addons/mail/static/src/xml/discuss.xml:58
+#: code:addons/mail/static/src/xml/discuss.xml:248
#, python-format
msgid "Add a channel"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:362
+#: code:addons/mail/models/mail_thread.py:370
#, python-format
msgid "Add a new %(document)s or send an email to %(email_link)s"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:66
+#: code:addons/mail/static/src/xml/discuss.xml:77
#, python-format
msgid "Add a private channel"
msgstr ""
#. module: mail
+#: model:ir.actions.act_window,help:mail.mail_blacklist_action
+msgid "Add an email address in the blacklist"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/composer.xml:15
+#, python-format
+msgid "Add attachment"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
msgid "Add channels to notify..."
msgstr ""
@@ -462,7 +535,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:257
+#: code:addons/mail/static/src/xml/thread.xml:395
#, python-format
msgid "Add this email address to white list of people"
msgstr ""
@@ -483,6 +556,23 @@ msgid "Advanced Settings"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__delay_count
+msgid "After"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/followers.xml:26
+#, python-format
+msgid "Alarm menu"
+msgstr ""
+
+#. module: mail
+#: selection:mail.activity.type,decoration_type:0
+msgid "Alert"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__alias_id
#: model:ir.model.fields,field_description:mail.field_mail_channel__alias_id
#: model:ir.model.fields,field_description:mail.field_res_users__alias_id
@@ -533,8 +623,8 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:17
-#: code:addons/mail/static/src/xml/systray.xml:28
+#: code:addons/mail/static/src/xml/systray.xml:20
+#: code:addons/mail/static/src/xml/systray.xml:31
#, python-format
msgid "All"
msgstr ""
@@ -556,15 +646,22 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:257
+#: code:addons/mail/static/src/xml/thread.xml:395
#, python-format
msgid "Always Allow |"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/models/mail_channel.py:891
-#: code:addons/mail/static/src/js/services/chat_manager.js:1486
+#: code:addons/mail/static/src/js/models/mail_failure.js:80
+#, python-format
+msgid "An error occured when sending an email"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/models/mail_channel.py:921
+#: code:addons/mail/static/src/js/models/messages/message.js:148
#, python-format
msgid "Anonymous"
msgstr ""
@@ -584,33 +681,34 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/followers.js:333
+#: code:addons/mail/static/src/js/followers.js:346
#, python-format
msgid "Apply"
msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
+#: model:ir.ui.view,arch_db:mail.mail_blacklist_view_search
msgid "Archived"
msgstr ""
#. module: mail
-#: code:addons/mail/wizard/mail_resend_message.py:96
+#: code:addons/mail/wizard/mail_resend_message.py:118
#, python-format
msgid "Are you sure you want to discard %s mail delivery failures. You won't be able to re-send these mails later!"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:45
+#: code:addons/mail/static/src/xml/activity.xml:52
#: model:ir.model.fields,field_description:mail.field_mail_activity__user_id
#, python-format
msgid "Assigned to"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_activity.py:198
-#: code:addons/mail/models/mail_activity.py:205
+#: code:addons/mail/models/mail_activity.py:291
+#: code:addons/mail/models/mail_activity.py:298
#, python-format
msgid "Assigned user %s has no access to the document and is not able to handle this activity."
msgstr ""
@@ -707,13 +805,16 @@ msgid "Automatic notification"
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
-msgid "Available for mass mailing"
+#. openerp-web
+#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/followers.xml:44
+#, python-format
+msgid "Avatar"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:259
+#: code:addons/mail/static/src/xml/thread.xml:397
#, python-format
msgid "Ban"
msgstr ""
@@ -725,7 +826,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:259
+#: code:addons/mail/static/src/xml/thread.xml:397
#, python-format
msgid "Ban this email address"
msgstr ""
@@ -737,12 +838,32 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:89
+#: code:addons/mail/static/src/xml/followers.xml:90
#, python-format
msgid "Be careful with channels following internal notifications"
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_paynow
+msgid "Best regards,"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.mail_blacklist_action
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist_mixin__is_blacklisted
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_blacklisted
+#: model:ir.model.fields,field_description:mail.field_res_partner__is_blacklisted
+#: model:ir.model.fields,field_description:mail.field_res_users__is_blacklisted
+msgid "Blacklist"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_blacklist_view_form
+#: model:ir.ui.view,arch_db:mail.mail_blacklist_view_tree
+msgid "Blacklist Date"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview__body_html
#: model:ir.model.fields,field_description:mail.field_mail_template__body_html
#: model:ir.ui.view,arch_db:mail.view_mail_form
@@ -757,7 +878,10 @@ msgid "Bounce"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:322
#: selection:mail.notification,email_status:0
+#, python-format
msgid "Bounced"
msgstr ""
@@ -768,8 +892,8 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/followers.js:341
-#: code:addons/mail/static/src/xml/activity.xml:65
+#: code:addons/mail/static/src/js/followers.js:354
+#: code:addons/mail/static/src/xml/activity.xml:85
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
#: model:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
@@ -790,7 +914,10 @@ msgid "Cancel notification in failure"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:325
#: selection:mail.notification,email_status:0
+#, python-format
msgid "Canceled"
msgstr ""
@@ -845,15 +972,32 @@ msgid "Change"
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity__activity_decoration
+#: model:ir.model.fields,help:mail.field_mail_activity_type__decoration_type
+msgid "Change the background color of the related activities of this type."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:420
+#, python-format
+msgid "Changed"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__field
msgid "Changed Field"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:114
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__channel_id
#: model:ir.model.fields,field_description:mail.field_mail_moderation__channel_id
#: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_form
+#: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban
#: selection:mail.channel,channel_type:0
+#, python-format
msgid "Channel"
msgstr ""
@@ -863,6 +1007,11 @@ msgid "Channel Message"
msgstr ""
#. module: mail
+#: model:ir.ui.menu,name:mail.mail_moderation_menu
+msgid "Channel Moderation"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel__channel_type
msgid "Channel Type"
msgstr ""
@@ -874,17 +1023,17 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:117
+#: code:addons/mail/static/src/xml/discuss.xml:150
#, python-format
msgid "Channel settings"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:42
-#: code:addons/mail/static/src/xml/discuss.xml:186
-#: code:addons/mail/static/src/xml/systray.xml:19
-#: code:addons/mail/static/src/xml/systray.xml:36
+#: code:addons/mail/static/src/xml/discuss.xml:53
+#: code:addons/mail/static/src/xml/discuss.xml:230
+#: code:addons/mail/static/src/xml/systray.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:39
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__channel_ids
#: model:ir.model.fields,field_description:mail.field_mail_mail__channel_ids
#: model:ir.model.fields,field_description:mail.field_mail_message__channel_ids
@@ -905,10 +1054,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:182
-#: code:addons/mail/static/src/xml/systray.xml:18
-#: code:addons/mail/static/src/xml/systray.xml:32
-#: model:ir.actions.client,name:mail.mail_channel_action_client_chat
+#: code:addons/mail/static/src/xml/discuss.xml:226
+#: code:addons/mail/static/src/xml/systray.xml:21
+#: code:addons/mail/static/src/xml/systray.xml:35
#, python-format
msgid "Chat"
msgstr ""
@@ -936,6 +1084,21 @@ msgid "Choose an example"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:16
+#: code:addons/mail/static/src/xml/thread.xml:36
+#, python-format
+msgid "Close"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/abstract_thread_window.xml:67
+#, python-format
+msgid "Close chat window"
+msgstr ""
+
+#. module: mail
#: selection:mail.channel.partner,fold_state:0
msgid "Closed"
msgstr ""
@@ -980,8 +1143,11 @@ msgid "Companies"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/activity.js:308
#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#, python-format
msgid "Compose Email"
msgstr ""
@@ -997,14 +1163,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:99
+#: code:addons/mail/static/src/xml/thread.xml:114
#, python-format
msgid "Congratulations, your inbox is empty"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:866
+#: code:addons/mail/static/src/js/discuss.js:948
#, python-format
msgid "Congratulations, your inbox is empty!"
msgstr ""
@@ -1039,7 +1205,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
+#: code:addons/mail/static/src/xml/systray.xml:9
#, python-format
msgid "Conversations"
msgstr ""
@@ -1052,7 +1218,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:502
+#: code:addons/mail/static/src/js/discuss.js:569
#, python-format
msgid "Create %s"
msgstr ""
@@ -1063,13 +1229,18 @@ msgid "Create Date"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:377
+#: selection:ir.actions.server,state:0
+msgid "Create Next Activity"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:385
#, python-format
msgid "Create a new %(document)s"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:369
+#: code:addons/mail/models/mail_thread.py:377
#, python-format
msgid "Create a new %(document)s by sending an email to %(email_link)s"
msgstr ""
@@ -1090,6 +1261,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_activity_type__create_uid
#: model:ir.model.fields,field_description:mail.field_mail_alias__create_uid
#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__create_uid
#: model:ir.model.fields,field_description:mail.field_mail_channel__create_uid
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__create_uid
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_uid
@@ -1115,6 +1287,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_activity_type__create_date
#: model:ir.model.fields,field_description:mail.field_mail_alias__create_date
#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__create_date
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__create_date
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_date
#: model:ir.model.fields,field_description:mail.field_mail_mail__create_date
@@ -1138,6 +1311,11 @@ msgid "Creation Date"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__create_user_id
+msgid "Creator"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_mail_compose_message__starred
#: model:ir.model.fields,help:mail.field_mail_mail__starred
#: model:ir.model.fields,help:mail.field_mail_message__starred
@@ -1158,7 +1336,22 @@ msgid "Date"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/chatter.xml:70
+#, python-format
+msgid "Dates"
+msgstr ""
+
+#. module: mail
+#: selection:ir.actions.server,activity_date_deadline_range_type:0
+msgid "Days"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:39
#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
+#, python-format
msgid "Deadline"
msgstr ""
@@ -1168,11 +1361,22 @@ msgid "Dear"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__activity_decoration
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__decoration_type
+msgid "Decoration Type"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__default
msgid "Default"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__default_next_type_id
+msgid "Default Next Activity"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview__null_value
#: model:ir.model.fields,field_description:mail.field_mail_template__null_value
msgid "Default Value"
@@ -1205,6 +1409,24 @@ msgid "Define a new chat shortcode"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__delay_from
+msgid "Delay Type"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__delay_unit
+msgid "Delay units"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/composer.xml:91
+#: code:addons/mail/static/src/xml/thread.xml:509
+#, python-format
+msgid "Delete"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete
msgid "Delete Emails"
msgstr ""
@@ -1239,15 +1461,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:52
+#: code:addons/mail/static/src/xml/discuss.xml:63
#, python-format
msgid "Direct Messages"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:81
-#: code:addons/mail/static/src/xml/discuss.xml:150
+#: code:addons/mail/static/src/js/discuss.js:354
+#: code:addons/mail/static/src/xml/activity.xml:101
+#: code:addons/mail/static/src/xml/discuss.xml:193
#: model:ir.ui.view,arch_db:mail.email_template_preview_form
#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
#, python-format
@@ -1266,20 +1489,21 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:150
+#: code:addons/mail/static/src/xml/discuss.xml:193
#, python-format
msgid "Discard selected messages"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:255
+#: code:addons/mail/static/src/xml/thread.xml:393
#, python-format
msgid "Discard |"
msgstr ""
#. module: mail
-#: model:ir.ui.menu,name:mail.mail_channel_menu_root_chat
+#: model:ir.actions.client,name:mail.action_discuss
+#: model:ir.ui.menu,name:mail.menu_root_discuss
#: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
msgid "Discuss"
msgstr ""
@@ -1306,6 +1530,8 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_activity_type__display_name
#: model:ir.model.fields,field_description:mail.field_mail_alias__display_name
#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist_mixin__display_name
#: model:ir.model.fields,field_description:mail.field_mail_channel__display_name
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__display_name
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__display_name
@@ -1343,6 +1569,11 @@ msgid "Do not keep a copy of the email in the document communication history (ma
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.view_document_file_kanban
+msgid "Document"
+msgstr ""
+
+#. module: mail
#: model:ir.model,name:mail.model_mail_followers
msgid "Document Followers"
msgstr ""
@@ -1359,14 +1590,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:79
+#: code:addons/mail/static/src/xml/activity.xml:99
#, python-format
msgid "Done"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:77
+#: code:addons/mail/static/src/xml/activity.xml:97
#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
#, python-format
msgid "Done & Schedule Next"
@@ -1374,18 +1605,30 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:30
-#: code:addons/mail/static/src/xml/thread.xml:57
+#: code:addons/mail/static/src/xml/thread.xml:34
+#: code:addons/mail/static/src/xml/thread.xml:61
#, python-format
msgid "Download"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/followers.xml:11
+#, python-format
+msgid "Dropdown menu - Followers"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity__date_deadline
msgid "Due Date"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_date_deadline_range
+msgid "Due Date In"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/activity.js:95
#, python-format
@@ -1393,13 +1636,18 @@ msgid "Due in %d days"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_date_deadline_range_type
+msgid "Due type"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_form
msgid "Dynamic Placeholder Generator"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:62
+#: code:addons/mail/static/src/xml/activity.xml:82
#, python-format
msgid "Edit"
msgstr ""
@@ -1411,14 +1659,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/followers.js:330
+#: code:addons/mail/static/src/js/followers.js:343
#, python-format
msgid "Edit Subscription of "
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:49
+#: code:addons/mail/static/src/xml/followers.xml:50
#, python-format
msgid "Edit subscription"
msgstr ""
@@ -1427,6 +1675,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_email
#: model:ir.model.fields,field_description:mail.field_mail_moderation__email
#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__email
+#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
#: model:ir.ui.view,arch_db:mail.view_mail_search
#: model:mail.activity.type,name:mail.mail_activity_data_email
#: selection:mail.compose.message,message_type:0
@@ -1435,6 +1684,11 @@ msgid "Email"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__email
+msgid "Email Address"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Email Alias"
msgstr ""
@@ -1445,6 +1699,11 @@ msgid "Email Aliases"
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_blacklist_view_tree
+msgid "Email Blacklist"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_form
msgid "Email Configuration"
msgstr ""
@@ -1485,6 +1744,11 @@ msgid "Email Thread"
msgstr ""
#. module: mail
+#: sql_constraint:mail.blacklist:0
+msgid "Email address already exists!"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_res_users__alias_id
msgid "Email address internally associated with this user. Incoming emails will appear in the user's notifications."
msgstr ""
@@ -1507,6 +1771,11 @@ msgid "Email address to redirect replies..."
msgstr ""
#. module: mail
+#: model:ir.actions.act_window,help:mail.mail_blacklist_action
+msgid "Email addresses that are blacklisted means that the recipient won't receive any mass mailing anymore."
+msgstr ""
+
+#. module: mail
#: model:ir.model,name:mail.model_mail_compose_message
msgid "Email composition wizard"
msgstr ""
@@ -1530,6 +1799,33 @@ msgid "Emails"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/composer.xml:14
+#, python-format
+msgid "Emojis"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/services/mail_manager.js:837
+#, python-format
+msgid "Enable desktop notifications to chat"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+msgid "Envelope Example"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:323
+#: selection:mail.activity.type,decoration_type:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/update.py:97
#, python-format
msgid "Error during communication with the publisher warranty server."
@@ -1541,7 +1837,7 @@ msgid "Error while connecting to smtp server"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_mail.py:306
+#: code:addons/mail/models/mail_mail.py:317
#, python-format
msgid "Error without exception. Probably due do sending an email without computed recipients."
msgstr ""
@@ -1568,6 +1864,7 @@ msgid "Everyone"
msgstr ""
#. module: mail
+#: model:mail.activity.type,name:mail.mail_activity_data_warning
#: selection:mail.notification,email_status:0
msgid "Exception"
msgstr ""
@@ -1633,7 +1930,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/activity.js:247
+#: code:addons/mail/static/src/js/activity.js:255
#: model:ir.model.fields,field_description:mail.field_mail_activity__feedback
#, python-format
msgid "Feedback"
@@ -1691,6 +1988,7 @@ msgstr ""
#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_followers
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_follower_ids
#: model:ir.model.fields,field_description:mail.field_mail_channel__message_follower_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread__message_follower_ids
#: model:ir.model.fields,field_description:mail.field_res_partner__message_follower_ids
@@ -1701,6 +1999,7 @@ msgid "Followers"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_channel_ids
#: model:ir.model.fields,field_description:mail.field_mail_channel__message_channel_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread__message_channel_ids
#: model:ir.model.fields,field_description:mail.field_res_partner__message_channel_ids
@@ -1709,6 +2008,7 @@ msgid "Followers (Channels)"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_channel__message_partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread__message_partner_ids
#: model:ir.model.fields,field_description:mail.field_res_partner__message_partner_ids
@@ -1723,7 +2023,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:15
+#: code:addons/mail/static/src/xml/chatter.xml:17
#, python-format
msgid "Followers of"
msgstr ""
@@ -1757,7 +2057,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:77
+#: code:addons/mail/static/src/xml/chatter.xml:50
+#, python-format
+msgid "Full composer"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/systray.xml:87
#, python-format
msgid "Future"
msgstr ""
@@ -1774,6 +2081,11 @@ msgid "Gateway"
msgstr ""
#. module: mail
+#: selection:ir.actions.server,activity_user_type:0
+msgid "Generic User From Record"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/res_users.py:87
#, python-format
msgid "Go to the configuration panel"
@@ -1876,6 +2188,8 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_activity_type__id
#: model:ir.model.fields,field_description:mail.field_mail_alias__id
#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__id
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__id
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist_mixin__id
#: model:ir.model.fields,field_description:mail.field_mail_channel__id
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__id
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__id
@@ -1918,13 +2232,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:127
-#: code:addons/mail/static/src/xml/discuss.xml:217
+#: code:addons/mail/static/src/xml/discuss.xml:163
+#: code:addons/mail/static/src/xml/discuss.xml:283
#, python-format
msgid "Idle"
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_blacklist__message_unread
#: model:ir.model.fields,help:mail.field_mail_channel__message_unread
#: model:ir.model.fields,help:mail.field_mail_thread__message_unread
#: model:ir.model.fields,help:mail.field_res_partner__message_unread
@@ -1933,6 +2248,7 @@ msgid "If checked new messages require your attention."
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_blacklist__message_needaction
#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction
#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction
#: model:ir.model.fields,help:mail.field_res_partner__message_needaction
@@ -1941,6 +2257,7 @@ msgid "If checked, new messages require your attention."
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_blacklist__message_has_error
#: model:ir.model.fields,help:mail.field_mail_channel__message_has_error
#: model:ir.model.fields,help:mail.field_mail_thread__message_has_error
#: model:ir.model.fields,help:mail.field_res_partner__message_has_error
@@ -1960,12 +2277,6 @@ msgid "If checked, the user's signature will be appended to the text version of
msgstr ""
#. module: mail
-#: model:ir.model.fields,help:mail.field_res_partner__opt_out
-#: model:ir.model.fields,help:mail.field_res_users__opt_out
-msgid "If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign. Filter 'Available for Mass Mailing' allows users to filter the partners when performing mass mailing."
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_mail__scheduled_date
msgid "If set, the queue manager will send the email after the date. If not set, the email will be send as soon as possible."
msgstr ""
@@ -1977,6 +2288,14 @@ msgid "If set, the queue manager will send the email after the date. If not set,
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_blacklist_mixin__is_blacklisted
+#: model:ir.model.fields,help:mail.field_mail_channel_partner__is_blacklisted
+#: model:ir.model.fields,help:mail.field_res_partner__is_blacklisted
+#: model:ir.model.fields,help:mail.field_res_users__is_blacklisted
+msgid "If the email address is on the blacklist, the contact won't receive mass mailing anymore, from any list"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_res_config_settings__alias_domain
msgid "If you have setup a catch-all email domain redirected to the Odoo server, enter the domain name here."
msgstr ""
@@ -1992,6 +2311,13 @@ msgid "Ignore all failures"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:30
+#, python-format
+msgid "Image"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_alias.py:130
#, python-format
msgid "Inactive Alias"
@@ -1999,10 +2325,10 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:165
-#: code:addons/mail/static/src/xml/discuss.xml:22
-#: code:addons/mail/static/src/xml/discuss.xml:168
-#: code:addons/mail/static/src/xml/discuss.xml:178
+#: code:addons/mail/static/src/js/services/mail_manager.js:1261
+#: code:addons/mail/static/src/xml/discuss.xml:33
+#: code:addons/mail/static/src/xml/discuss.xml:211
+#: code:addons/mail/static/src/xml/discuss.xml:222
#, python-format
msgid "Inbox"
msgstr ""
@@ -2013,6 +2339,18 @@ msgid "Indicates this activity has been created automatically and not by any use
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:33
+#, python-format
+msgid "Info"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__initial_res_model_id
+msgid "Initial model"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_mail_compose_message__parent_id
#: model:ir.model.fields,help:mail.field_mail_mail__parent_id
#: model:ir.model.fields,help:mail.field_mail_message__parent_id
@@ -2042,8 +2380,14 @@ msgid "Invalid expression, it must be a literal python dictionary definition e.g
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1925
-#: code:addons/mail/models/mail_thread.py:2136
+#: code:addons/mail/models/mail_blacklist.py:77
+#, python-format
+msgid "Invalid primary email field on model %s"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:1952
+#: code:addons/mail/models/mail_thread.py:2175
#, python-format
msgid "Invalid record set: should be called as model (without records) or on single-record recordset"
msgstr ""
@@ -2056,7 +2400,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:1611
+#: code:addons/mail/static/src/js/services/mail_notification_manager.js:197
#, python-format
msgid "Invitation"
msgstr ""
@@ -2069,30 +2413,30 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:44
-#: code:addons/mail/static/src/xml/discuss.xml:141
+#: code:addons/mail/static/src/js/discuss.js:45
+#: code:addons/mail/static/src/xml/discuss.xml:184
#, python-format
msgid "Invite"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/followers.js:170
+#: code:addons/mail/static/src/js/followers.js:171
#, python-format
msgid "Invite Follower"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:29
-#: code:addons/mail/static/src/xml/discuss.xml:141
+#: code:addons/mail/static/src/js/discuss.js:30
+#: code:addons/mail/static/src/xml/discuss.xml:184
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:1039
+#: code:addons/mail/static/src/js/discuss.js:1198
#, python-format
msgid "Invite people to #%s"
msgstr ""
@@ -2118,6 +2462,7 @@ msgid "Is Banned"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_is_follower
#: model:ir.model.fields,field_description:mail.field_mail_channel__message_is_follower
#: model:ir.model.fields,field_description:mail.field_mail_thread__message_is_follower
#: model:ir.model.fields,field_description:mail.field_res_partner__message_is_follower
@@ -2178,6 +2523,8 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_activity_type____last_update
#: model:ir.model.fields,field_description:mail.field_mail_alias____last_update
#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist_mixin____last_update
#: model:ir.model.fields,field_description:mail.field_mail_channel____last_update
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner____last_update
#: model:ir.model.fields,field_description:mail.field_mail_compose_message____last_update
@@ -2211,6 +2558,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_uid
#: model:ir.model.fields,field_description:mail.field_mail_alias__write_uid
#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__write_uid
#: model:ir.model.fields,field_description:mail.field_mail_channel__write_uid
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_uid
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_uid
@@ -2234,6 +2582,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_activity_type__write_date
#: model:ir.model.fields,field_description:mail.field_mail_alias__write_date
#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__write_date
#: model:ir.model.fields,field_description:mail.field_mail_channel__write_date
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__write_date
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__write_date
@@ -2253,7 +2602,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:73
+#: code:addons/mail/static/src/xml/systray.xml:83
#, python-format
msgid "Late"
msgstr ""
@@ -2278,8 +2627,8 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/models/mail_channel.py:901
-#: code:addons/mail/static/src/xml/discuss.xml:120
+#: code:addons/mail/models/mail_channel.py:931
+#: code:addons/mail/static/src/xml/discuss.xml:153
#, python-format
msgid "Leave this channel"
msgstr ""
@@ -2295,7 +2644,7 @@ msgid "List of partners that will be added as follower of the current document."
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:912
+#: code:addons/mail/models/mail_channel.py:942
#, python-format
msgid "List users in the current channel"
msgstr ""
@@ -2322,14 +2671,29 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:361
+#: code:addons/mail/static/src/xml/thread.xml:41
+#, python-format
+msgid "Loading"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:521
#, python-format
msgid "Loading older messages..."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:30
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:15
+#, python-format
+msgid "Loading..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/composers/chatter_composer.js:34
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:34
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
#, python-format
msgid "Log"
@@ -2337,13 +2701,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:56
+#: code:addons/mail/static/src/xml/chatter.xml:66
#, python-format
msgid "Log a note. Followers will not be notified."
msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+#: model:ir.ui.view,arch_db:mail.view_server_action_form_template
msgid "Log a note..."
msgstr ""
@@ -2359,20 +2724,24 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:56
+#: code:addons/mail/static/src/xml/chatter.xml:66
#, python-format
msgid "Log note"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:59
+#: code:addons/mail/static/src/xml/chatter.xml:69
#, python-format
msgid "Log or schedule an activity"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:68
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:45
#: model:ir.model.fields,field_description:mail.field_mail_notification__mail_id
+#, python-format
msgid "Mail"
msgstr ""
@@ -2384,8 +2753,18 @@ msgid "Mail Activity Type"
msgstr ""
#. module: mail
+#: model:ir.model,name:mail.model_mail_blacklist
+msgid "Mail Blacklist"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_blacklist_mixin
+msgid "Mail Blacklist mixin"
+msgstr ""
+
+#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:161
+#: code:addons/mail/static/src/xml/discuss.xml:204
#, python-format
msgid "Mail Body"
msgstr ""
@@ -2396,7 +2775,7 @@ msgid "Mail Channel Form"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_mail.py:374
+#: code:addons/mail/models/mail_mail.py:385
#, python-format
msgid "Mail Delivery Failed"
msgstr ""
@@ -2432,33 +2811,34 @@ msgid "Mail: Notify channel moderators"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:915
+#: code:addons/mail/models/mail_thread.py:924
#, python-format
msgid "Mailbox unavailable - %s"
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.res_partner_view_form_inherit_mail
-msgid "Mailing Opt-Out"
+#: model:ir.model.fields,field_description:mail.field_mail_activity__mail_template_ids
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__mail_template_ids
+msgid "Mails templates"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:59
+#: code:addons/mail/static/src/xml/activity.xml:79
#, python-format
msgid "Mark Done"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:142
+#: code:addons/mail/static/src/xml/discuss.xml:185
#, python-format
msgid "Mark all as read"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:142
+#: code:addons/mail/static/src/xml/discuss.xml:185
#, python-format
msgid "Mark all read"
msgstr ""
@@ -2470,28 +2850,33 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:240
-#: code:addons/mail/static/src/xml/thread.xml:206
+#: code:addons/mail/static/src/xml/discuss.xml:304
+#: code:addons/mail/static/src/xml/thread.xml:341
#, python-format
msgid "Mark as Read"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:147
-#: code:addons/mail/static/src/xml/thread.xml:200
+#: code:addons/mail/static/src/xml/thread.xml:282
+#: code:addons/mail/static/src/xml/thread.xml:335
#, python-format
msgid "Mark as Todo"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/web_kanban_activity.xml:49
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:61
#, python-format
msgid "Mark as done"
msgstr ""
#. module: mail
+#: model:ir.ui.menu,name:mail.mail_blacklist_menu
+msgid "Mass Mail Blacklist"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel__image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -2534,6 +2919,7 @@ msgid "Message"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_has_error
#: model:ir.model.fields,field_description:mail.field_mail_channel__message_has_error
#: model:ir.model.fields,field_description:mail.field_mail_thread__message_has_error
#: model:ir.model.fields,field_description:mail.field_res_partner__message_has_error
@@ -2564,7 +2950,7 @@ msgid "Message Type"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_message.py:1194
+#: code:addons/mail/models/mail_message.py:1256
#, python-format
msgid "Message are pending moderation"
msgstr ""
@@ -2581,7 +2967,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:132
+#: code:addons/mail/static/src/xml/discuss.xml:171
#, python-format
msgid "Message sent in \""
msgstr ""
@@ -2624,6 +3010,7 @@ msgstr ""
#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_ids
#: model:ir.model.fields,field_description:mail.field_mail_channel__message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread__message_ids
#: model:ir.model.fields,field_description:mail.field_res_partner__message_ids
@@ -2651,6 +3038,13 @@ msgid "Messages with internal subtypes will be visible only by employees, aka me
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/models/threads/mailbox.js:207
+#, python-format
+msgid "Missing domain for mailbox with ID '%s'"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity_type__res_model_id
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__res_model
#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__model
@@ -2660,6 +3054,11 @@ msgid "Model"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type__res_model_change
+msgid "Model has change"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_mail_wizard_invite__res_model
msgid "Model of the followed resource"
msgstr ""
@@ -2676,7 +3075,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:1241
+#: code:addons/mail/static/src/js/services/mail_manager.js:1273
#: model:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
#, python-format
msgid "Moderate Messages"
@@ -2722,7 +3121,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:34
+#: code:addons/mail/static/src/xml/discuss.xml:45
#, python-format
msgid "Moderation Queue"
msgstr ""
@@ -2750,11 +3149,21 @@ msgid "Moderators"
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+msgid "Modifying the model can have an impact on existing activities using this activity type, be careful."
+msgstr ""
+
+#. module: mail
#: model:ir.model,name:mail.model_base_module_uninstall
msgid "Module Uninstallation"
msgstr ""
#. module: mail
+#: selection:ir.actions.server,activity_date_deadline_range_type:0
+msgid "Months"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
#: model:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
msgid "My Activities"
@@ -2809,14 +3218,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:145
+#: code:addons/mail/static/src/xml/discuss.xml:188
#, python-format
msgid "New Channel"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:144
+#: code:addons/mail/static/src/xml/discuss.xml:187
#, python-format
msgid "New Message"
msgstr ""
@@ -2853,31 +3262,31 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:1870
-#: code:addons/mail/static/src/js/services/chat_window_manager.js:283
-#: code:addons/mail/static/src/xml/systray.xml:12
-#: code:addons/mail/static/src/xml/systray.xml:21
+#: code:addons/mail/static/src/js/services/mail_manager.js:964
+#: code:addons/mail/static/src/js/thread_windows/thread_window.js:121
+#: code:addons/mail/static/src/xml/systray.xml:15
+#: code:addons/mail/static/src/xml/systray.xml:24
#, python-format
msgid "New message"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:271
+#: code:addons/mail/static/src/xml/thread.xml:406
#, python-format
msgid "New messages"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:100
+#: code:addons/mail/static/src/xml/thread.xml:115
#, python-format
msgid "New messages appear here."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:99
+#: code:addons/mail/static/src/js/discuss.js:104
#, python-format
msgid "New people"
msgstr ""
@@ -2888,6 +3297,13 @@ msgid "Newcomers on this moderated channel will automatically receive the guidel
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:79
+#, python-format
+msgid "Next"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_activity_view_tree
msgid "Next Activities"
msgstr ""
@@ -2920,17 +3336,17 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:58
-#: code:addons/mail/static/src/xml/web_kanban_activity.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:68
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:20
#, python-format
msgid "No activities planned."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:47
+#: code:addons/mail/static/src/xml/systray.xml:54
#, python-format
-msgid "No discussion yet..."
+msgid "No conversation yet..."
msgstr ""
#. module: mail
@@ -2940,28 +3356,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/followers.js:185
+#: code:addons/mail/static/src/js/followers.js:186
#, python-format
msgid "No follower"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:16
+#: code:addons/mail/static/src/xml/thread.xml:18
#, python-format
msgid "No matches found"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:17
+#: code:addons/mail/static/src/xml/thread.xml:19
#, python-format
msgid "No message matches your search. Try to change your search filters."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:103
+#: code:addons/mail/static/src/js/views/activity/activity_renderer.js:32
+#, python-format
+msgid "No schedulded activity"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:118
#, python-format
msgid "No starred message"
msgstr ""
@@ -2974,6 +3397,7 @@ msgid "No threading for answers"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_note
#: model:ir.model.fields,field_description:mail.field_mail_activity__note
#: model:mail.message.subtype,name:mail.mt_note
msgid "Note"
@@ -2981,7 +3405,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:152
+#: code:addons/mail/static/src/xml/thread.xml:287
#, python-format
msgid "Note by"
msgstr ""
@@ -3020,6 +3444,7 @@ msgid "Notify followers of the document (mass post only)"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction_counter
@@ -3028,11 +3453,12 @@ msgid "Number of Actions"
msgstr ""
#. module: mail
-#: model:ir.model.fields,help:mail.field_mail_activity_type__days
-msgid "Number of days before executing the action. It allows to plan the action deadline."
+#: model:ir.model.fields,help:mail.field_mail_activity_type__delay_count
+msgid "Number of days/week/month before executing the action. It allows to plan the action deadline."
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_has_error_counter
#: model:ir.model.fields,field_description:mail.field_mail_channel__message_has_error_counter
#: model:ir.model.fields,field_description:mail.field_mail_thread__message_has_error_counter
#: model:ir.model.fields,field_description:mail.field_res_partner__message_has_error_counter
@@ -3041,6 +3467,7 @@ msgid "Number of error"
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_blacklist__message_needaction_counter
#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction_counter
#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction_counter
#: model:ir.model.fields,help:mail.field_res_partner__message_needaction_counter
@@ -3049,6 +3476,7 @@ msgid "Number of messages which requires an action"
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_blacklist__message_has_error_counter
#: model:ir.model.fields,help:mail.field_mail_channel__message_has_error_counter
#: model:ir.model.fields,help:mail.field_mail_thread__message_has_error_counter
#: model:ir.model.fields,help:mail.field_res_partner__message_has_error_counter
@@ -3057,6 +3485,7 @@ msgid "Number of messages with delivery error"
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_blacklist__message_unread_counter
#: model:ir.model.fields,help:mail.field_mail_channel__message_unread_counter
#: model:ir.model.fields,help:mail.field_mail_thread__message_unread_counter
#: model:ir.model.fields,help:mail.field_res_partner__message_unread_counter
@@ -3067,34 +3496,44 @@ msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_notification_borders
#: model:ir.ui.view,arch_db:mail.mail_notification_light
+#: model:ir.ui.view,arch_db:mail.mail_notification_paynow
#: model:ir.ui.view,arch_db:mail.message_notification_email
msgid "Odoo"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:1193
+#: code:addons/mail/static/src/js/discuss.js:1383
+#: code:addons/mail/static/src/js/systray/systray_messaging_menu.js:170
#, python-format
msgid "Odoo has now the permission to send you native notifications on this device."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:15
#, python-format
msgid "Odoo needs your permission to"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:1190
+#: code:addons/mail/static/src/js/discuss.js:1380
+#: code:addons/mail/static/src/js/systray/systray_messaging_menu.js:167
#, python-format
msgid "Odoo will not have the permission to send native notifications on this device."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:128
+#: code:addons/mail/static/src/js/services/mail_manager.js:834
+#, python-format
+msgid "OdooBot has a request"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:164
#, python-format
msgid "Offline"
msgstr ""
@@ -3143,15 +3582,15 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/followers.js:187
+#: code:addons/mail/static/src/js/followers.js:188
#, python-format
msgid "One follower"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:126
-#: code:addons/mail/static/src/xml/discuss.xml:216
+#: code:addons/mail/static/src/xml/discuss.xml:162
+#: code:addons/mail/static/src/xml/discuss.xml:282
#, python-format
msgid "Online"
msgstr ""
@@ -3179,22 +3618,23 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:201
+#: code:addons/mail/static/src/xml/discuss.xml:249
#, python-format
msgid "Open chat"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/extended_chat_window.xml:15
+#: code:addons/mail/static/src/js/thread_windows/thread_window.js:207
#, python-format
-msgid "Open in Discuss"
+msgid "Open document"
msgstr ""
#. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_partner__opt_out
-#: model:ir.model.fields,field_description:mail.field_res_users__opt_out
-msgid "Opt-Out"
+#. openerp-web
+#: code:addons/mail/static/src/js/thread_windows/thread_window.js:209
+#, python-format
+msgid "Open in Discuss"
msgstr ""
#. module: mail
@@ -3277,6 +3717,13 @@ msgid "Owner"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:31
+#, python-format
+msgid "PDF file"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__parent_id
msgid "Parent"
msgstr ""
@@ -3320,12 +3767,7 @@ msgid "Partner"
msgstr ""
#. module: mail
-#: model:ir.actions.act_window,name:mail.action_partner_mass_mail
-msgid "Partner Mass Mailing"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/res_partner.py:32
+#: code:addons/mail/models/res_partner.py:29
#, python-format
msgid "Partner Profile"
msgstr ""
@@ -3341,11 +3783,6 @@ msgid "Partner with additionnal information for mail resend"
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
-msgid "Partners that did not ask not to be included in mass mailing campaigns"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction_partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction_partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_message__needaction_partner_ids
@@ -3360,14 +3797,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:263
+#: code:addons/mail/static/src/xml/thread.xml:401
#, python-format
msgid "Pending moderation"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:108
+#: code:addons/mail/static/src/xml/thread.xml:123
#, python-format
msgid "Pending moderation messages appear here."
msgstr ""
@@ -3391,14 +3828,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:1189
+#: code:addons/mail/static/src/js/discuss.js:1379
+#: code:addons/mail/static/src/js/systray/systray_messaging_menu.js:166
#, python-format
msgid "Permission denied"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:1192
+#: code:addons/mail/static/src/js/discuss.js:1382
+#: code:addons/mail/static/src/js/systray/systray_messaging_menu.js:169
#, python-format
msgid "Permission granted"
msgstr ""
@@ -3429,37 +3868,32 @@ msgid "Planned activities"
msgstr ""
#. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_type__days
-msgid "Planned in"
-msgstr ""
-
-#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
-msgid "Planned in (days)"
+msgid "Planned in"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:158
+#: code:addons/mail/static/src/js/composers/chatter_composer.js:123
#, python-format
msgid "Please complete customer's informations"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/many2many_tags_email.js:85
-#, python-format
-msgid "Please complete customer's informations and email"
+#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+msgid "Please contact us instead using"
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
-msgid "Please contact us instead using"
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:521
+#, python-format
+msgid "Please wait"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/composer.js:674
+#: code:addons/mail/static/src/js/composers/basic_composer.js:242
#, python-format
msgid "Please, wait while the file is uploading."
msgstr ""
@@ -3486,6 +3920,7 @@ msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_notification_borders
#: model:ir.ui.view,arch_db:mail.mail_notification_light
+#: model:ir.ui.view,arch_db:mail.mail_notification_paynow
msgid "Powered by"
msgstr ""
@@ -3506,7 +3941,12 @@ msgid "Preferred response address (placeholders may be used here)"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:70
+#: code:addons/mail/static/src/xml/discuss.xml:281
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:47
#: model:ir.ui.view,arch_db:mail.email_template_form
+#, python-format
msgid "Preview"
msgstr ""
@@ -3516,13 +3956,20 @@ msgid "Preview of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:76
+#, python-format
+msgid "Previous"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity__previous_activity_type_id
msgid "Previous Activity Type"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:56
+#: code:addons/mail/static/src/xml/thread.xml:60
#, python-format
msgid "Print"
msgstr ""
@@ -3535,15 +3982,15 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:62
-#: code:addons/mail/static/src/xml/discuss.xml:190
+#: code:addons/mail/static/src/xml/discuss.xml:73
+#: code:addons/mail/static/src/xml/discuss.xml:234
#, python-format
msgid "Private Channels"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:1168
+#: code:addons/mail/static/src/js/discuss.js:1358
#, python-format
msgid "Public Channels"
msgstr ""
@@ -3562,6 +4009,13 @@ msgid "Re:"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:324
+#, python-format
+msgid "Ready"
+msgstr ""
+
+#. module: mail
#: selection:mail.notification,email_status:0
msgid "Ready to Send"
msgstr ""
@@ -3618,21 +4072,21 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:149
+#: code:addons/mail/static/src/xml/discuss.xml:192
#, python-format
msgid "Reject"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:149
+#: code:addons/mail/static/src/xml/discuss.xml:192
#, python-format
msgid "Reject selected messages"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:253
+#: code:addons/mail/static/src/xml/thread.xml:391
#, python-format
msgid "Reject |"
msgstr ""
@@ -3691,14 +4145,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:253
+#: code:addons/mail/static/src/xml/thread.xml:391
#, python-format
msgid "Remove message with explanation"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:255
+#: code:addons/mail/static/src/xml/thread.xml:393
#, python-format
msgid "Remove message without explanation"
msgstr ""
@@ -3710,14 +4164,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:51
+#: code:addons/mail/static/src/xml/followers.xml:53
#, python-format
msgid "Remove this follower"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:203
+#: code:addons/mail/static/src/xml/thread.xml:338
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "Reply"
@@ -3762,12 +4216,17 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:49
+#: code:addons/mail/static/src/xml/thread.xml:53
#, python-format
msgid "Reset Zoom"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_user_id
+msgid "Responsible"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_user_id
#: model:ir.model.fields,field_description:mail.field_res_partner__activity_user_id
#: model:ir.model.fields,field_description:mail.field_res_users__activity_user_id
@@ -3792,7 +4251,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:53
+#: code:addons/mail/static/src/xml/thread.xml:57
#, python-format
msgid "Rotate"
msgstr ""
@@ -3819,7 +4278,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_window.js:41
+#: code:addons/mail/static/src/js/thread_windows/abstract_thread_window.js:63
#, python-format
msgid "Say something"
msgstr ""
@@ -3831,20 +4290,20 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:60
+#: code:addons/mail/static/src/xml/chatter.xml:70
#, python-format
msgid "Schedule activity"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_activity.py:297
+#: code:addons/mail/models/mail_activity.py:414
#, python-format
msgid "Schedule an Activity"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/web_kanban_activity.xml:57
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:69
#, python-format
msgid "Schedule an activity"
msgstr ""
@@ -3878,14 +4337,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:146
+#: code:addons/mail/static/src/xml/discuss.xml:189
#, python-format
msgid "Select All"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:146
+#: code:addons/mail/static/src/xml/discuss.xml:189
#, python-format
msgid "Select all messages to moderate"
msgstr ""
@@ -3909,8 +4368,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/composer.js:384
-#: code:addons/mail/static/src/js/discuss.js:141
+#: code:addons/mail/static/src/js/composers/basic_composer.js:49
+#: code:addons/mail/static/src/js/discuss.js:148
+#: code:addons/mail/static/src/xml/composer.xml:16
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
#, python-format
msgid "Send"
@@ -3922,6 +4382,7 @@ msgid "Send Again"
msgstr ""
#. module: mail
+#: model:ir.actions.act_window,name:mail.action_partner_mass_mail
#: selection:ir.actions.server,state:0
#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__send_mail
msgid "Send Email"
@@ -3934,21 +4395,25 @@ msgid "Send Mail (%s)"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:72
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:49
#: model:ir.ui.view,arch_db:mail.view_mail_form
#: model:ir.ui.view,arch_db:mail.view_mail_tree
+#, python-format
msgid "Send Now"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:53
+#: code:addons/mail/static/src/xml/chatter.xml:63
#, python-format
msgid "Send a message"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:138
+#: code:addons/mail/static/src/js/discuss.js:145
#, python-format
msgid "Send explanation to author"
msgstr ""
@@ -3965,7 +4430,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:53
+#: code:addons/mail/static/src/xml/chatter.xml:63
#, python-format
msgid "Send message"
msgstr ""
@@ -3983,22 +4448,25 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:92
+#: code:addons/mail/static/src/js/thread_field.js:91
#, python-format
msgid "Sending Error"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:114
+#: code:addons/mail/static/src/xml/discuss.xml:147
#, python-format
msgid "Sends messages by email"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:321
#: model:ir.ui.view,arch_db:mail.view_mail_search
#: selection:mail.mail,state:0
#: selection:mail.notification,email_status:0
+#, python-format
msgid "Sent"
msgstr ""
@@ -4036,7 +4504,7 @@ msgid "Show all records which has next action date is before today"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:881
+#: code:addons/mail/models/mail_channel.py:910
#, python-format
msgid "Show an helper message"
msgstr ""
@@ -4071,15 +4539,20 @@ msgid "Small-sized photo of the group. It is automatically resized as a 64x64px
msgstr ""
#. module: mail
+#: selection:ir.actions.server,activity_user_type:0
+msgid "Specific User"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_mail_activity_type__res_model_id
msgid "Specify a model if the activity should be specific to a model and not available when managing activities for other models."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:170
-#: code:addons/mail/static/src/xml/discuss.xml:28
-#: code:addons/mail/static/src/xml/discuss.xml:170
+#: code:addons/mail/static/src/js/services/mail_manager.js:1266
+#: code:addons/mail/static/src/xml/discuss.xml:39
+#: code:addons/mail/static/src/xml/discuss.xml:214
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred
#: model:ir.model.fields,field_description:mail.field_mail_mail__starred
#: model:ir.model.fields,field_description:mail.field_mail_message__starred
@@ -4125,7 +4598,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/composer.xml:8
-#: code:addons/mail/static/src/xml/discuss.xml:160
+#: code:addons/mail/static/src/xml/discuss.xml:203
#: model:ir.model.fields,field_description:mail.field_email_template_preview__subject
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__subject
#: model:ir.model.fields,field_description:mail.field_mail_mail__subject
@@ -4149,7 +4622,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:225
+#: code:addons/mail/static/src/xml/thread.xml:360
#, python-format
msgid "Subject:"
msgstr ""
@@ -4175,6 +4648,7 @@ msgid "Subtypes"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_summary
#: model:ir.model.fields,field_description:mail.field_mail_activity__summary
#: model:ir.model.fields,field_description:mail.field_mail_activity_type__summary
msgid "Summary"
@@ -4192,6 +4666,21 @@ msgid "Technical field for UX purpose"
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity_type__res_model_change
+msgid "Technical field for UX related behaviour"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity_type__initial_res_model_id
+msgid "Technical field to keep trace of the model at the beginning of the edition for UX related behaviour"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_ir_actions_server__activity_user_field_name
+msgid "Technical name of the user on the record"
+msgstr ""
+
+#. module: mail
#: model:ir.actions.act_window,name:mail.wizard_email_template_preview
msgid "Template Preview"
msgstr ""
@@ -4216,6 +4705,12 @@ msgid "The"
msgstr ""
#. module: mail
+#: code:addons/mail/models/ir_actions.py:50
+#, python-format
+msgid "The 'Due Date In' value can't be negative."
+msgstr ""
+
+#. module: mail
#: sql_constraint:mail.moderation:0
msgid "The email address must be unique per channel !"
msgstr ""
@@ -4252,9 +4747,9 @@ msgid "The owner of records created upon receiving emails on this alias. If this
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_activity.py:183
-#: code:addons/mail/models/mail_message.py:680
-#: code:addons/mail/models/mail_message.py:850
+#: code:addons/mail/models/mail_activity.py:276
+#: code:addons/mail/models/mail_message.py:683
+#: code:addons/mail/models/mail_message.py:853
#, python-format
msgid "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
"\n"
@@ -4278,11 +4773,29 @@ msgid "This"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity_view.xml:10
+#, python-format
+msgid "This action will send an email."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_blacklist.py:56
+#, python-format
+msgid "This email does not belong to the blacklist."
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_mail_channel__image
msgid "This field holds the image used as photo for the group, limited to 1024x1024px."
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_blacklist__email
+msgid "This field is case insensitive."
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_mail_channel__public
msgid "This group is visible by non members. Invisible groups can add members through the invite button."
msgstr ""
@@ -4317,8 +4830,8 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:14
-#: code:addons/mail/static/src/xml/extended_chat_window.xml:7
+#: code:addons/mail/static/src/xml/chatter.xml:16
+#: code:addons/mail/static/src/xml/thread_window.xml:10
#, python-format
msgid "To:"
msgstr ""
@@ -4326,8 +4839,8 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/activity.js:83
-#: code:addons/mail/static/src/js/thread.js:348
-#: code:addons/mail/static/src/xml/systray.xml:75
+#: code:addons/mail/static/src/js/models/messages/abstract_message.js:107
+#: code:addons/mail/static/src/xml/systray.xml:85
#: selection:mail.activity,state:0
#: selection:mail.activity.mixin,activity_state:0
#: selection:res.partner,activity_state:0
@@ -4379,6 +4892,11 @@ msgid "Tracking Values"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__track_sequence
+msgid "Tracking field sequence"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__tracking_value_ids
#: model:ir.model.fields,field_description:mail.field_mail_mail__tracking_value_ids
#: model:ir.model.fields,field_description:mail.field_mail_message__tracking_value_ids
@@ -4389,10 +4907,16 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_type
#: model:ir.model.fields,field_description:mail.field_mail_mail__message_type
#: model:ir.model.fields,field_description:mail.field_mail_message__message_type
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
msgid "Type"
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity_type__delay_from
+msgid "Type of delay"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_ir_actions_server__state
msgid "Type of server action. The following values are available:\n"
"- 'Execute Python Code': a block of python code that will be executed\n"
@@ -4409,19 +4933,19 @@ msgid "UUID"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_mail.py:238
+#: code:addons/mail/models/mail_mail.py:241
#, python-format
msgid "Unable to connect to SMTP Server"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:2144
+#: code:addons/mail/models/mail_thread.py:2183
#, python-format
msgid "Unable to log message, please configure the sender's email address."
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:2109
+#: code:addons/mail/models/mail_thread.py:2148
#, python-format
msgid "Unable to notify message, please configure the sender's email address."
msgstr ""
@@ -4434,6 +4958,13 @@ msgstr ""
#. module: mail
#. openerp-web
+#: code:addons/mail/static/src/js/thread_windows/abstract_thread_window.js:154
+#, python-format
+msgid "Undefined"
+msgstr ""
+
+#. module: mail
+#. openerp-web
#: code:addons/mail/static/src/xml/followers.xml:22
#, python-format
msgid "Unfollow"
@@ -4445,11 +4976,22 @@ msgid "Unfortunately this email alias is already used, please choose a unique on
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
+msgid "Unit"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity_type__delay_unit
+msgid "Unit of delay"
+msgstr ""
+
+#. module: mail
#: selection:mail.notification,failure_type:0
msgid "Unknown error occured"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_unread
#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread
#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread
#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread
@@ -4458,6 +5000,7 @@ msgid "Unread Messages"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_unread_counter
#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread_counter
#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread_counter
#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread_counter
@@ -4466,47 +5009,50 @@ msgid "Unread Messages Counter"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/abstract_thread_window.xml:35
#: model:ir.ui.view,arch_db:mail.view_message_search
+#, python-format
msgid "Unread messages"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:147
+#: code:addons/mail/static/src/xml/discuss.xml:190
#, python-format
msgid "Unselect All"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:147
+#: code:addons/mail/static/src/xml/discuss.xml:190
#, python-format
msgid "Unselect all messages to moderate"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:143
+#: code:addons/mail/static/src/xml/discuss.xml:186
#, python-format
msgid "Unstar all"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:143
+#: code:addons/mail/static/src/xml/discuss.xml:186
#, python-format
msgid "Unstar all messages"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:1772
+#: code:addons/mail/static/src/js/discuss.js:347
#, python-format
-msgid "Unsubscribed"
+msgid "Unsubscribe"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:474
+#: code:addons/mail/models/mail_template.py:473
#, python-format
msgid "Unsupported report type %s found."
msgstr ""
@@ -4518,19 +5064,31 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:344
+#: code:addons/mail/static/src/xml/thread.xml:508
+#, python-format
+msgid "Uploaded"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:500
#, python-format
msgid "Uploading"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/composer.js:674
+#: code:addons/mail/static/src/js/composers/basic_composer.js:242
#, python-format
msgid "Uploading error"
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_ir_actions_server__activity_user_type
+msgid "Use 'Specific User' to always assign the same user on the next activity. Use 'Generic User From Record' to specify the field name of the user to choose on the record."
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__use_active_domain
msgid "Use active domain"
msgstr ""
@@ -4551,16 +5109,24 @@ msgid "Used to order subtypes."
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:55
#: model:ir.ui.view,arch_db:mail.view_mail_alias_search
#: model:ir.ui.view,arch_db:mail.view_mail_form
#: model:ir.ui.view,arch_db:mail.view_mail_tree
+#, python-format
msgid "User"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_user_field_name
+msgid "User field name"
+msgstr ""
+
+#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:57
-#: code:addons/mail/static/src/xml/extended_chat_window.xml:8
+#: code:addons/mail/static/src/xml/discuss.xml:68
+#: code:addons/mail/static/src/xml/thread_window.xml:11
#, python-format
msgid "User name"
msgstr ""
@@ -4571,7 +5137,7 @@ msgid "Users"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:925
+#: code:addons/mail/models/mail_channel.py:955
#, python-format
msgid "Users in this channel: %s %s and you."
msgstr ""
@@ -4582,21 +5148,44 @@ msgid "Using your own email server is required to send/receive emails in Communi
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:723
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:32
+#, python-format
+msgid "Video"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:732
+#: model:ir.ui.view,arch_db:mail.mail_notification_paynow
+#: model:ir.ui.view,arch_db:mail.message_activity_assigned
#: model:ir.ui.view,arch_db:mail.message_user_assigned
#, python-format
msgid "View"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:721
+#: code:addons/mail/models/mail_thread.py:730
#, python-format
msgid "View %s"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/followers.js:240
+#: code:addons/mail/static/src/xml/thread.xml:43
+#, python-format
+msgid "Viewer"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/followers.xml:85
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/followers.js:241
#, python-format
msgid "Warning! \n"
" If you remove a follower, he won't be notified of any email or discussion on this document.\n"
@@ -4604,6 +5193,11 @@ msgid "Warning! \n"
msgstr ""
#. module: mail
+#: selection:ir.actions.server,activity_date_deadline_range_type:0
+msgid "Weeks"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_email_template_preview__sub_model_object_field
#: model:ir.model.fields,help:mail.field_mail_template__sub_model_object_field
msgid "When a relationship field is selected as first field, this field lets you select the target field within the destination document model (sub-model)."
@@ -4631,18 +5225,13 @@ msgid "Whether this model supports messages and notifications."
msgstr ""
#. module: mail
-#: model:ir.ui.menu,name:mail.mail_moderation_menu
-msgid "White List / Black List"
-msgstr ""
-
-#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Who can follow the group's activities?"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/activity.xml:75
+#: code:addons/mail/static/src/xml/activity.xml:95
#, python-format
msgid "Write Feedback"
msgstr ""
@@ -4657,41 +5246,41 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/activity.js:87
-#: code:addons/mail/static/src/js/thread.js:350
+#: code:addons/mail/static/src/js/models/messages/abstract_message.js:109
#, python-format
msgid "Yesterday"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:98
+#: code:addons/mail/static/src/js/discuss.js:101
#, python-format
msgid "You added <b>%s</b> to the conversation."
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:922
+#: code:addons/mail/models/mail_channel.py:952
#, python-format
msgid "You are alone in this channel."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:317
+#: code:addons/mail/static/src/js/discuss.js:373
#, python-format
msgid "You are going to ban: %s. Do you confirm the action?"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:337
+#: code:addons/mail/static/src/js/discuss.js:396
#, python-format
msgid "You are going to discard %s messages. Do you confirm the action?"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:339
+#: code:addons/mail/static/src/js/discuss.js:400
#, python-format
msgid "You are going to discard 1 message. Do you confirm the action?"
msgstr ""
@@ -4702,22 +5291,29 @@ msgid "You are going to send the guidelines to all the subscribers. Do you confi
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:891
+#: code:addons/mail/models/mail_channel.py:921
#, python-format
msgid "You are in a private conversation with <b>@%s</b>."
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:886
+#: code:addons/mail/models/mail_channel.py:915
#, python-format
msgid "You are in channel <b>#%s</b>."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:104
+#: code:addons/mail/static/src/js/discuss.js:344
+#, python-format
+msgid "You are the administrator of this channel. Are you sure you want to unsubscribe?"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:119
#, python-format
-msgid "You can mark any message as 'starred', and it shows up in this channel."
+msgid "You can mark any message as 'starred', and it shows up in this mailbox."
msgstr ""
#. module: mail
@@ -4728,7 +5324,7 @@ msgid "You cannot create a new user from here.\n"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:239
+#: code:addons/mail/models/mail_channel.py:241
#, python-format
msgid "You cannot delete those groups, as the Whole Company group is required by other modules."
msgstr ""
@@ -4740,7 +5336,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:1611
+#: code:addons/mail/static/src/js/services/mail_notification_manager.js:198
#, python-format
msgid "You have been invited to: "
msgstr ""
@@ -4752,7 +5348,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:107
+#: code:addons/mail/static/src/xml/thread.xml:122
#, python-format
msgid "You have no message to moderate"
msgstr ""
@@ -4765,84 +5361,103 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:1768
+#: code:addons/mail/static/src/js/services/mail_notification_manager.js:444
#, python-format
msgid "You unpinned your conversation with <b>%s</b>."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:1766
+#: code:addons/mail/static/src/js/services/mail_notification_manager.js:439
#, python-format
msgid "You unsubscribed from <b>%s</b>."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:231
+#: code:addons/mail/static/src/xml/discuss.xml:297
#, python-format
msgid "You:"
msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_notification_light
+#: model:ir.ui.view,arch_db:mail.mail_notification_paynow
msgid "Your"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/thread_field.js:92
+#: code:addons/mail/static/src/js/thread_field.js:91
#, python-format
msgid "Your message has not been sent."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:263
+#: code:addons/mail/static/src/xml/thread.xml:401
#, python-format
msgid "Your message is pending moderation"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:161
+#: code:addons/mail/static/src/xml/discuss.xml:204
#, python-format
msgid "Your message was rejected by moderator."
msgstr ""
#. module: mail
-#: code:addons/mail/models/ir_actions.py:30
+#: code:addons/mail/models/ir_actions.py:56
#, python-format
msgid "Your template should define email_from"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:48
+#: code:addons/mail/static/src/xml/thread.xml:52
#, python-format
msgid "Zoom In"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:50
+#: code:addons/mail/static/src/xml/thread.xml:54
#, python-format
msgid "Zoom Out"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1050
+#: selection:mail.activity.type,delay_from:0
+msgid "after previous activity deadline"
+msgstr ""
+
+#. module: mail
+#: selection:mail.activity.type,delay_from:0
+msgid "after validation date"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:1059
#, python-format
msgid "alias %s: %s"
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.message_activity_assigned
+msgid "assigned you an activity"
+msgstr ""
+
+#. module: mail
#: model:ir.model,name:mail.model_base_partner_merge_automatic_wizard
msgid "base.partner.merge.automatic.wizard"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:43
#: model:ir.ui.view,arch_db:mail.view_mail_form
+#, python-format
msgid "by"
msgstr ""
@@ -4858,7 +5473,12 @@ msgid "created"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:336
+#: selection:mail.activity.type,delay_unit:0
+msgid "days"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:344
#, python-format
msgid "document"
msgstr ""
@@ -4871,19 +5491,20 @@ msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+#: model:ir.ui.view,arch_db:mail.view_server_action_form_template
msgid "e.g. Discuss proposal"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:11
+#: code:addons/mail/static/src/xml/discuss.xml:15
#, python-format
msgid "enable desktop notifications"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/followers.js:189
+#: code:addons/mail/static/src/js/followers.js:190
#, python-format
msgid "followers"
msgstr ""
@@ -4938,19 +5559,19 @@ msgid "mail.alias.mixin"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1027
+#: code:addons/mail/models/mail_thread.py:1036
#, python-format
msgid "model %s does not accept document creation"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1022
+#: code:addons/mail/models/mail_thread.py:1031
#, python-format
msgid "model %s does not accept document update"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1015
+#: code:addons/mail/models/mail_thread.py:1024
#, python-format
msgid "model %s does not accept document update, fall back on document creation"
msgstr ""
@@ -4961,33 +5582,47 @@ msgid "modified"
msgstr ""
#. module: mail
+#: selection:mail.activity.type,delay_unit:0
+msgid "months"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
msgid "mycompany.odoo.com"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/thread.js:22
+#: code:addons/mail/static/src/js/utils.js:108
#, python-format
msgid "now"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:171
+#: code:addons/mail/static/src/xml/thread.xml:306
+#: model:ir.ui.view,arch_db:mail.message_activity_assigned
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:997
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:71
+#: code:addons/mail/static/src/xml/web_kanban_activity.xml:48
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:1006
#, python-format
msgid "posting a message without model should be with a null res_id (private message), received %s"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1001
+#: code:addons/mail/models/mail_thread.py:1010
#, python-format
msgid "posting a message without model should be with a parent_id (private message)"
msgstr ""
@@ -4999,14 +5634,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/thread.js:18
+#: code:addons/mail/static/src/js/thread_widget.js:20
#, python-format
msgid "read less"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/thread.js:17
+#: code:addons/mail/static/src/js/thread_widget.js:19
#, python-format
msgid "read more"
msgstr ""
@@ -5017,13 +5652,13 @@ msgid "record:"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1019
+#: code:addons/mail/models/mail_thread.py:1028
#, python-format
msgid "reply to missing document (%s,%s)"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1012
+#: code:addons/mail/models/mail_thread.py:1021
#, python-format
msgid "reply to missing document (%s,%s), fall back on new document creation"
msgstr ""
@@ -5034,13 +5669,13 @@ msgid "res.config.settings"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:997
+#: code:addons/mail/models/mail_thread.py:1006
#, python-format
msgid "resetting thread_id"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:403
+#: code:addons/mail/models/mail_channel.py:407
#, python-format
msgid "restricted to channel members"
msgstr ""
@@ -5058,11 +5693,11 @@ msgid "restricted to known authors"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1001
-#: code:addons/mail/models/mail_thread.py:1019
-#: code:addons/mail/models/mail_thread.py:1022
-#: code:addons/mail/models/mail_thread.py:1027
-#: code:addons/mail/models/mail_thread.py:1050
+#: code:addons/mail/models/mail_thread.py:1010
+#: code:addons/mail/models/mail_thread.py:1028
+#: code:addons/mail/models/mail_thread.py:1031
+#: code:addons/mail/models/mail_thread.py:1036
+#: code:addons/mail/models/mail_thread.py:1059
#, python-format
msgid "skipping"
msgstr ""
@@ -5074,19 +5709,24 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:20
+#: code:addons/mail/static/src/xml/chatter.xml:22
#, python-format
msgid "this document"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1050
+#: model:ir.ui.view,arch_db:mail.message_activity_assigned
+msgid "to close for"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:1059
#, python-format
msgid "unknown error"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:990
+#: code:addons/mail/models/mail_thread.py:999
#, python-format
msgid "unknown target model %s"
msgstr ""
@@ -5096,3 +5736,8 @@ msgstr ""
msgid "using"
msgstr ""
+#. module: mail
+#: selection:mail.activity.type,delay_unit:0
+msgid "weeks"
+msgstr ""
+
diff --git a/addons/mail_bot/i18n/mail_bot.pot b/addons/mail_bot/i18n/mail_bot.pot
new file mode 100644
index 00000000000..fe747082faf
--- /dev/null
+++ b/addons/mail_bot/i18n/mail_bot.pot
@@ -0,0 +1,253 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * mail_bot
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~11.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:56
+#, python-format
+msgid "Aaaaaw that's really cute but, you know, bots don't work that way. You're too human for me! Let's keep it professional ❤️"
+msgstr ""
+
+#. module: mail_bot
+#: model:ir.model,name:mail_bot.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: mail_bot
+#: selection:res.users,odoobot_state:0
+msgid "Disabled"
+msgstr ""
+
+#. module: mail_bot
+#: model:ir.model,name:mail_bot.model_mail_channel
+msgid "Discussion channel"
+msgstr ""
+
+#. module: mail_bot
+#: model:ir.model.fields,field_description:mail_bot.field_mail_bot__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: mail_bot
+#: model:ir.model,name:mail_bot.model_mail_thread
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:41
+#, python-format
+msgid "Great! 👍<br/>Now, try to <b>send an attachment</b>, like a picture of your cute dog..."
+msgstr ""
+
+#. module: mail_bot
+#: model:ir.model,name:mail_bot.model_ir_http
+msgid "HTTP routing"
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_channel.py:38
+#, python-format
+msgid "Hello,<br/>Odoo's chat helps employees collaborate efficiently. I'm here to help you discover its features.<br/><b>Try to send me an emoji :)</b>"
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:73
+#, python-format
+msgid "Hmmm..."
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:74
+#, python-format
+msgid "I'm afraid I don't understand. Sorry!"
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:58
+#, python-format
+msgid "I'm just a bot... :( You can check <a href=\"https://www.odoo.com/page/docs\">our documentation</a>) for more information!"
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:72
+#, python-format
+msgid "I'm not smart enough to answer your question.<br/>To follow my guide, ask"
+msgstr ""
+
+#. module: mail_bot
+#: model:ir.model.fields,field_description:mail_bot.field_mail_bot__id
+msgid "ID"
+msgstr ""
+
+#. module: mail_bot
+#: selection:res.users,odoobot_state:0
+msgid "Idle"
+msgstr ""
+
+#. module: mail_bot
+#: model:ir.model.fields,field_description:mail_bot.field_mail_bot____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:44
+#, python-format
+msgid "Not a cute dog, but you get it 😊<br/>To access special features, <b>start your sentence with '/'</b>. Try to get help."
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:64
+#, python-format
+msgid "Not exactly. To continue the tour, send an emoji, <b>type \":)\"</b> and press enter."
+msgstr ""
+
+#. module: mail_bot
+#: selection:res.users,odoobot_state:0
+msgid "Not initialized"
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:68
+#, python-format
+msgid "Not sure wat you are doing. Please press / and wait for the propositions. Select \"help\" and press enter"
+msgstr ""
+
+#. module: mail_bot
+#: model:ir.model.fields,field_description:mail_bot.field_res_users__odoobot_state
+msgid "OdooBot Status"
+msgstr ""
+
+#. module: mail_bot
+#: selection:res.users,odoobot_state:0
+msgid "Onboarding attachement"
+msgstr ""
+
+#. module: mail_bot
+#: selection:res.users,odoobot_state:0
+msgid "Onboarding canned"
+msgstr ""
+
+#. module: mail_bot
+#: selection:res.users,odoobot_state:0
+msgid "Onboarding command"
+msgstr ""
+
+#. module: mail_bot
+#: selection:res.users,odoobot_state:0
+msgid "Onboarding emoji"
+msgstr ""
+
+#. module: mail_bot
+#: selection:res.users,odoobot_state:0
+msgid "Onboarding ping"
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:78
+#, python-format
+msgid "Pong."
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:75
+#, python-format
+msgid "Sorry I'm sleepy. Or not! Maybe I'm just trying to hide my unawareness of human language...<br/>I can show you features if you write"
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:70
+#, python-format
+msgid "Sorry, I am not listening. To get someone's attention, <b>ping him</b>. Write \"@odoobot\" and select me."
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:60
+#, python-format
+msgid "That's not nice! I'm a bot but I have feelings... 💔"
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:66
+#, python-format
+msgid "To <b>send an attachment</b>, click the 📎 icon on the right, and select a file."
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:53
+#, python-format
+msgid "To start, try to send me an emoji :)"
+msgstr ""
+
+#. module: mail_bot
+#: model:ir.model,name:mail_bot.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:47
+#, python-format
+msgid "Wow you are a natural!<br/>Ping someone to grab its attention with @nameoftheuser. <b>Try to ping me using @OdooBot</b> in a sentence."
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:50
+#, python-format
+msgid "Yep, I am here! 🎉 <br/>You finished the tour, you can <b>close this chat window</b>. Enjoy discovering Odoo."
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:78
+#, python-format
+msgid "Yep, OdooBot is in the place!"
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:59
+#, python-format
+msgid "fuck"
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:57
+#, python-format
+msgid "help"
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:55
+#, python-format
+msgid "i love you"
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:55
+#, python-format
+msgid "love"
+msgstr ""
+
+#. module: mail_bot
+#: model:ir.model,name:mail_bot.model_mail_bot
+msgid "mail.bot"
+msgstr ""
+
+#. module: mail_bot
+#: code:addons/mail_bot/models/mail_bot.py:51
+#: code:addons/mail_bot/models/mail_bot.py:72
+#: code:addons/mail_bot/models/mail_bot.py:75
+#, python-format
+msgid "start the tour"
+msgstr ""
+
diff --git a/addons/maintenance/i18n/maintenance.pot b/addons/maintenance/i18n/maintenance.pot
index c557f8a009c..991e01e6c07 100644
--- a/addons/maintenance/i18n/maintenance.pot
+++ b/addons/maintenance/i18n/maintenance.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -37,7 +37,12 @@ msgstr ""
#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
-msgid "<span class=\"label label-warning pull-right\">Canceled</span>"
+msgid "<span class=\"badge badge-warning float-right\">Canceled</span>"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
+msgid "<span class=\"ml8\">hours</span>"
msgstr ""
#. module: maintenance
@@ -308,6 +313,11 @@ msgid "Dashboard"
msgstr ""
#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment__effective_date
+msgid "Date at which the equipment became effective. This date will be used to compute the Mean Time Between Failure."
+msgstr ""
+
+#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__next_action_date
msgid "Date of the next preventive maintenance"
msgstr ""
@@ -365,6 +375,12 @@ msgid "Done"
msgstr ""
#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_kanban
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_kanban
+msgid "Dropdown menu"
+msgstr ""
+
+#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__duration
msgid "Duration"
msgstr ""
@@ -381,6 +397,11 @@ msgid "Edit..."
msgstr ""
#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__effective_date
+msgid "Effective Date"
+msgstr ""
+
+#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_form
msgid "Email Alias"
msgstr ""
@@ -991,7 +1012,7 @@ msgid "Request Done"
msgstr ""
#. module: maintenance
-#: code:addons/maintenance/models/maintenance.py:369
+#: code:addons/maintenance/models/maintenance.py:375
#, python-format
msgid "Request planned for <a href=\"#\" data-oe-model=\"%s\" data-oe-id=\"%s\">%s</a>"
msgstr ""
@@ -1274,12 +1295,6 @@ msgid "days"
msgstr ""
#. module: maintenance
-#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
-msgid "for"
-msgstr ""
-
-#. module: maintenance
-#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
msgid "hours"
msgstr ""
diff --git a/addons/mass_mailing/i18n/mass_mailing.pot b/addons/mass_mailing/i18n/mass_mailing.pot
index d985538b63a..35c42d50488 100644
--- a/addons/mass_mailing/i18n/mass_mailing.pot
+++ b/addons/mass_mailing/i18n/mass_mailing.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@ msgid "%<br/>\n"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:551
+#: code:addons/mass_mailing/models/mass_mailing.py:601
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -54,21 +54,21 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps
msgid "&amp;nbsp;\n"
-" <span class=\"fa fa-compass fa-2x text-delta\"/>\n"
+" <span class=\"fa fa-compass fa-2x text-delta\" role=\"img\" aria-label=\"Choose\" title=\"Choose\"/>\n"
" &amp;nbsp;"
msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps
msgid "&amp;nbsp;\n"
-" <span class=\"fa fa-credit-card fa-2x text-delta\"/>\n"
+" <span class=\"fa fa-credit-card fa-2x text-delta\" role=\"img\" aria-label=\"Order\" title=\"Order\"/>\n"
" &amp;nbsp;"
msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps
msgid "&amp;nbsp;\n"
-" <span class=\"fa fa-smile-o fa-2x text-delta\"/>\n"
+" <span class=\"fa fa-smile-o fa-2x text-delta\" role=\"img\" aria-label=\"Enjoy\" title=\"Enjoy\"/>\n"
" &amp;nbsp;"
msgstr ""
@@ -123,11 +123,6 @@ msgid "<small>\n"
msgstr ""
#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount2
-msgid "<small>CODE</small>: <strong class=\"o_code h3\">45A9E77DGW8455</strong>"
-msgstr ""
-
-#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps
msgid "<small>Step 1:</small>"
msgstr ""
@@ -150,7 +145,12 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_social
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_social_left
-msgid "<span class=\"fa fa-copyright\"/> 2016 All Rights Reserved"
+msgid "<span class=\"fa fa-copyright\" role=\"img\" aria-label=\"Copyright\" title=\"Copyright\"/> 2016 All Rights Reserved"
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount2
+msgid "<span style=\"line-height: 30px;\"><small>CODE: </small></span><strong class=\"o_code h3\">45A9E77DGW8455</strong>"
msgstr ""
#. module: mass_mailing
@@ -189,6 +189,11 @@ msgid "<strong>Total</strong> management"
msgstr ""
#. module: mass_mailing
+#: sql_constraint:mail.mass_mailing.list_contact_rel:0
+msgid "A contact cannot be subscribed multiple times to the same list!"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_three_cols
msgid "A short description"
msgstr ""
@@ -230,6 +235,39 @@ msgid "Allow A/B Testing"
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,help:mass_mailing.field_res_config_settings__show_blacklist_buttons
+#: model:ir.ui.view,arch_db:mass_mailing.res_config_settings_view_form
+msgid "Allow the recipient to manage himself his state in the blacklist via the unsubscription page."
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.res_config_settings_view_form
+msgid "Allow the recipient to manage himself his state in the blacklist via the unsubscription page. If the option is active, the 'Blacklist Me' button is hidden on the unsubscription page. The 'come Back' button will always be visible in any case to allow leads and partners to re-subscribe."
+msgstr ""
+
+#. module: mass_mailing
+#. openerp-web
+#: code:addons/mass_mailing/static/src/js/unsubscribe.js:34
+#: code:addons/mass_mailing/static/src/js/unsubscribe.js:39
+#: code:addons/mass_mailing/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing/static/src/js/unsubscribe.js:119
+#: code:addons/mass_mailing/static/src/js/unsubscribe.js:142
+#: code:addons/mass_mailing/static/src/js/unsubscribe.js:151
+#: code:addons/mass_mailing/static/src/js/unsubscribe.js:174
+#: code:addons/mass_mailing/static/src/js/unsubscribe.js:179
+#, python-format
+msgid "An error occured. Please try again later or contact us."
+msgstr ""
+
+#. module: mass_mailing
+#. openerp-web
+#: code:addons/mass_mailing/static/src/js/unsubscribe.js:79
+#: code:addons/mass_mailing/static/src/js/unsubscribe.js:84
+#, python-format
+msgid "An error occurred. Your changes have not been saved, try again later."
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_tag_line
msgid "Apps That Help You Grow Your Business"
msgstr ""
@@ -271,6 +309,19 @@ msgid "Basic management"
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__is_blacklisted
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list_contact_rel__is_blacklisted
+#: model:ir.ui.menu,name:mass_mailing.mail_blacklist_mm_menu
+msgid "Blacklist"
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.unsubscribe
+#: model:ir.ui.view,arch_db:mass_mailing.unsubscribed
+msgid "Blacklist Me"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__body_html
msgid "Body"
msgstr ""
@@ -280,6 +331,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__bounced
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign__bounced
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__message_bounce
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list_contact_rel__message_bounce
#: model:ir.model.fields,field_description:mass_mailing.field_mail_statistics_report__bounced
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mail_statistics_search
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
@@ -349,6 +401,11 @@ msgid "Choose"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.unsubscribe
+msgid "Choose your mailing subscriptions"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics__clicked
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__clicked
#: model:ir.model.fields,field_description:mass_mailing.field_mail_statistics_report__clicked
@@ -386,6 +443,11 @@ msgid "Column title"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.unsubscribe
+msgid "Come Back"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_test__email_to
msgid "Comma-separated list of email addresses."
msgstr ""
@@ -396,19 +458,35 @@ msgid "Company Name"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.layout
+msgid "Company name"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.menu,name:mass_mailing.mass_mailing_configuration
#: model:ir.ui.menu,name:mass_mailing.menu_mass_mailing_configuration
msgid "Configuration"
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list_contact_rel__contact_id
+msgid "Contact"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_list_form
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_list_form_simplified
msgid "Contact List"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.layout
+msgid "Copyright &amp;copy;"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact__message_bounce
+#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_list_contact_rel__message_bounce
msgid "Counter of the number of bounced emails for this contact."
msgstr ""
@@ -423,6 +501,11 @@ msgid "Create"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.layout
+msgid "Create a"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.actions.act_window,name:mass_mailing.open_create_mass_mailing_list
msgid "Create a Mass Mailing List"
msgstr ""
@@ -471,6 +554,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign__create_uid
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__create_uid
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list__create_uid
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list_contact_rel__create_uid
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_stage__create_uid
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_tag__create_uid
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_test__create_uid
@@ -482,6 +566,7 @@ msgstr ""
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics__create_date
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign__create_date
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list_contact_rel__create_date
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_stage__create_date
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_tag__create_date
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_test__create_date
@@ -494,6 +579,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__create_date
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__create_date
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list__create_date
+#: model:ir.ui.view,arch_db:mass_mailing.mail_mass_mailing_list_contact_view_search
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_search
msgid "Creation Date"
msgstr ""
@@ -535,6 +621,11 @@ msgid "Date when the email has been created"
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,help:mass_mailing.field_mail_mail_statistics__ignored
+msgid "Date when the email has been invalidated. Invalid emails are blacklisted, opted-out or invalid email format"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.model.fields,help:mass_mailing.field_mail_mail_statistics__opened
msgid "Date when the email has been opened the first time"
msgstr ""
@@ -596,6 +687,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign__display_name
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__display_name
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list__display_name
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list_contact_rel__display_name
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_stage__display_name
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_tag__display_name
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_test__display_name
@@ -627,6 +719,13 @@ msgid "Draft"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_kanban
+#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_kanban
+#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_list_kanban
+msgid "Dropdown menu"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_form
msgid "Duplicate"
msgstr ""
@@ -691,12 +790,19 @@ msgid "Exception"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.mail_mass_mailing_list_contact_view_search
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_search
-msgid "Exclude Bounced"
+msgid "Exclude Blacklisted"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.mail_mass_mailing_list_contact_view_search
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_search
+msgid "Exclude Bounced"
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.mail_mass_mailing_list_contact_view_search
msgid "Exclude Opt Out"
msgstr ""
@@ -723,6 +829,12 @@ msgid "Failed"
msgstr ""
#. module: mass_mailing
+#: code:addons/mass_mailing/controllers/main.py:141
+#, python-format
+msgid "Feedback from %s: %s"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__message_follower_ids
msgid "Followers"
msgstr ""
@@ -749,6 +861,7 @@ msgid "Get your inside sales (CRM) fully integrated with online sales (eCommerce
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.mail_mass_mailing_list_contact_view_search
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mail_statistics_search
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_search
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_search
@@ -768,6 +881,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign__id
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__id
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list__id
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list_contact_rel__id
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_stage__id
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_tag__id
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_test__id
@@ -803,6 +917,21 @@ msgid "If checked, some messages have a delivery error."
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact__is_blacklisted
+#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_list_contact_rel__is_blacklisted
+msgid "If the email address is on the blacklist, the contact won't receive mass mailing anymore, from any list"
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics__ignored
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__ignored
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign__ignored
+#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mail_statistics_search
+#: selection:mail.mail.statistics,state:0
+msgid "Ignored"
+msgstr ""
+
+#. module: mass_mailing
#: selection:mail.mass_mailing,state:0
msgid "In Queue"
msgstr ""
@@ -813,6 +942,11 @@ msgid "Is Follower"
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list__is_public
+msgid "Is Public"
+msgstr ""
+
+#. module: mass_mailing
#: model:mail.mass_mailing.list,popup_content:mass_mailing.mass_mail_list_1
msgid "Join our Marketing newsletter and get <strong>this white paper instantly</strong>"
msgstr ""
@@ -833,6 +967,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign____last_update
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact____last_update
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list____last_update
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list_contact_rel____last_update
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_stage____last_update
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_tag____last_update
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_test____last_update
@@ -853,6 +988,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign__write_uid
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__write_uid
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list__write_uid
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list_contact_rel__write_uid
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_stage__write_uid
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_tag__write_uid
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_test__write_uid
@@ -867,6 +1003,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign__write_date
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__write_date
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list__write_date
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list_contact_rel__write_date
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_stage__write_date
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_tag__write_date
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_test__write_date
@@ -886,16 +1023,6 @@ msgid "Links click"
msgstr ""
#. module: mass_mailing
-#: model:ir.filters,name:mass_mailing.filter_contact_subscription
-msgid "List Subscription"
-msgstr ""
-
-#. module: mass_mailing
-#: model:ir.filters,name:mass_mailing.filter_contact_unsubscription
-msgid "List Unsubscription"
-msgstr ""
-
-#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics__mail_mail_id
msgid "Mail"
msgstr ""
@@ -951,12 +1078,14 @@ msgstr ""
#: model:ir.model,name:mass_mailing.model_mail_mass_mailing_list
#: model:ir.model.fields,field_description:mass_mailing.field_mail_compose_message__mailing_list_ids
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list__name
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list_contact_rel__list_id
msgid "Mailing List"
msgstr ""
#. module: mass_mailing
#: model:ir.actions.act_window,name:mass_mailing.action_view_mass_mailing_contacts
#: model:ir.ui.menu,name:mass_mailing.menu_email_mass_mailing_contacts
+#: model:ir.ui.view,arch_db:mass_mailing.mail_mass_mailing_list_contact_view_search
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_form
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_graph
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_pivot
@@ -966,6 +1095,11 @@ msgid "Mailing List Contacts"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.mail_mass_mailing_list_contact_rel_view_form
+msgid "Mailing List contacts"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.actions.act_window,name:mass_mailing.action_view_mass_mailing_lists
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__contact_list_ids
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__list_ids
@@ -973,6 +1107,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_list_merge__src_list_ids
#: model:ir.ui.menu,name:mass_mailing.mass_mailing_mailing_list_menu
#: model:ir.ui.menu,name:mass_mailing.menu_email_mass_mailing_lists
+#: model:ir.ui.view,arch_db:mass_mailing.mail_mass_mailing_list_contact_rel_list_contact_view_tree
#: model:ir.ui.view,arch_db:mass_mailing.res_config_settings_view_form
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_list_search
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_list_tree
@@ -995,6 +1130,12 @@ msgid "Mailing Statistics of Clicks"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.unsubscribe
+#: model:ir.ui.view,arch_db:mass_mailing.unsubscribed
+msgid "Mailing Subscriptions"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.actions.act_window,name:mass_mailing.action_mail_mass_mailing_test
msgid "Mailing Test"
msgstr ""
@@ -1105,6 +1246,11 @@ msgid "Mass Mailing Statistics allows you to check different mailing related inf
msgstr ""
#. module: mass_mailing
+#: model:ir.model,name:mass_mailing.model_mail_mass_mailing_list_contact_rel
+msgid "Mass Mailing Subscription Information"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.model,name:mass_mailing.model_mail_mass_mailing_tag
msgid "Mass Mailing Tag"
msgstr ""
@@ -1124,6 +1270,7 @@ msgstr ""
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__medium_id
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign__medium_id
+#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
msgid "Medium"
msgstr ""
@@ -1251,6 +1398,7 @@ msgstr ""
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list__contact_nbr
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list_contact_rel__contact_count
msgid "Number of Contacts"
msgstr ""
@@ -1300,6 +1448,11 @@ msgid "OFF YOUR NEXT ORDER!"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.layout
+msgid "Odoo"
+msgstr ""
+
+#. module: mass_mailing
#: model:mail.mass_mailing.list,popup_content:mass_mailing.mass_mail_list_1
msgid "Odoo Presents"
msgstr ""
@@ -1315,6 +1468,11 @@ msgid "Omnichannel sales"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.mail_mass_mailing_list_contact_rel_list_contact_view_tree
+msgid "Open Contact"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mail_statistics_search
msgid "Open Date"
msgstr ""
@@ -1339,7 +1497,7 @@ msgid "Opened Ratio"
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__opt_out
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list_contact_rel__opt_out
msgid "Opt Out"
msgstr ""
@@ -1406,13 +1564,13 @@ msgid "Received Ratio"
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics__recipient
-msgid "Recipient"
+#: selection:mail.mass_mailing,reply_to_mode:0
+msgid "Recipient Followers"
msgstr ""
#. module: mass_mailing
-#: selection:mail.mass_mailing,reply_to_mode:0
-msgid "Recipient Followers"
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics__email
+msgid "Recipient email address"
msgstr ""
#. module: mass_mailing
@@ -1566,6 +1724,11 @@ msgid "Select mailing lists:"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.unsubscribe
+msgid "Send"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
msgid "Send Now"
msgstr ""
@@ -1646,7 +1809,13 @@ msgid "Settings"
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_res_config_settings__show_blacklist_buttons
+msgid "Show blacklist buttons on unsubscribe page"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign__source_id
+#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
msgid "Source"
msgstr ""
@@ -1708,6 +1877,12 @@ msgid "Subject"
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__subscription_list_ids
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list__subscription_contact_ids
+msgid "Subscription Information"
+msgstr ""
+
+#. module: mass_mailing
#: sql_constraint:mail.mass_mailing.tag:0
msgid "Tag name already exists !"
msgstr ""
@@ -1729,7 +1904,7 @@ msgid "Test"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:592
+#: code:addons/mass_mailing/models/mass_mailing.py:652
#, python-format
msgid "Test Mailing"
msgstr ""
@@ -1745,16 +1920,42 @@ msgid "Thank you for joining us!"
msgstr ""
#. module: mass_mailing
+#. openerp-web
+#: code:addons/mass_mailing/static/src/js/unsubscribe.js:169
+#, python-format
+msgid "Thank you! Your feedback has been sent successfully!"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_paragraph
msgid "That way, Odoo evolves much faster than any other solution."
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact__opt_out
+#: code:addons/mass_mailing/controllers/main.py:57
+#, python-format
+msgid "The %s asked to not be contacted anymore \n"
+" using an unsubscribe link.ir.model"
+msgstr ""
+
+#. module: mass_mailing
+#: code:addons/mass_mailing/controllers/main.py:117
+#, python-format
+msgid "The %s asked to not be contacted anymore \n"
+" using the unsubscription page.ir.model"
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_list_contact_rel__opt_out
msgid "The contact has chosen not to receive mails anymore from this list"
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_list__is_public
+msgid "The mailing list can be accessible by recipient in the unsubscription page to allows him to update his subscription preferences."
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_paragraph
msgid "The open source model of Odoo has allowed us to leverage thousands of developers and\n"
" business experts to build hundreds of apps in just a few years."
@@ -1766,7 +1967,19 @@ msgid "The open source model of Odoo has allowed us to leverage thousands of dev
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:726
+#: code:addons/mass_mailing/models/mass_mailing.py:619
+#, python-format
+msgid "The recipient <strong>subscribed to %s</strong> mailing list(s)"
+msgstr ""
+
+#. module: mass_mailing
+#: code:addons/mass_mailing/models/mass_mailing.py:618
+#, python-format
+msgid "The recipient <strong>unsubscribed from %s</strong> mailing list(s)"
+msgstr ""
+
+#. module: mass_mailing
+#: code:addons/mass_mailing/models/mass_mailing.py:781
#, python-format
msgid "There is no recipients selected."
msgstr ""
@@ -1835,6 +2048,11 @@ msgid "Tracking"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.unsubscribed
+msgid "Unblacklist Me"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__message_unread
msgid "Unread Messages"
msgstr ""
@@ -1847,15 +2065,23 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_social
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_social_left
+#: model:ir.ui.view,arch_db:mass_mailing.theme_basic_template
msgid "Unsubscribe"
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__unsubscription_date
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list_contact_rel__unsubscription_date
msgid "Unsubscription Date"
msgstr ""
#. module: mass_mailing
+#. openerp-web
+#: code:addons/mass_mailing/static/src/xml/mass_mailing.xml:17
+#, python-format
+msgid "Upgrade theme"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_paragraph
msgid "Usability improvements made on Odoo will automatically apply to all\n"
" of our fully integrated apps."
@@ -1894,6 +2120,11 @@ msgid "Users"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.mail_mass_mailing_list_contact_view_search
+msgid "Valid Recipents"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount1
msgid "We are continuing to grow and we miss seeing you be a part of it! We've increased store hours and have lot's of new brands available. To welcome you back please accept this 20% discount on you next purchase by clicking the button."
msgstr ""
@@ -1904,6 +2135,11 @@ msgid "We want to take this opportunity to welcome you to our ever-growing commu
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.unsubscribe
+msgid "We would appreciate if you provide feedback about why you unsubscribed"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.actions.act_window,name:mass_mailing.mass_mailing_schedule_date_action
msgid "When do you want to send your mailing?"
msgstr ""
@@ -1927,9 +2163,51 @@ msgid "Write one paragraph describing your product,\n"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/controllers/main.py:38
+#. openerp-web
+#: code:addons/mass_mailing/static/src/js/unsubscribe.js:71
+#: code:addons/mass_mailing/static/src/js/unsubscribe.js:98
+#: code:addons/mass_mailing/static/src/js/unsubscribe.js:130
+#: code:addons/mass_mailing/static/src/js/unsubscribe.js:165
#, python-format
-msgid "You have been unsubscribed successfully"
+msgid "You are not authorized to do this!"
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.unsubscribe
+msgid "You are not subscribed to any of our mailing list."
+msgstr ""
+
+#. module: mass_mailing
+#. openerp-web
+#: code:addons/mass_mailing/static/src/js/unsubscribe.js:49
+#, python-format
+msgid "You have been <strong>successfully unsubscribed from </strong>."
+msgstr ""
+
+#. module: mass_mailing
+#. openerp-web
+#: code:addons/mass_mailing/static/src/js/unsubscribe.js:52
+#, python-format
+msgid "You have been <strong>successfully unsubscribed</strong>."
+msgstr ""
+
+#. module: mass_mailing
+#. openerp-web
+#: code:addons/mass_mailing/static/src/js/unsubscribe.js:104
+#, python-format
+msgid "You have been successfully <strong>added to our blacklist</strong>. You will not be contacted anymore by our services."
+msgstr ""
+
+#. module: mass_mailing
+#. openerp-web
+#: code:addons/mass_mailing/static/src/js/unsubscribe.js:136
+#, python-format
+msgid "You have been successfully <strong>removed from our blacklist</strong>. You are now able to be contacted by our services."
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.unsubscribed
+msgid "You have been successfully <strong>unsubscribed</strong>!"
msgstr ""
#. module: mass_mailing
@@ -1955,6 +2233,13 @@ msgid "Your Picture"
msgstr ""
#. module: mass_mailing
+#. openerp-web
+#: code:addons/mass_mailing/static/src/js/unsubscribe.js:75
+#, python-format
+msgid "Your changes have been saved."
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_title_text
msgid "Your platform is ready for work. It will help you reduce the costs of digital signage, attract new customers and increase sales."
msgstr ""
@@ -1991,6 +2276,16 @@ msgid "email(s) could not be sent."
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
+msgid "email(s) have been ignored and will not be sent."
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.layout
+msgid "free website"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.model,name:mass_mailing.model_link_tracker
msgid "link.tracker"
msgstr ""
@@ -2005,3 +2300,8 @@ msgstr ""
msgid "res.config.settings"
msgstr ""
+#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.layout
+msgid "with"
+msgstr ""
+
diff --git a/addons/mass_mailing_crm/i18n/mass_mailing_crm.pot b/addons/mass_mailing_crm/i18n/mass_mailing_crm.pot
new file mode 100644
index 00000000000..1bf2a3896e9
--- /dev/null
+++ b/addons/mass_mailing_crm/i18n/mass_mailing_crm.pot
@@ -0,0 +1,47 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * mass_mailing_crm
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~11.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: mass_mailing_crm
+#: model:ir.model.fields,field_description:mass_mailing_crm.field_mail_mass_mailing__crm_lead_count
+msgid "Lead Count"
+msgstr ""
+
+#. module: mass_mailing_crm
+#: model:ir.ui.view,arch_db:mass_mailing_crm.mail_mass_mailing_view_form
+msgid "Leads"
+msgstr ""
+
+#. module: mass_mailing_crm
+#: model:ir.model,name:mass_mailing_crm.model_mail_mass_mailing
+msgid "Mass Mailing"
+msgstr ""
+
+#. module: mass_mailing_crm
+#: model:ir.ui.view,arch_db:mass_mailing_crm.mail_mass_mailing_view_form
+msgid "Opportunities"
+msgstr ""
+
+#. module: mass_mailing_crm
+#: model:ir.model.fields,field_description:mass_mailing_crm.field_mail_mass_mailing__crm_opportunities_count
+msgid "Opportunities Count"
+msgstr ""
+
+#. module: mass_mailing_crm
+#: model:ir.model.fields,field_description:mass_mailing_crm.field_mail_mass_mailing__crm_lead_activated
+msgid "Use Leads"
+msgstr ""
+
diff --git a/addons/mass_mailing_event/i18n/mass_mailing_event.pot b/addons/mass_mailing_event/i18n/mass_mailing_event.pot
index a9fc5e7fc03..2d5da2099ee 100644
--- a/addons/mass_mailing_event/i18n/mass_mailing_event.pot
+++ b/addons/mass_mailing_event/i18n/mass_mailing_event.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -25,3 +25,8 @@ msgstr ""
msgid "Event"
msgstr ""
+#. module: mass_mailing_event
+#: model:ir.model,name:mass_mailing_event.model_mail_mass_mailing
+msgid "Mass Mailing"
+msgstr ""
+
diff --git a/addons/mass_mailing_sale/i18n/mass_mailing_sale.pot b/addons/mass_mailing_sale/i18n/mass_mailing_sale.pot
new file mode 100644
index 00000000000..b25f169a023
--- /dev/null
+++ b/addons/mass_mailing_sale/i18n/mass_mailing_sale.pot
@@ -0,0 +1,42 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * mass_mailing_sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~11.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: mass_mailing_sale
+#: model:ir.ui.view,arch_db:mass_mailing_sale.mail_mass_mailing_view_form
+msgid "Invoiced"
+msgstr ""
+
+#. module: mass_mailing_sale
+#: model:ir.model.fields,field_description:mass_mailing_sale.field_mail_mass_mailing__sale_invoiced_amount
+msgid "Invoiced Amount"
+msgstr ""
+
+#. module: mass_mailing_sale
+#: model:ir.model,name:mass_mailing_sale.model_mail_mass_mailing
+msgid "Mass Mailing"
+msgstr ""
+
+#. module: mass_mailing_sale
+#: model:ir.model.fields,field_description:mass_mailing_sale.field_mail_mass_mailing__sale_quotation_count
+msgid "Quotation Count"
+msgstr ""
+
+#. module: mass_mailing_sale
+#: model:ir.ui.view,arch_db:mass_mailing_sale.mail_mass_mailing_view_form
+msgid "Quotations"
+msgstr ""
+
diff --git a/addons/membership/i18n/membership.pot b/addons/membership/i18n/membership.pot
index 2b0ede6c3af..85795b8193b 100644
--- a/addons/membership/i18n/membership.pot
+++ b/addons/membership/i18n/membership.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. module: membership
#: model:ir.ui.view,arch_db:membership.membership_products_kanban
-msgid "<i class=\"fa fa-clock-o\" aria-hidden=\"true\"/><strong> From: </strong>"
+msgid "<i class=\"fa fa-clock-o\" role=\"img\" aria-label=\"Period\" title=\"Period\"/><strong> From: </strong>"
msgstr ""
#. module: membership
@@ -533,13 +533,13 @@ msgid "Partner"
msgstr ""
#. module: membership
-#: code:addons/membership/models/partner.py:181
+#: code:addons/membership/models/partner.py:184
#, python-format
msgid "Partner doesn't have an address to make the invoice."
msgstr ""
#. module: membership
-#: code:addons/membership/models/partner.py:179
+#: code:addons/membership/models/partner.py:182
#, python-format
msgid "Partner is a free Member."
msgstr ""
@@ -638,7 +638,7 @@ msgid "Waiting Member"
msgstr ""
#. module: membership
-#: code:addons/membership/models/partner.py:159
+#: code:addons/membership/models/partner.py:162
#, python-format
msgid "You cannot create recursive associated members."
msgstr ""
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index f7d793d8fe0..ecb477c3ee5 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:11+0000\n"
-"PO-Revision-Date: 2018-08-02 09:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,9 +16,14 @@ msgstr ""
"Plural-Forms: \n"
#. module: mrp
-#: code:addons/mrp/models/stock_warehouse.py:43
+#: code:addons/mrp/models/stock_rule.py:19
#, python-format
-msgid " Manufacture"
+msgid " <br/><br/> The components will be taken from <b>%s</b>."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,ready_to_produce:0
+msgid " When all components are available"
msgstr ""
#. module: mrp
@@ -38,12 +43,6 @@ msgid "# Done Work Orders"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_product_product__mo_count
-#: model:ir.model.fields,field_description:mrp.field_product_template__mo_count
-msgid "# Manufacturing Orders"
-msgstr ""
-
-#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter__workorder_ready_count
msgid "# Read Work Orders"
msgstr ""
@@ -61,7 +60,13 @@ msgid "# of BoM Where is Used"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_bom.py:301
+#: model:ir.ui.view,arch_db:mrp.exception_on_mo
+msgid ".\n"
+" Manual actions may be needed."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/mrp_bom.py:330
#, python-format
msgid "<p class=\"o_view_nocontent_smiling_face\">\n"
" Upload files to your product\n"
@@ -72,7 +77,7 @@ msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "<span class=\"label label-danger\" attrs=\"{'invisible': ['|',('availability', 'in', ('assigned', 'none')), ('state', 'not in', ('confirmed','progress'))]}\">Raw materials not available!</span>"
+msgid "<span class=\"badge badge-danger\" attrs=\"{'invisible': ['|',('availability', 'in', ('assigned', 'none')), ('state', 'not in', ('confirmed','progress'))]}\">Raw materials not available!</span>"
msgstr ""
#. module: mrp
@@ -81,6 +86,12 @@ msgid "<span class=\"o_stat_text\">Lost</span>"
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.product_product_form_view_bom_button
+#: model:ir.ui.view,arch_db:mrp.product_template_form_view_bom_button
+msgid "<span class=\"o_stat_text\">Manufactured</span>"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view
msgid "<span class=\"o_stat_text\">OEE</span>"
msgstr ""
@@ -224,7 +235,7 @@ msgid "<strong>WorkCenter</strong>"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:515
+#: code:addons/mrp/models/mrp_workorder.py:502
#, python-format
msgid "A Manufacturing Order is already done or cancelled."
msgstr ""
@@ -242,7 +253,7 @@ msgid "Access Token"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_procurement_rule__action
+#: model:ir.model.fields,field_description:mrp.field_stock_rule__action
msgid "Action"
msgstr ""
@@ -305,11 +316,6 @@ msgid "All"
msgstr ""
#. module: mrp
-#: selection:mrp.bom,ready_to_produce:0
-msgid "All components available"
-msgstr ""
-
-#. module: mrp
#: model:ir.ui.view,arch_db:mrp.report_mrporder
msgid "All components could not be reserved. Click on the \"Check Availability button\" to try to reserve components."
msgstr ""
@@ -337,6 +343,11 @@ msgid "An unbuild order is used to break down a finished product into its compon
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line__attribute_value_ids
+msgid "Apply on Variants"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.view_change_production_qty_wizard
msgid "Approve"
msgstr ""
@@ -349,23 +360,22 @@ msgid "Archived"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_document__name
-msgid "Attachment Name"
-msgstr ""
-
-#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document__local_url
msgid "Attachment URL"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_bom.py:293
+#. openerp-web
+#: code:addons/mrp/models/mrp_bom.py:322
+#: code:addons/mrp/static/src/js/mrp_bom_report.js:177
+#: model:ir.ui.view,arch_db:mrp.mrp_bom_form_view
+#: model:ir.ui.view,arch_db:mrp.report_mrp_bom
#, python-format
msgid "Attachments"
msgstr ""
#. module: mrp
-#: selection:mrp.workcenter.productivity.loss,loss_type:0
+#: selection:mrp.workcenter.productivity.loss.type,loss_type:0
msgid "Availability"
msgstr ""
@@ -381,6 +391,11 @@ msgid "Available"
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.workcenter_line_kanban
+msgid "Avatar"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,help:mrp.field_product_product__produce_delay
#: model:ir.model.fields,help:mrp.field_product_template__produce_delay
msgid "Average lead time in days to manufacture this product. In the case of multi-level BOM, the manufacturing lead times of the components will be added."
@@ -413,7 +428,6 @@ msgstr ""
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_bom
-#: model:ir.model.fields,field_description:mrp.field_mrp_message__bom_id
#: model:ir.model.fields,field_description:mrp.field_mrp_production__bom_id
#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__bom_id
#: model:ir.ui.view,arch_db:mrp.mrp_bom_form_view
@@ -483,9 +497,20 @@ msgid "Blocked hour(s) over the last month"
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.oee_loss_tree_view
+msgid "Blocking Reasons"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.report_mrp_bom
+msgid "BoM"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_product_product__bom_line_ids
#: model:ir.model.fields,field_description:mrp.field_product_template__bom_line_ids
-#: model:ir.ui.view,arch_db:mrp.product_template_search_view_procurment
+#: model:ir.ui.view,arch_db:mrp.mrp_product_product_search_view
+#: model:ir.ui.view,arch_db:mrp.mrp_product_template_search_view
msgid "BoM Components"
msgstr ""
@@ -538,13 +563,13 @@ msgid "BoM details"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_bom.py:67
+#: code:addons/mrp/models/mrp_bom.py:86
#, python-format
msgid "BoM line product %s should not be same as BoM product."
msgstr ""
#. module: mrp
-#: selection:procurement.rule,action:0
+#: selection:stock.rule,action:0
msgid "Buy"
msgstr ""
@@ -554,9 +579,9 @@ msgid "By-Products"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/stock_warehouse.py:36
+#: code:addons/mrp/models/stock_warehouse.py:66
#, python-format
-msgid "Can't find any generic Manufacture route."
+msgid "Can't find any production location."
msgstr ""
#. module: mrp
@@ -574,7 +599,7 @@ msgid "Cancelled"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:335
+#: code:addons/mrp/models/mrp_production.py:371
#, python-format
msgid "Cannot delete a manufacturing order not in cancel state"
msgstr ""
@@ -586,6 +611,13 @@ msgid "Capacity"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss__loss_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_type__loss_type
+#: model:ir.ui.view,arch_db:mrp.oee_loss_tree_view
+msgid "Category"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.view_change_production_qty_wizard
msgid "Change Product Qty"
msgstr ""
@@ -644,6 +676,11 @@ msgid "Company"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line__product_id
+msgid "Component"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_bom_form_view
#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
msgid "Components"
@@ -772,7 +809,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom__create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line__create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_document__create_uid
-#: model:ir.model.fields,field_description:mrp.field_mrp_message__create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce__create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line__create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_production__create_uid
@@ -782,6 +818,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter__create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity__create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss__create_uid
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_type__create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__create_uid
#: model:ir.model.fields,field_description:mrp.field_stock_warn_insufficient_qty_unbuild__create_uid
msgid "Created by"
@@ -792,7 +829,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom__create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line__create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_document__create_date
-#: model:ir.model.fields,field_description:mrp.field_mrp_message__create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce__create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line__create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_production__create_date
@@ -802,6 +838,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter__create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity__create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss__create_date
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_type__create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__create_date
#: model:ir.model.fields,field_description:mrp.field_stock_warn_insufficient_qty_unbuild__create_date
msgid "Created on"
@@ -873,6 +910,16 @@ msgid "Define the schedule of resource"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_bom__ready_to_produce
+msgid "Defines when a Manufacturing Order is considered as ready to be started"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production__delivery_count
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document__description
#: model:ir.model.fields,field_description:mrp.field_mrp_routing__note
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter__note
@@ -908,7 +955,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom__display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line__display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_document__display_name
-#: model:ir.model.fields,field_description:mrp.field_mrp_message__display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce__display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line__display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_production__display_name
@@ -918,6 +964,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter__display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity__display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss__display_name
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_type__display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__display_name
#: model:ir.model.fields,field_description:mrp.field_report_mrp_report_bom_structure__display_name
#: model:ir.model.fields,field_description:mrp.field_stock_warn_insufficient_qty_unbuild__display_name
@@ -936,11 +983,21 @@ msgid "Done"
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+msgid "Done Last 365 Days"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_stock_move_line__done_wo
msgid "Done for Work Order"
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.view_document_file_kanban_mrp
+msgid "Download"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
#: selection:mrp.unbuild,state:0
msgid "Draft"
@@ -995,17 +1052,22 @@ msgid "Effectiveness Category"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
-msgid "Efficiency"
-msgstr ""
-
-#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_production__date_finished
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity__date_end
msgid "End Date"
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.exception_on_mo
+msgid "Exception(s) occurred on the manufacturing order(s):"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.exception_on_mo
+msgid "Exception(s):"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__duration_expected
msgid "Expected Duration"
msgstr ""
@@ -1021,13 +1083,18 @@ msgid "File Content"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document__file_size
+msgid "File Size"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document__datas_fname
-msgid "File Name"
+msgid "Filename"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_document__file_size
-msgid "File Size"
+#: model:ir.ui.view,arch_db:mrp.report_mrp_bom
+msgid "Files attached to the product"
msgstr ""
#. module: mrp
@@ -1191,7 +1258,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom__id
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line__id
#: model:ir.model.fields,field_description:mrp.field_mrp_document__id
-#: model:ir.model.fields,field_description:mrp.field_mrp_message__id
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce__id
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line__id
#: model:ir.model.fields,field_description:mrp.field_mrp_production__id
@@ -1201,6 +1267,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter__id
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity__id
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss__id
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_type__id
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__id
#: model:ir.model.fields,field_description:mrp.field_report_mrp_report_bom_structure__id
#: model:ir.model.fields,field_description:mrp.field_stock_warn_insufficient_qty_unbuild__id
@@ -1272,6 +1339,17 @@ msgid "If the product is a semi-finished product: When processing a\n"
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.exception_on_mo
+msgid "Impacted Transfer(s):"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/mrp_bom.py:200
+#, python-format
+msgid "Import Template for Bills of Materials"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
#: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
@@ -1294,7 +1372,7 @@ msgid "Informative, not used in matching"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_unbuild.py:210
+#: code:addons/mrp/models/mrp_unbuild.py:220
#, python-format
msgid "Insufficient Quantity"
msgstr ""
@@ -1360,6 +1438,11 @@ msgid "Keep empty if you produce at the location where you find the raw material
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document__key
+msgid "Key"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
#: selection:mrp.bom,type:0
msgid "Kit"
@@ -1370,7 +1453,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom____last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line____last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_document____last_update
-#: model:ir.model.fields,field_description:mrp.field_mrp_message____last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce____last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line____last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_production____last_update
@@ -1380,6 +1462,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter____last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity____last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss____last_update
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_type____last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder____last_update
#: model:ir.model.fields,field_description:mrp.field_report_mrp_report_bom_structure____last_update
#: model:ir.model.fields,field_description:mrp.field_stock_warn_insufficient_qty_unbuild____last_update
@@ -1391,7 +1474,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom__write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line__write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_document__write_uid
-#: model:ir.model.fields,field_description:mrp.field_mrp_message__write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce__write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line__write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_production__write_uid
@@ -1401,6 +1483,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter__write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity__write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss__write_uid
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_type__write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__write_uid
#: model:ir.model.fields,field_description:mrp.field_stock_warn_insufficient_qty_unbuild__write_uid
msgid "Last Updated by"
@@ -1411,7 +1494,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom__write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line__write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_document__write_date
-#: model:ir.model.fields,field_description:mrp.field_mrp_message__write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce__write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line__write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_production__write_date
@@ -1421,6 +1503,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter__write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity__write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss__write_date
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_type__write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__write_date
#: model:ir.model.fields,field_description:mrp.field_stock_warn_insufficient_qty_unbuild__write_date
msgid "Last Updated on"
@@ -1447,7 +1530,7 @@ msgid "Late Activities"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:451
+#: code:addons/mrp/models/mrp_production.py:490
#, python-format
msgid "Lines need to be deleted, but can not as you still have some quantities to consume in them. "
msgstr ""
@@ -1480,8 +1563,6 @@ msgid "Loss Reason"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce__lot_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line__lot_id
#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__lot_id
msgid "Lot"
msgstr ""
@@ -1492,6 +1573,8 @@ msgid "Lot/Serial"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce__lot_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line__lot_id
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__final_lot_id
msgid "Lot/Serial Number"
msgstr ""
@@ -1544,42 +1627,58 @@ msgid "Manual Duration"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/stock_warehouse.py:34
-#: selection:procurement.rule,action:0
+#: model:ir.model.fields,field_description:mrp.field_stock_warehouse__manufacture_steps
+#: model:ir.ui.view,arch_db:mrp.mrp_report_stock_rule
#: model:stock.location.route,name:mrp.route_warehouse0_manufacture
-#, python-format
+#: selection:stock.rule,action:0
msgid "Manufacture"
msgstr ""
#. module: mrp
+#: code:addons/mrp/models/stock_warehouse.py:95
+#: selection:stock.warehouse,manufacture_steps:0
+#, python-format
+msgid "Manufacture (1 step)"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_stock_warehouse__manufacture_pull_id
msgid "Manufacture Rule"
msgstr ""
#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Manufacture this product"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_stock_warehouse__manufacture_to_resupply
-msgid "Manufacture in this Warehouse"
+msgid "Manufacture to Resupply"
msgstr ""
#. module: mrp
-#: selection:mrp.bom,type:0
-msgid "Manufacture this product"
+#: model:ir.model.fields,field_description:mrp.field_product_product__mrp_product_qty
+#: model:ir.model.fields,field_description:mrp.field_product_template__mrp_product_qty
+msgid "Manufactured"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.product_template_search_view_procurment
-#: model:ir.ui.view,arch_db:mrp.view_mrp_product_product_form_inherited_view
+#: model:ir.ui.view,arch_db:mrp.mrp_product_product_search_view
+#: model:ir.ui.view,arch_db:mrp.mrp_product_template_search_view
msgid "Manufactured Products"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/stock_warehouse.py:64
-#: model:ir.model.fields,field_description:mrp.field_res_users__group_mrp_user
-#: model:ir.ui.menu,name:mrp.menu_mrp_root
#: model:ir.ui.view,arch_db:mrp.product_product_form_view_bom_button
#: model:ir.ui.view,arch_db:mrp.product_template_form_view_bom_button
+msgid "Manufactured in the last 365 days"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/stock_warehouse.py:209
+#: model:ir.model.fields,field_description:mrp.field_res_users__group_mrp_user
+#: model:ir.ui.menu,name:mrp.menu_mrp_root
#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
-#: model:stock.picking.type,name:mrp.picking_type_manufacturing
#, python-format
msgid "Manufacturing"
msgstr ""
@@ -1695,11 +1794,6 @@ msgid "Materials Availability"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_message__message
-msgid "Message"
-msgstr ""
-
-#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_bom__message_has_error
#: model:ir.model.fields,field_description:mrp.field_mrp_production__message_has_error
#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__message_has_error
@@ -1738,11 +1832,6 @@ msgid "Move Done"
msgstr ""
#. module: mrp
-#: selection:procurement.rule,action:0
-msgid "Move From Another Location"
-msgstr ""
-
-#. module: mrp
#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
msgid "Move forward deadline start dates by"
msgstr ""
@@ -1774,15 +1863,15 @@ msgid "My Activities"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_message__name
+#: model:ir.model.fields,field_description:mrp.field_mrp_document__name
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter__name
msgid "Name"
msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_production.py:45
-#: code:addons/mrp/models/mrp_production.py:321
-#: code:addons/mrp/models/mrp_production.py:325
+#: code:addons/mrp/models/mrp_production.py:355
+#: code:addons/mrp/models/mrp_production.py:361
#: code:addons/mrp/models/mrp_routing.py:18
#: code:addons/mrp/models/mrp_routing.py:34
#: code:addons/mrp/models/mrp_routing.py:35
@@ -1832,6 +1921,11 @@ msgid "No Routing"
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_bom_form_view
+msgid "No attachment"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.report_mrp_bom
msgid "No data available."
msgstr ""
@@ -1995,7 +2089,7 @@ msgid "Operation Type"
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/mrp_report_bom_structure.py:196
+#: code:addons/mrp/report/mrp_report_bom_structure.py:207
#: model:ir.model.fields,field_description:mrp.field_mrp_routing__operation_ids
#: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
#: model:ir.ui.view,arch_db:mrp.mrp_workorder_view_gantt
@@ -2095,7 +2189,7 @@ msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter__performance
#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
-#: selection:mrp.workcenter.productivity.loss,loss_type:0
+#: selection:mrp.workcenter.productivity.loss.type,loss_type:0
msgid "Performance"
msgstr ""
@@ -2110,6 +2204,60 @@ msgid "Performance over the last month"
msgstr ""
#. module: mrp
+#: code:addons/mrp/models/stock_warehouse.py:191
+#, python-format
+msgid "Pick Components"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/stock_warehouse.py:96
+#, python-format
+msgid "Pick components and then manufacture"
+msgstr ""
+
+#. module: mrp
+#: selection:stock.warehouse,manufacture_steps:0
+msgid "Pick components and then manufacture (2 steps)"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/stock_warehouse.py:97
+#: selection:stock.warehouse,manufacture_steps:0
+#, python-format
+msgid "Pick components, manufacture and then store products (3 steps)"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+msgid "Picking"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_stock_warehouse__pbm_mto_pull_id
+msgid "Picking Before Manufacturing MTO Rule"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_stock_warehouse__pbm_type_id
+msgid "Picking Before Manufacturing Operation Type"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_stock_warehouse__pbm_route_id
+msgid "Picking Before Manufacturing Route"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production__picking_ids
+msgid "Picking associated to this manufacturing order"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_stock_warehouse__pbm_loc_id
+msgid "Picking before Manufacturing Location"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
msgid "Plan Orders"
msgstr ""
@@ -2146,7 +2294,7 @@ msgid "Please enter a lot or serial number for %s !"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:310
+#: code:addons/mrp/models/mrp_workorder.py:297
#, python-format
msgid "Please set the quantity you are currently producing. It should be different from zero."
msgstr ""
@@ -2157,6 +2305,18 @@ msgid "Post Inventory"
msgstr ""
#. module: mrp
+#: code:addons/mrp/models/stock_warehouse.py:174
+#, python-format
+msgid "Post-Production"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/stock_warehouse.py:173
+#, python-format
+msgid "Pre-Production"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document__priority
#: model:ir.model.fields,field_description:mrp.field_mrp_production__priority
msgid "Priority"
@@ -2178,11 +2338,6 @@ msgid "Procurement Group"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_procurement_rule
-msgid "Procurement Rule"
-msgstr ""
-
-#. module: mrp
#: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
#: model:ir.ui.view,arch_db:mrp.view_mrp_product_produce_wizard
@@ -2190,6 +2345,12 @@ msgid "Produce"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,help:mrp.field_stock_warehouse__manufacture_steps
+msgid "Produce : Move the raw materials to the production location directly and start the manufacturing process.\n"
+"Pick / Produce : Unload the raw materials from the Stock to Input location first, and then transfer it to the Production location."
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
msgid "Produce residual products (A + B -&gt; C + D)"
msgstr ""
@@ -2202,8 +2363,6 @@ msgstr ""
#. module: mrp
#: model:ir.model,name:mrp.model_product_product
#: model:ir.model.fields,field_description:mrp.field_mrp_bom__product_tmpl_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line__product_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_message__product_id
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce__product_id
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line__product_id
#: model:ir.model.fields,field_description:mrp.field_mrp_production__product_id
@@ -2241,14 +2400,8 @@ msgid "Product Produce"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line__product_qty
-msgid "Product Quantity"
-msgstr ""
-
-#. module: mrp
#: model:ir.model,name:mrp.model_product_template
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line__product_tmpl_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_message__product_tmpl_id
#: model:ir.model.fields,field_description:mrp.field_mrp_production__product_tmpl_id
msgid "Product Template"
msgstr ""
@@ -2266,6 +2419,7 @@ msgid "Product Variant"
msgstr ""
#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_product_variant_action
#: model:ir.ui.menu,name:mrp.product_variant_mrp
msgid "Product Variants"
msgstr ""
@@ -2301,11 +2455,6 @@ msgid "Production Location"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_message
-msgid "Production Message"
-msgstr ""
-
-#. module: mrp
#: model:ir.actions.report,name:mrp.action_report_production_order
#: model:ir.model.fields,field_description:mrp.field_stock_move_line__production_id
#: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
@@ -2339,7 +2488,7 @@ msgid "Productions"
msgstr ""
#. module: mrp
-#: selection:mrp.workcenter.productivity.loss,loss_type:0
+#: selection:mrp.workcenter.productivity.loss.type,loss_type:0
msgid "Productive"
msgstr ""
@@ -2354,6 +2503,11 @@ msgid "Productive hour(s) over the last month"
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
+msgid "Productivity"
+msgstr ""
+
+#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_workcenter_productivity_loss_action
#: model:ir.actions.act_window,name:mrp.mrp_workcenter_productivity_report_blocked
#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_productivity_loss
@@ -2378,13 +2532,23 @@ msgid "Propagate cancel and split"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_stock_location_path
-msgid "Pushed Flow"
+#: selection:stock.rule,action:0
+msgid "Pull & Push"
+msgstr ""
+
+#. module: mrp
+#: selection:stock.rule,action:0
+msgid "Pull From"
+msgstr ""
+
+#. module: mrp
+#: selection:stock.rule,action:0
+msgid "Push To"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_res_config_settings__module_quality_control
-#: selection:mrp.workcenter.productivity.loss,loss_type:0
+#: selection:mrp.workcenter.productivity.loss.type,loss_type:0
msgid "Quality"
msgstr ""
@@ -2400,6 +2564,7 @@ msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_bom__product_qty
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line__product_qty
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce__product_qty
#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__product_qty
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__qty_produced
@@ -2497,7 +2662,7 @@ msgid "Record Production Line"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_bom.py:166
+#: code:addons/mrp/models/mrp_bom.py:185
#, python-format
msgid "Recursion error! A product with a Bill of Material should not have itself in its BoM or child BoMs!"
msgstr ""
@@ -2548,6 +2713,11 @@ msgid "Requires Serial"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document__res_model_name
+msgid "Res Model Name"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line__qty_reserved
#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
#: model:ir.ui.view,arch_db:mrp.view_stock_move_lots
@@ -2603,7 +2773,6 @@ msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_bom__routing_id
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line__routing_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_message__routing_id
#: model:ir.model.fields,field_description:mrp.field_mrp_production__routing_id
#: model:ir.ui.view,arch_db:mrp.mrp_routing_form_view
#: model:ir.ui.view,arch_db:mrp.mrp_routing_search_view
@@ -2650,7 +2819,6 @@ msgid "Schedule manufacturing orders earlier to avoid delays"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workorder_form_view_filter
msgid "Scheduled Date"
msgstr ""
@@ -2666,8 +2834,18 @@ msgid "Scheduled Date Start"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:632
-#: code:addons/mrp/models/mrp_workorder.py:524
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+msgid "Scheduled Date by Month"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+msgid "Scheduled Month"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/mrp_production.py:692
+#: code:addons/mrp/models/mrp_workorder.py:511
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__scrap_ids
#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
@@ -2737,6 +2915,24 @@ msgid "Sequence"
msgstr ""
#. module: mrp
+#: code:addons/mrp/models/stock_warehouse.py:181
+#, python-format
+msgid "Sequence picking before manufacturing"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/stock_warehouse.py:183
+#, python-format
+msgid "Sequence production"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/stock_warehouse.py:182
+#, python-format
+msgid "Sequence stock after manufacturing"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_routing_workcenter__batch
msgid "Set 'no' to schedule the next work order after the previous one. Set 'yes' to produce after the quantity set in 'Quantity To Process' has been produced."
msgstr ""
@@ -2766,7 +2962,13 @@ msgid "Show all records which has next action date is before today"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:548
+#: code:addons/mrp/models/mrp_unbuild.py:106
+#, python-format
+msgid "Some of your components are tracked, you have to specify a manufacturing order in order to retrieve the correct components."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/mrp_production.py:588
#, python-format
msgid "Some raw materials were produced for a lot without finished product. You can correct the following components by unlocking:\n"
""
@@ -2785,6 +2987,8 @@ msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_production__date_start
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity__date_start
+#: model:ir.ui.view,arch_db:mrp.oee_search_view
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_work_order_search
msgid "Start Date"
msgstr ""
@@ -2825,6 +3029,16 @@ msgid "Status based on activities\n"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_stock_warehouse__sam_type_id
+msgid "Stock After Manufacturing Operation Type"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_stock_warehouse__sam_rule_id
+msgid "Stock After Manufacturing Rule"
+msgstr ""
+
+#. module: mrp
#: model:ir.model,name:mrp.model_stock_move
msgid "Stock Move"
msgstr ""
@@ -2840,6 +3054,22 @@ msgid "Stock Moves"
msgstr ""
#. module: mrp
+#: model:ir.model,name:mrp.model_stock_rule
+msgid "Stock Rule"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_stock_warehouse__sam_loc_id
+msgid "Stock after Manufacturing Location"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/stock_warehouse.py:200
+#, python-format
+msgid "Store Finished Product"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document__store_fname
msgid "Stored Filename"
msgstr ""
@@ -2891,6 +3121,11 @@ msgid "Technical field to check when we can unreserve"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_document__key
+msgid "Technical field used to resolve multiple attachments in a multi-website environment."
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_production__consumed_less_than_planned
msgid "Technical field used to see if we have to display a warning or not when confirming an order."
msgstr ""
@@ -2919,8 +3154,8 @@ msgid "Technical: used to figure out default serial number on work orders"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_bom.py:76
-#: code:addons/mrp/models/mrp_bom.py:262
+#: code:addons/mrp/models/mrp_bom.py:95
+#: code:addons/mrp/models/mrp_bom.py:288
#, python-format
msgid "The Product Unit of Measure you chose has a different category than in the product form."
msgstr ""
@@ -2932,11 +3167,6 @@ msgid "The capacity must be strictly positive."
msgstr ""
#. module: mrp
-#: selection:mrp.bom,ready_to_produce:0
-msgid "The components of 1st operation"
-msgstr ""
-
-#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_document__res_model
msgid "The database object this attachment will be attached to."
msgstr ""
@@ -2993,7 +3223,7 @@ msgid "The routing contains all the Work Centers used and for how long. This wil
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/procurement.py:20
+#: code:addons/mrp/models/stock_rule.py:38
#, python-format
msgid "There is no Bill of Material found for the product %s. Please define a Bill of Material for this product."
msgstr ""
@@ -3004,15 +3234,9 @@ msgid "There's no product move yet"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.oee_search_view
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_work_order_search
-msgid "This Month"
-msgstr ""
-
-#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.oee_search_view
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_work_order_search
-msgid "This Year"
+#: code:addons/mrp/models/mrp_bom.py:78
+#, python-format
+msgid "This BoM is used in some Manufacturing Orders that are still open. You should rather archive this BoM and create a new one."
msgstr ""
#. module: mrp
@@ -3041,6 +3265,11 @@ msgid "This stock location will be used, instead of the default one, as the sour
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document__thumbnail
+msgid "Thumbnail"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__time_ids
msgid "Time"
msgstr ""
@@ -3061,7 +3290,7 @@ msgid "Time Tracking"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:445
+#: code:addons/mrp/models/mrp_workorder.py:432
#, python-format
msgid "Time Tracking: "
msgstr ""
@@ -3134,8 +3363,6 @@ msgid "To manufacture or assemble products, and use raw materials and\n"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.oee_search_view
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_work_order_search
#: selection:mrp.production,activity_state:0
#: selection:mrp.unbuild,activity_state:0
msgid "Today"
@@ -3163,6 +3390,11 @@ msgid "Total Qty"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production__product_uom_qty
+msgid "Total Quantity"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter__workorder_progress_count
msgid "Total Running Orders"
msgstr ""
@@ -3227,6 +3459,11 @@ msgid "Unbuild Orders"
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.report_mrp_bom_line
+msgid "Unfold"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_stock_move__unit_factor
msgid "Unit Factor"
msgstr ""
@@ -3322,11 +3559,6 @@ msgid "Using a MPS report to schedule your reordering and manufacturing operatio
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_message__valid_until
-msgid "Validity Date"
-msgstr ""
-
-#. module: mrp
#. openerp-web
#: code:addons/mrp/static/src/xml/mrp.xml:21
#, python-format
@@ -3334,11 +3566,6 @@ msgid "Variant:"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line__attribute_value_ids
-msgid "Variants"
-msgstr ""
-
-#. module: mrp
#: selection:stock.picking.type,code:0
msgid "Vendors"
msgstr ""
@@ -3383,14 +3610,19 @@ msgid "Warehouse"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_bom.py:76
-#: code:addons/mrp/models/mrp_bom.py:262
+#: code:addons/mrp/models/mrp_bom.py:95
+#: code:addons/mrp/models/mrp_bom.py:288
#: code:addons/mrp/wizard/mrp_product_produce.py:202
#, python-format
msgid "Warning"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document__website_id
+msgid "Website"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_bom__website_message_ids
#: model:ir.model.fields,field_description:mrp.field_mrp_production__website_message_ids
#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__website_message_ids
@@ -3413,7 +3645,12 @@ msgstr ""
#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_bom__picking_type_id
-msgid "When a procurement has a ‘produce’ route with a operation type set, it will try to create a Manufacturing Order for that product using a BoM of the same operation type. That allows to define procurement rules which trigger different manufacturing orders with different BoMs."
+msgid "When a procurement has a ‘produce’ route with a operation type set, it will try to create a Manufacturing Order for that product using a BoM of the same operation type. That allows to define stock rules which trigger different manufacturing orders with different BoMs."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,ready_to_produce:0
+msgid "When components for 1st operation are available"
msgstr ""
#. module: mrp
@@ -3422,8 +3659,13 @@ msgid "When products are manufactured, they can be manufactured in this warehous
msgstr ""
#. module: mrp
+#: code:addons/mrp/models/stock_rule.py:17
+#, python-format
+msgid "When products are needed in <b>%s</b>, <br/> a manufacturing order is created to fulfill the need."
+msgstr ""
+
+#. module: mrp
#: model:ir.model,name:mrp.model_mrp_workcenter
-#: model:ir.model.fields,field_description:mrp.field_mrp_message__workcenter_id
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter__workcenter_id
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity__workcenter_id
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__workcenter_id
@@ -3557,7 +3799,7 @@ msgid "Work Sheet"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:608
+#: code:addons/mrp/models/mrp_production.py:668
#, python-format
msgid "Work order %s is still running"
msgstr ""
@@ -3619,11 +3861,6 @@ msgid "Working user on this work order."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__production_messages
-msgid "Workorder Message"
-msgstr ""
-
-#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__worksheet
msgid "Worksheet"
msgstr ""
@@ -3634,25 +3871,25 @@ msgid "You can either upload a file from your computer or copy/paste an internet
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:562
+#: code:addons/mrp/models/mrp_production.py:602
#, python-format
msgid "You can not cancel production order, a work order is still in progress."
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:250
+#: code:addons/mrp/models/mrp_workorder.py:234
#, python-format
msgid "You can not change the finished work order."
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:594
+#: code:addons/mrp/models/mrp_production.py:654
#, python-format
msgid "You can not consume without telling for which lot you consumed it"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_bom.py:98
+#: code:addons/mrp/models/mrp_bom.py:117
#, python-format
msgid "You can not delete a Bill of Material with running manufacturing orders.\n"
"Please close or cancel it first."
@@ -3677,19 +3914,25 @@ msgid "You cannot consume the same serial number twice. Please correct the seria
msgstr ""
#. module: mrp
+#: code:addons/mrp/models/mrp_unbuild.py:88
+#, python-format
+msgid "You cannot delete an unbuild order if the stateis \"Done\""
+msgstr ""
+
+#. module: mrp
#: code:addons/mrp/wizard/mrp_product_produce.py:82
#, python-format
msgid "You cannot produce the same serial number twice."
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_unbuild.py:93
+#: code:addons/mrp/models/mrp_unbuild.py:100
#, python-format
msgid "You cannot unbuild a undone manufacturing order."
msgstr ""
#. module: mrp
-#: code:addons/mrp/wizard/change_production_qty.py:47
+#: code:addons/mrp/wizard/change_production_qty.py:48
#, python-format
msgid "You have already processed %s. Please input a quantity higher than %s "
msgstr ""
@@ -3700,19 +3943,19 @@ msgid "You have consumed less material than what was planned. Are you sure you w
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:435
+#: code:addons/mrp/models/mrp_workorder.py:422
#, python-format
msgid "You need to define at least one productivity loss in the category 'Performance'. Create one from the Manufacturing app, menu: Configuration / Productivity Losses."
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:431
+#: code:addons/mrp/models/mrp_workorder.py:418
#, python-format
msgid "You need to define at least one productivity loss in the category 'Productivity'. Create one from the Manufacturing app, menu: Configuration / Productivity Losses."
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:489
+#: code:addons/mrp/models/mrp_workorder.py:476
#, python-format
msgid "You need to define at least one unactive productivity loss in the category 'Performance'. Create one from the Manufacturing app, menu: Configuration / Productivity Losses."
msgstr ""
@@ -3724,30 +3967,24 @@ msgid "You need to provide a lot for the finished product."
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_unbuild.py:89
+#: code:addons/mrp/models/mrp_unbuild.py:96
#, python-format
msgid "You should provide a lot number for the final product."
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:336
+#: code:addons/mrp/models/mrp_workorder.py:323
#, python-format
msgid "You should provide a lot/serial number for a component."
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:313
+#: code:addons/mrp/models/mrp_workorder.py:300
#, python-format
msgid "You should provide a lot/serial number for the final product."
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_unbuild.py:99
-#, python-format
-msgid "You should specify a manufacturing order in order to find the correct tracked products."
-msgstr ""
-
-#. module: mrp
#: model:ir.actions.act_window,help:mrp.action_mrp_routing_time
#: model:ir.actions.act_window,help:mrp.mrp_workorder_delta_report
msgid "You will get here statistics about the\n"
@@ -3755,6 +3992,11 @@ msgid "You will get here statistics about the\n"
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.exception_on_mo
+msgid "cancelled"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
#: model:ir.ui.view,arch_db:mrp.view_mrp_product_template_form_inherited
msgid "days"
@@ -3771,7 +4013,7 @@ msgid "last"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:654
+#: code:addons/mrp/models/mrp_production.py:714
#, python-format
msgid "manufacturing order"
msgstr ""
@@ -3782,8 +4024,8 @@ msgid "minute(s)"
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/mrp_report_bom_structure.py:199
-#: code:addons/mrp/report/mrp_report_bom_structure.py:209
+#: code:addons/mrp/report/mrp_report_bom_structure.py:210
+#: code:addons/mrp/report/mrp_report_bom_structure.py:220
#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
#: model:ir.ui.view,arch_db:mrp.mrp_routing_workcenter_form_view
#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view
@@ -3797,6 +4039,21 @@ msgid "mrp.bom.line"
msgstr ""
#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_workcenter_productivity_loss_type
+msgid "mrp.workcenter.productivity.loss.type"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.exception_on_mo
+msgid "of"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.exception_on_mo
+msgid "ordered instead of"
+msgstr ""
+
+#. module: mrp
#. openerp-web
#: code:addons/mrp/static/src/xml/mrp.xml:4
#, python-format
@@ -3821,6 +4078,11 @@ msgid "report.mrp.report_bom_structure"
msgstr ""
#. module: mrp
+#: model:ir.model,name:mrp.model_report_stock_report_stock_rule
+msgid "report.stock.report_stock_rule"
+msgstr ""
+
+#. module: mrp
#: model:ir.model,name:mrp.model_res_config_settings
msgid "res.config.settings"
msgstr ""
diff --git a/addons/note/i18n/note.pot b/addons/note/i18n/note.pot
index 98073ab7c0a..fbc925691ea 100644
--- a/addons/note/i18n/note.pot
+++ b/addons/note/i18n/note.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:12+0000\n"
-"PO-Revision-Date: 2018-08-02 09:12+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -91,6 +91,13 @@ msgid "Category"
msgstr ""
#. module: note
+#. openerp-web
+#: code:addons/note/static/src/xml/systray.xml:10
+#, python-format
+msgid "Channel"
+msgstr ""
+
+#. module: note
#: model:ir.model.fields,field_description:note.field_note_note__color
#: model:ir.model.fields,field_description:note.field_note_tag__color
msgid "Color Index"
@@ -133,11 +140,21 @@ msgid "Display Name"
msgstr ""
#. module: note
+#: model:ir.ui.view,arch_db:note.view_note_note_kanban
+msgid "Dropdown menu"
+msgstr ""
+
+#. module: note
#: model:ir.model.fields,field_description:note.field_note_stage__fold
msgid "Folded by Default"
msgstr ""
#. module: note
+#: model:ir.ui.view,arch_db:note.view_note_note_kanban
+msgid "Follower"
+msgstr ""
+
+#. module: note
#: model:ir.model.fields,field_description:note.field_note_note__message_follower_ids
msgid "Followers"
msgstr ""
@@ -290,7 +307,6 @@ msgstr ""
#. module: note
#: code:addons/note/models/res_users.py:61
#: model:ir.actions.act_window,name:note.action_note_note
-#: model:ir.ui.menu,name:note.menu_note_notes
#: model:ir.ui.view,arch_db:note.view_note_note_filter
#: model:note.stage,name:note.note_stage_02
#, python-format
@@ -349,6 +365,11 @@ msgid "Planned"
msgstr ""
#. module: note
+#: model:ir.ui.menu,name:note.menu_note_notes
+msgid "Productivity"
+msgstr ""
+
+#. module: note
#: model:ir.model.fields,field_description:note.field_mail_activity__note_id
msgid "Related Note"
msgstr ""
@@ -385,6 +406,13 @@ msgid "Sequence"
msgstr ""
#. module: note
+#. openerp-web
+#: code:addons/note/static/src/xml/systray.xml:18
+#, python-format
+msgid "Set date and time"
+msgstr ""
+
+#. module: note
#: model:ir.ui.view,arch_db:note.view_note_note_filter
msgid "Show all records which has next action date is before today"
msgstr ""
@@ -452,7 +480,7 @@ msgstr ""
#. module: note
#. openerp-web
-#: code:addons/note/static/src/js/systray.js:90
+#: code:addons/note/static/src/js/systray_activity_menu.js:93
#: selection:note.note,activity_state:0
#, python-format
msgid "Today"
diff --git a/addons/pad/i18n/pad.pot b/addons/pad/i18n/pad.pot
index 69be011c049..41a49a024ef 100644
--- a/addons/pad/i18n/pad.pot
+++ b/addons/pad/i18n/pad.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:10+0000\n"
-"PO-Revision-Date: 2018-03-22 14:10+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -99,6 +99,13 @@ msgstr ""
#. module: pad
#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:14
+#, python-format
+msgid "Switch pad"
+msgstr ""
+
+#. module: pad
+#. openerp-web
#: code:addons/pad/static/src/js/pad.js:166
#, python-format
msgid "This pad will be initialized on first edit"
diff --git a/addons/payment/i18n/payment.pot b/addons/payment/i18n/payment.pot
index 57871ba3c13..c603e9ccaae 100644
--- a/addons/payment/i18n/payment.pot
+++ b/addons/payment/i18n/payment.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -36,6 +36,11 @@ msgid "<b>Amount:</b>"
msgstr ""
#. module: payment
+#: model:ir.ui.view,arch_db:payment.payment_confirmation_status
+msgid "<b>Communication: </b>"
+msgstr ""
+
+#. module: payment
#: model:ir.ui.view,arch_db:payment.pay
msgid "<b>Reference:</b>"
msgstr ""
@@ -92,6 +97,21 @@ msgid "<p>This card is currently linked to the following records:<p/>"
msgstr ""
#. module: payment
+#: model:ir.ui.view,arch_db:payment.payment_acquirer_onboarding_wizard_form
+msgid "<span class=\"fa fa-arrow-right\"> Create a PayPal account</span>"
+msgstr ""
+
+#. module: payment
+#: model:ir.ui.view,arch_db:payment.payment_acquirer_onboarding_wizard_form
+msgid "<span class=\"fa fa-arrow-right\"> Get my Stripe keys</span>"
+msgstr ""
+
+#. module: payment
+#: model:ir.ui.view,arch_db:payment.view_partners_form_payment_defaultcreditcard
+msgid "<span class=\"o_stat_text\">Credit card(s)</span>"
+msgstr ""
+
+#. module: payment
#: model:ir.ui.view,arch_db:payment.acquirer_form
msgid "<span class=\"o_warning_text\">Test</span>\n"
" <span class=\"o_stat_text\">Environment</span>"
@@ -188,15 +208,15 @@ msgid "A token is required to create a new payment transaction."
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:642
+#: code:addons/payment/models/payment_acquirer.py:643
#, python-format
-msgid "A transaction %s with %s has been initiated using %s credit card."
+msgid "A transaction %s with %s initiated using %s credit card."
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:648
+#: code:addons/payment/models/payment_acquirer.py:649
#, python-format
-msgid "A transaction %s with %s has been initiated."
+msgid "A transaction %s with %s initiated."
msgstr ""
#. module: payment
@@ -212,7 +232,19 @@ msgid "A transaction can't be linked to invoices having different partners."
msgstr ""
#. module: payment
+#: code:addons/payment/wizards/payment_acquirer_onboarding_wizard.py:33
+#, python-format
+msgid "Account"
+msgstr ""
+
+#. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__acc_number
+msgid "Account Number"
+msgstr ""
+
+#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_transaction__acquirer_id
+#: model:ir.ui.view,arch_db:payment.acquirer_kanban
msgid "Acquirer"
msgstr ""
@@ -280,6 +312,11 @@ msgid "Amount"
msgstr ""
#. module: payment
+#: model:ir.ui.view,arch_db:payment.payment_acquirer_onboarding_wizard_form
+msgid "Apply"
+msgstr ""
+
+#. module: payment
#: model:ir.ui.view,arch_db:payment.account_invoice_view_form_inherit_payment
#: model:ir.ui.view,arch_db:payment.transaction_form
msgid "Are you sure you want to void the authorized transaction? This action can't be undone."
@@ -307,12 +344,23 @@ msgid "Authorized Transactions"
msgstr ""
#. module: payment
+#: code:addons/payment/wizards/payment_acquirer_onboarding_wizard.py:33
+#, python-format
+msgid "Bank"
+msgstr ""
+
+#. module: payment
#: model:payment.acquirer,post_msg:payment.payment_acquirer_custom
#: model:payment.acquirer,post_msg:payment.payment_acquirer_transfer
msgid "Bank Account"
msgstr ""
#. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__journal_name
+msgid "Bank Name"
+msgstr ""
+
+#. module: payment
#: model:payment.acquirer,name:payment.payment_acquirer_buckaroo
#: selection:payment.acquirer,provider:0
msgid "Buckaroo"
@@ -341,6 +389,7 @@ msgstr ""
#. module: payment
#. openerp-web
#: code:addons/payment/static/src/js/payment_form.js:360
+#: model:ir.ui.view,arch_db:payment.payment_acquirer_onboarding_wizard_form
#, python-format
msgid "Cancel"
msgstr ""
@@ -385,18 +434,39 @@ msgid "Capture the amount from Odoo, when the delivery is completed."
msgstr ""
#. module: payment
+#: model:ir.ui.view,arch_db:payment.payment_acquirer_onboarding_wizard_form
+msgid "Check here"
+msgstr ""
+
+#. module: payment
+#: model:ir.actions.act_window,name:payment.action_open_payment_onboarding_payment_acquirer_wizard
+#: model:ir.ui.view,arch_db:payment.payment_acquirer_onboarding_wizard_form
+msgid "Choose a payment method"
+msgstr ""
+
+#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_transaction__partner_city
#: model:ir.ui.view,arch_db:payment.transaction_form
msgid "City"
msgstr ""
#. module: payment
+#: model:ir.ui.view,arch_db:payment.payment_confirmation_status
+msgid "Close"
+msgstr ""
+
+#. module: payment
#: model:payment.acquirer,post_msg:payment.payment_acquirer_custom
#: model:payment.acquirer,post_msg:payment.payment_acquirer_transfer
msgid "Communication"
msgstr ""
#. module: payment
+#: model:ir.model,name:payment.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer__company_id
msgid "Company"
msgstr ""
@@ -412,6 +482,11 @@ msgid "Configure"
msgstr ""
#. module: payment
+#: model:ir.ui.view,arch_db:payment.onboarding_payment_acquirer_step
+msgid "Configure your payment methods."
+msgstr ""
+
+#. module: payment
#. openerp-web
#: code:addons/payment/static/src/js/payment_form.js:359
#, python-format
@@ -467,6 +542,7 @@ msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer__create_uid
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__create_uid
#: model:ir.model.fields,field_description:payment.field_payment_icon__create_uid
#: model:ir.model.fields,field_description:payment.field_payment_token__create_uid
#: model:ir.model.fields,field_description:payment.field_payment_transaction__create_uid
@@ -475,6 +551,7 @@ msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer__create_date
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__create_date
#: model:ir.model.fields,field_description:payment.field_payment_icon__create_date
#: model:ir.model.fields,field_description:payment.field_payment_token__create_date
#: model:ir.model.fields,field_description:payment.field_payment_transaction__create_date
@@ -487,11 +564,6 @@ msgid "Credentials"
msgstr ""
#. module: payment
-#: model:ir.ui.view,arch_db:payment.view_partners_form_payment_defaultcreditcard
-msgid "Credit card(s)"
-msgstr ""
-
-#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_transaction__currency_id
msgid "Currency"
msgstr ""
@@ -502,6 +574,11 @@ msgid "Custom"
msgstr ""
#. module: payment
+#: selection:payment.acquirer.onboarding.wizard,payment_method:0
+msgid "Custom payment instructions"
+msgstr ""
+
+#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_transaction__partner_id
msgid "Customer"
msgstr ""
@@ -517,7 +594,13 @@ msgid "Determine the display order"
msgstr ""
#. module: payment
+#: model:ir.ui.view,arch_db:payment.payment_confirmation_status
+msgid "Dismiss"
+msgstr ""
+
+#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer__display_name
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__display_name
#: model:ir.model.fields,field_description:payment.field_payment_icon__display_name
#: model:ir.model.fields,field_description:payment.field_payment_token__display_name
#: model:ir.model.fields,field_description:payment.field_payment_transaction__display_name
@@ -526,6 +609,7 @@ msgstr ""
#. module: payment
#: selection:payment.transaction,state:0
+#: selection:res.company,payment_acquirer_onboarding_state:0
msgid "Done"
msgstr ""
@@ -639,6 +723,7 @@ msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer__id
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__id
#: model:ir.model.fields,field_description:payment.field_payment_icon__id
#: model:ir.model.fields,field_description:payment.field_payment_token__id
#: model:ir.model.fields,field_description:payment.field_payment_transaction__id
@@ -705,19 +790,25 @@ msgid "Invoice(s)"
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:801
+#: code:addons/payment/models/payment_acquirer.py:802
#: model:ir.model.fields,field_description:payment.field_payment_transaction__invoice_ids
#, python-format
msgid "Invoices"
msgstr ""
#. module: payment
+#: selection:res.company,payment_acquirer_onboarding_state:0
+msgid "Just done"
+msgstr ""
+
+#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_transaction__partner_lang
msgid "Language"
msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer____last_update
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard____last_update
#: model:ir.model.fields,field_description:payment.field_payment_icon____last_update
#: model:ir.model.fields,field_description:payment.field_payment_token____last_update
#: model:ir.model.fields,field_description:payment.field_payment_transaction____last_update
@@ -726,6 +817,7 @@ msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer__write_uid
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__write_uid
#: model:ir.model.fields,field_description:payment.field_payment_icon__write_uid
#: model:ir.model.fields,field_description:payment.field_payment_token__write_uid
#: model:ir.model.fields,field_description:payment.field_payment_transaction__write_uid
@@ -734,6 +826,7 @@ msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer__write_date
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__write_date
#: model:ir.model.fields,field_description:payment.field_payment_icon__write_date
#: model:ir.model.fields,field_description:payment.field_payment_token__write_date
#: model:ir.model.fields,field_description:payment.field_payment_transaction__write_date
@@ -766,6 +859,11 @@ msgid "Manage your payment methods"
msgstr ""
#. module: payment
+#: selection:res.company,payment_onboarding_payment_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: payment
#: selection:payment.acquirer,provider:0
msgid "Manual Configuration"
msgstr ""
@@ -829,6 +927,11 @@ msgid "Messages"
msgstr ""
#. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__manual_name
+msgid "Method"
+msgstr ""
+
+#. module: payment
#: code:addons/payment/models/payment_acquirer.py:468
#, python-format
msgid "Missing partner reference when trying to create a new payment token"
@@ -868,6 +971,11 @@ msgid "No payment method selected"
msgstr ""
#. module: payment
+#: selection:res.company,payment_acquirer_onboarding_state:0
+msgid "Not done"
+msgstr ""
+
+#. module: payment
#: model:ir.model.fields,help:payment.field_account_payment__payment_token_id
msgid "Note that tokens from acquirers set to only authorize transactions (instead of capturing the amount) are not available."
msgstr ""
@@ -890,42 +998,59 @@ msgid "Ok"
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:708
+#: code:addons/payment/wizards/payment_acquirer_onboarding_wizard.py:47
+#, python-format
+msgid "Only administrators can access this data."
+msgstr ""
+
+#. module: payment
+#: code:addons/payment/models/payment_acquirer.py:709
#, python-format
msgid "Only draft transaction can be authorized."
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:699
+#: code:addons/payment/models/payment_acquirer.py:700
#, python-format
msgid "Only draft transaction can be processed."
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:745
+#: code:addons/payment/models/payment_acquirer.py:746
#, python-format
msgid "Only draft/authorized transaction can be cancelled."
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:717
+#: code:addons/payment/models/payment_acquirer.py:718
#, python-format
msgid "Only draft/authorized transaction can be posted."
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:972
+#: code:addons/payment/models/payment_acquirer.py:973
#, python-format
msgid "Only transactions having the capture status can be captured."
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:979
+#: code:addons/payment/models/payment_acquirer.py:980
#, python-format
msgid "Only transactions having the capture status can be voided."
msgstr ""
#. module: payment
+#: model:ir.ui.view,arch_db:payment.confirm
+#: model:ir.ui.view,arch_db:payment.payment_confirmation_status
+msgid "Or scan me with your banking app."
+msgstr ""
+
+#. module: payment
+#: selection:res.company,payment_onboarding_payment_method:0
+msgid "Other"
+msgstr ""
+
+#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_token__partner_id
msgid "Partner"
msgstr ""
@@ -936,6 +1061,31 @@ msgid "Partner Name"
msgstr ""
#. module: payment
+#: selection:payment.acquirer.onboarding.wizard,payment_method:0
+msgid "Pay with PayPal"
+msgstr ""
+
+#. module: payment
+#: selection:payment.acquirer.onboarding.wizard,payment_method:0
+msgid "Pay with another payment acquirer"
+msgstr ""
+
+#. module: payment
+#: selection:payment.acquirer.onboarding.wizard,payment_method:0
+msgid "Pay with credit card (via Stripe)"
+msgstr ""
+
+#. module: payment
+#: selection:res.company,payment_onboarding_payment_method:0
+msgid "PayPal"
+msgstr ""
+
+#. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__paypal_email_account
+msgid "PayPal Email ID"
+msgstr ""
+
+#. module: payment
#: model:payment.acquirer,name:payment.payment_acquirer_payu
#: selection:payment.acquirer,provider:0
msgid "PayUmoney"
@@ -979,11 +1129,22 @@ msgid "Payment Icons"
msgstr ""
#. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__manual_post_msg
+msgid "Payment Instructions"
+msgstr ""
+
+#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer__journal_id
msgid "Payment Journal"
msgstr ""
#. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__payment_method
+#: model:ir.ui.view,arch_db:payment.onboarding_payment_acquirer_step
+msgid "Payment Method"
+msgstr ""
+
+#. module: payment
#: model:ir.ui.view,arch_db:payment.pay_methods
msgid "Payment Methods"
msgstr ""
@@ -1024,6 +1185,11 @@ msgid "Payment from Odoo"
msgstr ""
#. module: payment
+#: model:ir.ui.view,arch_db:payment.onboarding_payment_acquirer_step
+msgid "Payment method set!"
+msgstr ""
+
+#. module: payment
#: code:addons/payment/controllers/portal.py:150
#: code:addons/payment/controllers/portal.py:154
#, python-format
@@ -1055,6 +1221,16 @@ msgid "Paypal"
msgstr ""
#. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__paypal_seller_account
+msgid "Paypal Merchant ID"
+msgstr ""
+
+#. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__paypal_pdt_token
+msgid "Paypal PDT Token"
+msgstr ""
+
+#. module: payment
#: selection:payment.transaction,state:0
msgid "Pending"
msgstr ""
@@ -1075,6 +1251,12 @@ msgid "Please configure a payment acquirer."
msgstr ""
#. module: payment
+#: code:addons/payment/wizards/payment_acquirer_onboarding_wizard.py:32
+#, python-format
+msgid "Please make a payment to <ul><li>Bank: %s</li><li>Account Number: %s</li><li>Account Holder: %s</li></ul>"
+msgstr ""
+
+#. module: payment
#. openerp-web
#: code:addons/payment/static/src/js/payment_form.js:202
#, python-format
@@ -1175,6 +1357,11 @@ msgid "Saving Card Data supported"
msgstr ""
#. module: payment
+#: model:ir.model.fields,field_description:payment.field_res_company__payment_onboarding_payment_method
+msgid "Selected onboarding payment method"
+msgstr ""
+
+#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer__sequence
msgid "Sequence"
msgstr ""
@@ -1205,6 +1392,11 @@ msgid "Server error"
msgstr ""
#. module: payment
+#: model:ir.ui.view,arch_db:payment.onboarding_payment_acquirer_step
+msgid "Set payments"
+msgstr ""
+
+#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_token__short_name
msgid "Short name"
msgstr ""
@@ -1231,6 +1423,11 @@ msgid "Specific Countries"
msgstr ""
#. module: payment
+#: model:ir.model.fields,field_description:payment.field_res_company__payment_acquirer_onboarding_state
+msgid "State of the onboarding payment acquirer step"
+msgstr ""
+
+#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_transaction__state
msgid "Status"
msgstr ""
@@ -1238,10 +1435,21 @@ msgstr ""
#. module: payment
#: model:payment.acquirer,name:payment.payment_acquirer_stripe
#: selection:payment.acquirer,provider:0
+#: selection:res.company,payment_onboarding_payment_method:0
msgid "Stripe"
msgstr ""
#. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__stripe_publishable_key
+msgid "Stripe Publishable Key"
+msgstr ""
+
+#. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__stripe_secret_key
+msgid "Stripe Secret Key"
+msgstr ""
+
+#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer__payment_icon_ids
msgid "Supported Payment Icons"
msgstr ""
@@ -1252,6 +1460,11 @@ msgid "Template for method registration"
msgstr ""
#. module: payment
+#: model:ir.model,name:payment.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr ""
+
+#. module: payment
#: selection:payment.acquirer,environment:0
msgid "Test"
msgstr ""
@@ -1262,43 +1475,49 @@ msgid "Thanks Message"
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:821
+#: code:addons/payment/models/payment_acquirer.py:822
#, python-format
msgid "The %s payment acquirers are not allowed to manual capture mode!"
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:645
+#: model:ir.ui.view,arch_db:payment.confirm
+#: model:ir.ui.view,arch_db:payment.payment_confirmation_status
+msgid "The SEPA QR Code informations are not set correctly."
+msgstr ""
+
+#. module: payment
+#: code:addons/payment/models/payment_acquirer.py:646
#, python-format
msgid "The customer has selected %s to pay this document."
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:662
+#: code:addons/payment/models/payment_acquirer.py:663
#, python-format
msgid "The transaction %s with %s for %s has been authorized. Waiting for capture..."
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:667
+#: code:addons/payment/models/payment_acquirer.py:668
#, python-format
msgid "The transaction %s with %s for %s has been cancelled with the following message: %s"
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:670
+#: code:addons/payment/models/payment_acquirer.py:671
#, python-format
msgid "The transaction %s with %s for %s has been cancelled."
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:664
+#: code:addons/payment/models/payment_acquirer.py:665
#, python-format
msgid "The transaction %s with %s for %s has been confirmed. The related payment is posted: %s"
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:660
+#: code:addons/payment/models/payment_acquirer.py:661
#, python-format
msgid "The transaction %s with %s for %s is pending."
msgstr ""
@@ -1381,7 +1600,7 @@ msgid "Void Transaction"
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:651
+#: code:addons/payment/models/payment_acquirer.py:652
#, python-format
msgid "Waiting for payment confirmation..."
msgstr ""
@@ -1541,6 +1760,11 @@ msgid "partner_values: specific values about the buyer, for example coming from
msgstr ""
#. module: payment
+#: model:ir.model,name:payment.model_payment_acquirer_onboarding_wizard
+msgid "payment.acquirer.onboarding.wizard"
+msgstr ""
+
+#. module: payment
#: model:ir.model,name:payment.model_payment_token
msgid "payment.token"
msgstr ""
@@ -1551,6 +1775,11 @@ msgid "reference: the transaction reference number"
msgstr ""
#. module: payment
+#: model:ir.ui.view,arch_db:payment.payment_acquirer_onboarding_wizard_form
+msgid "to choose another payment method."
+msgstr ""
+
+#. module: payment
#: model:ir.ui.view,arch_db:payment.acquirer_form
msgid "tx_url: transaction URL to post the form"
msgstr ""
@@ -1565,8 +1794,3 @@ msgstr ""
msgid "user: current user browse record"
msgstr ""
-#. module: payment
-#: model:ir.model,name:payment.model_wizard_multi_charts_accounts
-msgid "wizard.multi.charts.accounts"
-msgstr ""
-
diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot
index d6514ece1b8..471380aaba8 100644
--- a/addons/point_of_sale/i18n/point_of_sale.pot
+++ b/addons/point_of_sale/i18n/point_of_sale.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:12+0000\n"
-"PO-Revision-Date: 2018-08-02 09:12+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
"Plural-Forms: \n"
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:880
-#: code:addons/point_of_sale/models/pos_order.py:889
+#: code:addons/point_of_sale/models/pos_order.py:901
+#: code:addons/point_of_sale/models/pos_order.py:913
#, python-format
msgid " REFUND"
msgstr ""
@@ -48,21 +48,21 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1474
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1477
#, python-format
msgid "% discount"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1603
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1643
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1606
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1646
#, python-format
msgid "&nbsp;"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:85
+#: code:addons/point_of_sale/models/pos_order.py:89
#, python-format
msgid "(RESCUE FOR %(session)s)"
msgstr ""
@@ -88,7 +88,7 @@ msgid "<i class=\"fa fa-eye-slash\"/>Hide"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
msgid "<i class=\"fa fa-fw fa-arrow-right\"/>How to manage tax-included prices"
msgstr ""
@@ -100,6 +100,26 @@ msgid "<p>Click to start the point of sale interface. It <b>runs on tablets</b>,
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "<span class=\"o_form_label\">Journal Entries</span>"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "<span class=\"o_form_label\">Order Reference</span>"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "<span class=\"o_form_label\">Payment Methods</span>"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.view_pos_open_statement
+msgid "<span class=\"o_form_label\">The system will open all cash registers, so that you can start recording payments. We suggest you to control the opening balance of each register, using their CashBox tab.</span>"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_form
msgid "<span class=\"o_stat_text\">Put</span>\n"
" <span class=\"o_stat_text\">Money In</span>"
@@ -229,14 +249,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2012
+#: code:addons/point_of_sale/static/src/js/screens.js:2026
#, python-format
msgid "? Clicking \"Confirm\" will validate the payment."
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1260
+#: code:addons/point_of_sale/static/src/js/screens.js:1271
#, python-format
msgid "A Customer Name Is Required"
msgstr ""
@@ -283,7 +303,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1642
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1645
#, python-format
msgid "ABC"
msgstr ""
@@ -326,19 +346,21 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1862
+#: code:addons/point_of_sale/static/src/js/screens.js:1876
#, python-format
msgid "Add Tip"
msgstr ""
#. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_pos_discount
-msgid "Add a Global Discount"
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
+msgid "Add a custom message to header and footer"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
-msgid "Add a custom message to header and footer"
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:487
+#, python-format
+msgid "Add a customer"
msgstr ""
#. module: point_of_sale
@@ -365,13 +387,13 @@ msgid "Alias"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:244
+#: code:addons/point_of_sale/models/pos_config.py:243
#, python-format
msgid "All available pricelists must be in the same currency as the company or as the Sales Journal set on this point of sale if you use the Accounting application."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:250
+#: code:addons/point_of_sale/models/pos_config.py:249
#, python-format
msgid "All payment methods must be in the same currency as the Sales Journal or the company currency if that is not set."
msgstr ""
@@ -419,14 +441,8 @@ msgid "Another session is already opened for this point of sale."
msgstr ""
#. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_discount
-msgid "Apply Discount"
-msgstr ""
-
-#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2004
+#: code:addons/point_of_sale/static/src/js/screens.js:2018
#, python-format
msgid "Are you sure that the customer wants to pay"
msgstr ""
@@ -474,14 +490,10 @@ msgid "Available for Point of Sale"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.product_template_search_view_pos
-msgid "Available in POS"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_product_product__available_in_pos
#: model:ir.model.fields,field_description:point_of_sale.field_product_template__available_in_pos
-msgid "Available in Point of Sale"
+#: model:ir.ui.view,arch_db:point_of_sale.product_template_search_view_pos
+msgid "Available in POS"
msgstr ""
#. module: point_of_sale
@@ -498,6 +510,15 @@ msgid "Back"
msgstr ""
#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:179
+#: code:addons/point_of_sale/static/src/xml/pos.xml:625
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1192
+#, python-format
+msgid "Backspace"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_account_bank_statement
#: model:ir.model.fields,field_description:point_of_sale.field_pos_session__statement_ids
msgid "Bank Statement"
@@ -512,7 +533,7 @@ msgstr ""
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:380
#: code:addons/point_of_sale/static/src/xml/pos.xml:443
-#: model:ir.model.fields,field_description:point_of_sale.field_res_partner__barcode
+#: model:ir.ui.view,arch_db:point_of_sale.report_userlabel
#, python-format
msgid "Barcode"
msgstr ""
@@ -525,7 +546,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1342
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1345
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config__barcode_scanner
#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
#, python-format
@@ -544,7 +565,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:949
+#: code:addons/point_of_sale/static/src/js/screens.js:960
#, python-format
msgid "Button"
msgstr ""
@@ -571,7 +592,6 @@ msgstr ""
#: code:addons/point_of_sale/static/src/xml/pos.xml:1145
#: code:addons/point_of_sale/static/src/xml/pos.xml:1197
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_details_wizard
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_discount
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_open_statement
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_payment
#, python-format
@@ -586,7 +606,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1993
+#: code:addons/point_of_sale/static/src/js/screens.js:2007
#, python-format
msgid "Cannot return change without a cash payment method"
msgstr ""
@@ -649,6 +669,15 @@ msgid "Categories are used to browse your products through the\n"
msgstr ""
#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:187
+#: model:ir.ui.view,arch_db:point_of_sale.product_template_form_view
+#: model:ir.ui.view,arch_db:point_of_sale.view_pos_category_kanban
+#, python-format
+msgid "Category"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
msgid "Category Pictures"
msgstr ""
@@ -669,14 +698,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1205
+#: code:addons/point_of_sale/static/src/js/screens.js:1216
#, python-format
msgid "Change Customer"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1862
+#: code:addons/point_of_sale/static/src/js/screens.js:1876
#, python-format
msgid "Change Tip"
msgstr ""
@@ -684,8 +713,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:708
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1532
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1693
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1535
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1696
#, python-format
msgid "Change:"
msgstr ""
@@ -725,7 +754,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2053
+#: code:addons/point_of_sale/static/src/js/screens.js:2067
#, python-format
msgid "Check your internet connection and try again."
msgstr ""
@@ -767,6 +796,20 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:105
+#, python-format
+msgid "Client Screen Connected"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:102
+#, python-format
+msgid "Client Screen Disconnected"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
#: code:addons/point_of_sale/static/src/js/chrome.js:463
#, python-format
msgid "Client Screen Unsupported. Please upgrade the PosBox"
@@ -774,8 +817,15 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:825
-#: code:addons/point_of_sale/static/src/js/chrome.js:833
+#: code:addons/point_of_sale/static/src/xml/pos.xml:99
+#, python-format
+msgid "Client Screen Warning"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/js/chrome.js:824
+#: code:addons/point_of_sale/static/src/js/chrome.js:832
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban
#, python-format
msgid "Close"
@@ -805,11 +855,6 @@ msgid "Closing Date"
msgstr ""
#. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config__company_id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order__company_id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line__company_id
@@ -834,7 +879,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:830
+#: code:addons/point_of_sale/static/src/js/chrome.js:829
#: code:addons/point_of_sale/static/src/xml/pos.xml:1059
#, python-format
msgid "Confirm"
@@ -849,6 +894,13 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:76
+#, python-format
+msgid "Connecting to Proxy"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
#: code:addons/point_of_sale/static/src/js/models.js:121
#, python-format
msgid "Connecting to the PosBox"
@@ -871,7 +923,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1363
+#: code:addons/point_of_sale/static/src/js/screens.js:1374
#, python-format
msgid "Could Not Read Image"
msgstr ""
@@ -897,7 +949,6 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category__create_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config__create_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard__create_uid
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_discount__create_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment__create_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement__create_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order__create_uid
@@ -911,7 +962,6 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category__create_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config__create_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard__create_date
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_discount__create_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment__create_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement__create_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order__create_date
@@ -958,8 +1008,10 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1873
+#: code:addons/point_of_sale/static/src/js/screens.js:1887
+#: code:addons/point_of_sale/static/src/xml/pos.xml:141
#: code:addons/point_of_sale/static/src/xml/pos.xml:145
+#: code:addons/point_of_sale/static/src/xml/pos.xml:671
#: code:addons/point_of_sale/static/src/xml/pos.xml:676
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order__partner_id
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order__partner_id
@@ -979,8 +1031,8 @@ msgid "Customer Facing Display"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:561
-#: code:addons/point_of_sale/models/pos_order.py:612
+#: code:addons/point_of_sale/models/pos_order.py:580
+#: code:addons/point_of_sale/models/pos_order.py:631
#, python-format
msgid "Customer Invoice"
msgstr ""
@@ -1007,7 +1059,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1332
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1335
#, python-format
msgid "Debug Window"
msgstr ""
@@ -1075,7 +1127,17 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1352
+#: code:addons/point_of_sale/static/src/xml/pos.xml:576
+#: code:addons/point_of_sale/static/src/xml/pos.xml:589
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1393
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1405
+#, python-format
+msgid "Delete"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1355
#, python-format
msgid "Delete Paid Orders"
msgstr ""
@@ -1089,7 +1151,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1353
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1356
#, python-format
msgid "Delete Unpaid Orders"
msgstr ""
@@ -1103,12 +1165,25 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1208
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1436
+#, python-format
+msgid "Delete order"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/js/screens.js:1219
#, python-format
msgid "Deselect Customer"
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
+msgid "Desk Organizer"
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/js/chrome.js:56
#, python-format
@@ -1126,6 +1201,11 @@ msgid "Difference between the theoretical closing balance and the real closing b
msgstr ""
#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_digest_digest
+msgid "Digest"
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:168
#, python-format
@@ -1145,7 +1225,6 @@ msgid "Disconnected"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_discount__discount
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line__discount
msgid "Discount (%)"
msgstr ""
@@ -1159,7 +1238,7 @@ msgstr ""
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:790
#: code:addons/point_of_sale/static/src/xml/pos.xml:929
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1504
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1507
#, python-format
msgid "Discount:"
msgstr ""
@@ -1179,6 +1258,13 @@ msgid "Discounts"
msgstr ""
#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1336
+#, python-format
+msgid "Dismiss"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config__iface_display_categ_images
msgid "Display Category Pictures"
msgstr ""
@@ -1187,7 +1273,6 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category__display_name
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config__display_name
#: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard__display_name
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_discount__display_name
#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment__display_name
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement__display_name
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order__display_name
@@ -1206,6 +1291,12 @@ msgid "Display pictures of product categories"
msgstr ""
#. module: point_of_sale
+#: code:addons/point_of_sale/models/digest.py:16
+#, python-format
+msgid "Do not have access, skip this data for user's digest email"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_open_statement
msgid "Do you want to open cash registers?"
msgstr ""
@@ -1228,20 +1319,34 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1355
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1023
+#, python-format
+msgid "Download"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1358
#, python-format
msgid "Download Paid Orders"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1357
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1360
#, python-format
msgid "Download Unpaid Orders"
msgstr ""
#. module: point_of_sale
#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1020
+#, python-format
+msgid "Download error"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:550
#, python-format
msgid "Due"
@@ -1249,7 +1354,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1335
+#: code:addons/point_of_sale/static/src/xml/pos.xml:409
+#, python-format
+msgid "Edit"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1338
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config__iface_electronic_scale
#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
#, python-format
@@ -1266,7 +1378,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1975
+#: code:addons/point_of_sale/static/src/js/screens.js:1989
#, python-format
msgid "Empty Order"
msgstr ""
@@ -1294,7 +1406,7 @@ msgid "Enables Payment Terminal integration."
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config__module_account_invoicing
+#: model:ir.model.fields,help:point_of_sale.field_pos_config__module_account
#: model:ir.model.fields,help:point_of_sale.field_pos_order__invoice_group
msgid "Enables invoice generation from the Point of Sale."
msgstr ""
@@ -1322,7 +1434,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1292
+#: code:addons/point_of_sale/static/src/js/screens.js:1303
#, python-format
msgid "Error: Could not Save Changes"
msgstr ""
@@ -1336,14 +1448,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1354
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1357
#, python-format
msgid "Export Paid Orders"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1356
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1359
#, python-format
msgid "Export Unpaid Orders"
msgstr ""
@@ -1354,12 +1466,6 @@ msgid "Extra Info"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
-#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
-msgid "Fanta"
-msgstr ""
-
-#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:1211
#, python-format
@@ -1424,12 +1530,6 @@ msgid "Global Discounts"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
-#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
-msgid "Gordon"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_order_filter
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_search
#: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
@@ -1450,14 +1550,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1369
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1372
#, python-format
msgid "Hardware Events"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1364
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1367
#, python-format
msgid "Hardware Status"
msgstr ""
@@ -1478,10 +1578,16 @@ msgid "Header & Footer"
msgstr ""
#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:207
+#, python-format
+msgid "Home"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category__id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config__id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard__id
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_discount__id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment__id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement__id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order__id
@@ -1513,20 +1619,13 @@ msgid "If this is checked, you will be able to choose the Lots/Serial Numbers. Y
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config__iface_tax_included
-#: model:ir.model.fields,field_description:point_of_sale.field_res_company__iface_tax_included
-#: model:ir.model.fields,field_description:point_of_sale.field_res_config_settings__iface_tax_included
-msgid "Iface Tax Included"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category__image
msgid "Image"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1358
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1361
#, python-format
msgid "Import Orders"
msgstr ""
@@ -1543,7 +1642,7 @@ msgid "In Progress"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:543
+#: code:addons/point_of_sale/models/pos_order.py:562
#, python-format
msgid "In order to delete a sale, it must be new or cancelled."
msgstr ""
@@ -1582,6 +1681,13 @@ msgid "Internal Notes"
msgstr ""
#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1273
+#, python-format
+msgid "Invalid product lot"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
msgid "Inventory"
msgstr ""
@@ -1612,7 +1718,7 @@ msgid "Invoiced"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config__module_account_invoicing
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config__module_account
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order__invoice_group
msgid "Invoicing"
msgstr ""
@@ -1632,7 +1738,8 @@ msgstr ""
msgid "It acts as a default account for debit amount"
msgstr ""
-#: code:addons/point_of_sale/models/account_tax.py:18
+#. module: point_of_sale
+#: code:addons/point_of_sale/models/account_tax.py:23
#, python-format
msgid "It is forbidden to modify a tax used in a POS order not posted. You must close the POS sessions before modifying the tax."
msgstr ""
@@ -1644,13 +1751,13 @@ msgid "Journal"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
-msgid "Journal Entries"
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_order__account_move
+msgid "Journal Entry"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_order__account_move
-msgid "Journal Entry"
+#: model:ir.model.fields,field_description:point_of_sale.field_digest_digest__kpi_pos_total_value
+msgid "Kpi Pos Total Value"
msgstr ""
#. module: point_of_sale
@@ -1662,7 +1769,6 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category____last_update
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config____last_update
#: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard____last_update
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_discount____last_update
#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment____last_update
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement____last_update
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order____last_update
@@ -1689,7 +1795,6 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category__write_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config__write_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard__write_uid
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_discount__write_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment__write_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement__write_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order__write_uid
@@ -1703,7 +1808,6 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category__write_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config__write_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard__write_date
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_discount__write_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment__write_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement__write_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order__write_date
@@ -1714,6 +1818,12 @@ msgid "Last Updated on"
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
+msgid "Led Lamp"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line__name
msgid "Line No"
msgstr ""
@@ -1757,6 +1867,15 @@ msgid "Login as a Manager"
msgstr ""
#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:8
+#: code:addons/point_of_sale/static/src/xml/pos.xml:736
+#: code:addons/point_of_sale/static/src/xml/pos.xml:901
+#, python-format
+msgid "Logo"
+msgstr ""
+
+#. module: point_of_sale
#: selection:barcode.rule,type:0
msgid "Lot"
msgstr ""
@@ -1768,7 +1887,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/models.js:2372
+#: code:addons/point_of_sale/static/src/js/models.js:2374
#, python-format
msgid "Lot/Serial Number(s) Required"
msgstr ""
@@ -1799,12 +1918,6 @@ msgid "Make several pricelists available in the Point of Sale. You can also appl
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
-#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
-msgid "Malibu Drink"
-msgstr ""
-
-#. module: point_of_sale
#: model:res.groups,name:point_of_sale.group_pos_manager
msgid "Manager"
msgstr ""
@@ -1833,6 +1946,12 @@ msgid "Miscellaneous"
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
+msgid "Monitor Stand"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_res_config_settings__pos_sales_price
msgid "Multiple Product Prices"
msgstr ""
@@ -1884,19 +2003,26 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1433
+#, python-format
+msgid "New order"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:709
#, python-format
msgid "Next Order"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:1090
+#: code:addons/point_of_sale/models/pos_order.py:1123
#, python-format
msgid "No Taxes"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:143
+#: code:addons/point_of_sale/models/pos_order.py:147
#, python-format
msgid "No cash statement found for this session. Unable to record returned cash."
msgstr ""
@@ -1925,7 +2051,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2106
+#: code:addons/point_of_sale/static/src/js/screens.js:2120
#: code:addons/point_of_sale/static/src/xml/pos.xml:361
#, python-format
msgid "None"
@@ -1996,7 +2122,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1349
+#: code:addons/point_of_sale/static/src/js/screens.js:1360
#, python-format
msgid "Only web-compatible Image formats such as .png or .jpeg are supported"
msgstr ""
@@ -2014,7 +2140,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:695
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1371
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1374
#, python-format
msgid "Open Cashbox"
msgstr ""
@@ -2096,8 +2222,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/models.js:1947
-#: code:addons/point_of_sale/static/src/js/models.js:1987
+#: code:addons/point_of_sale/static/src/js/models.js:1949
+#: code:addons/point_of_sale/static/src/js/models.js:1989
#, python-format
msgid "Order "
msgstr ""
@@ -2137,17 +2263,12 @@ msgid "Order Ref"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
-msgid "Order Reference"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_session__sequence_number
msgid "Order Sequence Number"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:573
+#: code:addons/point_of_sale/models/pos_order.py:592
#, python-format
msgid "Order is not paid."
msgstr ""
@@ -2159,10 +2280,11 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1349
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1352
#: model:ir.actions.act_window,name:point_of_sale.act_pos_session_orders
#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_filtered
#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_sale_graph
#: model:ir.model.fields,field_description:point_of_sale.field_pos_session__order_ids
#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
@@ -2184,7 +2306,7 @@ msgid "POS Journals"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:343
+#: code:addons/point_of_sale/models/pos_config.py:347
#, python-format
msgid "POS Order %s"
msgstr ""
@@ -2215,22 +2337,18 @@ msgid "POS Pricelists"
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_digest_digest__kpi_pos_total
#: model:ir.ui.view,arch_db:point_of_sale.view_partner_property_form
msgid "POS Sales"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:352
+#: code:addons/point_of_sale/models/pos_config.py:356
#, python-format
msgid "POS order line %s"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
-msgid "POS orders created during the current year"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_account_bank_statement_line__pos_statement_id
msgid "POS statement"
msgstr ""
@@ -2253,18 +2371,35 @@ msgid "Parent Category"
msgstr ""
#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:335
#: model:ir.ui.view,arch_db:point_of_sale.report_statement
+#, python-format
msgid "Partner"
msgstr ""
#. module: point_of_sale
#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:405
+#, python-format
+msgid "Partner logo"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
#: code:addons/point_of_sale/static/src/js/gui.js:274
#, python-format
msgid "Password ?"
msgstr ""
#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:151
+#, python-format
+msgid "Pay"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_payment
msgid "Pay Order"
msgstr ""
@@ -2273,7 +2408,7 @@ msgstr ""
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:150
#: code:addons/point_of_sale/static/src/xml/pos.xml:649
-#: code:addons/point_of_sale/wizard/pos_payment.py:65
+#: code:addons/point_of_sale/wizard/pos_payment.py:68
#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
#, python-format
@@ -2357,7 +2492,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1450
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1453
#, python-format
msgid "Phone:"
msgstr ""
@@ -2379,19 +2514,26 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2003
+#: code:addons/point_of_sale/static/src/xml/pos.xml:332
+#, python-format
+msgid "Picture"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/js/screens.js:2017
#, python-format
msgid "Please Confirm Large Amount"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:345
+#: code:addons/point_of_sale/models/pos_order.py:363
#, python-format
msgid "Please define income account for this product: \"%s\" (id:%d)."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:589
+#: code:addons/point_of_sale/models/pos_order.py:608
#, python-format
msgid "Please provide a partner for the sale."
msgstr ""
@@ -2405,12 +2547,17 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2044
+#: code:addons/point_of_sale/static/src/js/screens.js:2058
#, python-format
msgid "Please select the Customer"
msgstr ""
#. module: point_of_sale
+#: model:product.category,name:point_of_sale.product_category_pos
+msgid "PoS"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.product_pos_category_action
#: model:ir.ui.menu,name:point_of_sale.menu_products_pos_category
msgid "PoS Categories"
@@ -2419,7 +2566,6 @@ msgstr ""
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_category
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order__pos_categ_id
-#: model:ir.ui.view,arch_db:point_of_sale.product_template_form_view
msgid "PoS Category"
msgstr ""
@@ -2437,12 +2583,12 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_res_users__group_point_of_sale_user
#: model:ir.ui.menu,name:point_of_sale.menu_point_root
#: model:ir.ui.menu,name:point_of_sale.menu_pos_config_pos
+#: model:ir.ui.view,arch_db:point_of_sale.digest_digest_view_form
#: model:ir.ui.view,arch_db:point_of_sale.product_template_form_view
#: model:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
#: model:ir.ui.view,arch_db:point_of_sale.res_users_view_form
#: model:ir.ui.view,arch_db:point_of_sale.view_account_bank_journal_form_inherited_pos
#: model:ir.ui.view,arch_db:point_of_sale.view_account_journal_pos_user_form
-#: model:ir.ui.view,arch_db:point_of_sale.view_partner_property_form
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_search
msgid "Point of Sale"
msgstr ""
@@ -2606,6 +2752,13 @@ msgid "Price computed from formulas (discounts, margins, roundings)"
msgstr ""
#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:134
+#, python-format
+msgid "Price list"
+msgstr ""
+
+#. module: point_of_sale
#: code:addons/point_of_sale/models/barcode_rule.py:13
#: selection:barcode.rule,type:0
#, python-format
@@ -2614,7 +2767,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2194
+#: code:addons/point_of_sale/static/src/js/screens.js:2208
#: code:addons/point_of_sale/static/src/xml/pos.xml:388
#: code:addons/point_of_sale/static/src/xml/pos.xml:461
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order__pricelist_id
@@ -2638,14 +2791,17 @@ msgid "Pricing"
msgstr ""
#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:90
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_details_wizard
+#, python-format
msgid "Print"
msgstr ""
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:716
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1372
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1375
#, python-format
msgid "Print Receipt"
msgstr ""
@@ -2697,7 +2853,7 @@ msgid "Product Category"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
msgid "Product Prices"
msgstr ""
@@ -2734,7 +2890,14 @@ msgid "Product Variants"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1247
+#, python-format
+msgid "Product image"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
msgid "Product prices on receipts"
msgstr ""
@@ -2753,6 +2916,27 @@ msgid "Products"
msgstr ""
#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:73
+#, python-format
+msgid "Proxy Connected"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:82
+#, python-format
+msgid "Proxy Disconnected"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:79
+#, python-format
+msgid "Proxy Warning"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_box_in
msgid "Put Money In"
msgstr ""
@@ -2774,7 +2958,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1373
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1376
#, python-format
msgid "Read Weighing Scale"
msgstr ""
@@ -2818,12 +3002,19 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1367
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1370
#, python-format
msgid "Refresh Display"
msgstr ""
#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1100
+#, python-format
+msgid "Remove"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_point_rep
msgid "Reporting"
msgstr ""
@@ -2835,7 +3026,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1339
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1342
#, python-format
msgid "Reset"
msgstr ""
@@ -2861,7 +3052,7 @@ msgid "Resume"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:896
+#: code:addons/point_of_sale/models/pos_order.py:922
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
#, python-format
msgid "Return Products"
@@ -2918,8 +3109,11 @@ msgid "Salesperson"
msgstr ""
#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:342
#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
#: model:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
+#, python-format
msgid "Save"
msgstr ""
@@ -2937,14 +3131,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1345
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1348
#, python-format
msgid "Scan"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1346
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1349
#, python-format
msgid "Scan EAN-13"
msgstr ""
@@ -3007,20 +3201,20 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2182
+#: code:addons/point_of_sale/static/src/js/screens.js:2196
#, python-format
msgid "Select pricelist"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2117
+#: code:addons/point_of_sale/static/src/js/screens.js:2131
#, python-format
msgid "Select tax"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:250
+#: code:addons/point_of_sale/models/pos_order.py:260
#, python-format
msgid "Selected orders do not have the same session!"
msgstr ""
@@ -3031,6 +3225,13 @@ msgid "Sell in several currencies"
msgstr ""
#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1026
+#, python-format
+msgid "Send by email"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category__sequence
msgid "Sequence"
msgstr ""
@@ -3056,13 +3257,13 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2057
+#: code:addons/point_of_sale/static/src/js/screens.js:2071
#, python-format
msgid "Server Error"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:456
+#: code:addons/point_of_sale/models/pos_config.py:460
#: model:ir.model.fields,field_description:point_of_sale.field_account_bank_statement__pos_session_id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment__session_id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order__session_id
@@ -3101,7 +3302,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1203
+#: code:addons/point_of_sale/static/src/js/screens.js:1214
#, python-format
msgid "Set Customer"
msgstr ""
@@ -3113,7 +3314,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1338
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1341
#, python-format
msgid "Set Weight"
msgstr ""
@@ -3124,6 +3325,13 @@ msgid "Set barcodes to scan products, customer cards, etc."
msgstr ""
#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:128
+#, python-format
+msgid "Set fiscal position"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
msgid "Set multiple prices per product, automated discounts, etc."
msgstr ""
@@ -3148,6 +3356,13 @@ msgid "Settings"
msgstr ""
#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1311
+#, python-format
+msgid "Shopping cart"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,help:point_of_sale.field_pos_config__iface_customer_facing_display
msgid "Show checkout to customers with a remotely-connected screen."
msgstr ""
@@ -3165,6 +3380,13 @@ msgid "Skip Preview Screen"
msgstr ""
#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:212
+#, python-format
+msgid "Slash"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category__image_small
msgid "Small-sized image"
msgstr ""
@@ -3188,6 +3410,7 @@ msgstr ""
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_details_wizard__start_date
+#: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_search
msgid "Start Date"
msgstr ""
@@ -3263,7 +3486,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1489
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1492
#, python-format
msgid "Subtotal:"
msgstr ""
@@ -3299,6 +3522,34 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:55
+#, python-format
+msgid "Synchronisation Connected"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:58
+#, python-format
+msgid "Synchronisation Connecting"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:61
+#, python-format
+msgid "Synchronisation Disconnected"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:64
+#, python-format
+msgid "Synchronisation Error"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:831
#, python-format
msgid "TOTAL"
@@ -3311,8 +3562,9 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/models/pos_order.py:377
-#: code:addons/point_of_sale/static/src/js/screens.js:2136
+#: code:addons/point_of_sale/models/pos_order.py:395
+#: code:addons/point_of_sale/static/src/js/screens.js:2150
+#: model:ir.model,name:point_of_sale.model_account_tax
#, python-format
msgid "Tax"
msgstr ""
@@ -3323,6 +3575,11 @@ msgid "Tax Amount"
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config__iface_tax_included
+msgid "Tax Display"
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:384
#: code:addons/point_of_sale/static/src/xml/pos.xml:452
@@ -3341,12 +3598,12 @@ msgid "Tax Regime Selection value"
msgstr ""
#. module: point_of_sale
-#: selection:res.company,iface_tax_included:0
+#: selection:pos.config,iface_tax_included:0
msgid "Tax-Excluded Price"
msgstr ""
#. module: point_of_sale
-#: selection:res.company,iface_tax_included:0
+#: selection:pos.config,iface_tax_included:0
msgid "Tax-Included Price"
msgstr ""
@@ -3369,7 +3626,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:953
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1318
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1321
#, python-format
msgid "Taxes:"
msgstr ""
@@ -3389,7 +3646,7 @@ msgid "Tendered"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:333
+#: code:addons/point_of_sale/models/pos_order.py:351
#, python-format
msgid "The POS order must have lines when calling this method"
msgstr ""
@@ -3403,7 +3660,7 @@ msgid "The Point of Sale could not find any product, client, employee\n"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:242
+#: code:addons/point_of_sale/models/pos_config.py:241
#, python-format
msgid "The default pricelist must be included in the available pricelists."
msgstr ""
@@ -3414,13 +3671,13 @@ msgid "The hostname or ip address of the hardware proxy, Will be autodetected if
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:232
+#: code:addons/point_of_sale/models/pos_config.py:231
#, python-format
msgid "The invoice journal and the point of sale must belong to the same company."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:248
+#: code:addons/point_of_sale/models/pos_config.py:247
#, python-format
msgid "The invoice journal must be in the same currency as the Sales Journal or the company currency if that is not set."
msgstr ""
@@ -3432,7 +3689,7 @@ msgid "The journal type for your payment method should be bank or cash."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:237
+#: code:addons/point_of_sale/models/pos_config.py:236
#, python-format
msgid "The method payments and the point of sale must belong to the same company."
msgstr ""
@@ -3450,14 +3707,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2052
+#: code:addons/point_of_sale/static/src/js/screens.js:2066
#, python-format
msgid "The order could not be sent"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2063
+#: code:addons/point_of_sale/static/src/js/screens.js:2077
#, python-format
msgid "The order could not be sent to the server due to an unknown error"
msgstr ""
@@ -3490,7 +3747,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1364
+#: code:addons/point_of_sale/static/src/js/screens.js:1375
#, python-format
msgid "The provided file could not be read due to an unknown error"
msgstr ""
@@ -3506,14 +3763,20 @@ msgid "The receipt will automatically be printed at the end of each order."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:227
+#: code:addons/point_of_sale/models/pos_config.py:226
#, python-format
msgid "The sales journal and the point of sale must belong to the same company."
msgstr ""
#. module: point_of_sale
+#: code:addons/point_of_sale/models/pos_config.py:254
+#, python-format
+msgid "The selected pricelists must belong to no company or the company of the point of sale."
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2058
+#: code:addons/point_of_sale/static/src/js/screens.js:2072
#, python-format
msgid "The server encountered an error while receiving your order."
msgstr ""
@@ -3524,17 +3787,12 @@ msgid "The session has been opened for an unusually long period. Please consider
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:222
+#: code:addons/point_of_sale/models/pos_config.py:221
#, python-format
msgid "The stock location and the point of sale must belong to the same company."
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_open_statement
-msgid "The system will open all cash registers, so that you can start recording payments. We suggest you to control the opening balance of each register, using their CashBox tab."
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,help:point_of_sale.field_res_config_settings__module_pos_mercury
#: model:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
msgid "The transactions are processed by Vantiv. Set your Vantiv credentials on the related payment journal."
@@ -3559,7 +3817,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1994
+#: code:addons/point_of_sale/static/src/js/screens.js:2008
#, python-format
msgid "There is no cash payment method available in this point of sale to handle the change.\n"
"\n"
@@ -3573,20 +3831,20 @@ msgid "There is no cash register for this PoS Session"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:837
+#: code:addons/point_of_sale/models/pos_order.py:856
#, python-format
msgid "There is no receivable account defined to make payment for the partner: \"%s\" (id:%d)."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:835
+#: code:addons/point_of_sale/models/pos_order.py:854
#, python-format
msgid "There is no receivable account defined to make payment."
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1976
+#: code:addons/point_of_sale/static/src/js/screens.js:1990
#, python-format
msgid "There must be at least one product in your order before it can be validated"
msgstr ""
@@ -3622,7 +3880,7 @@ msgid "This field is there to pass the id of the pos user group to the point of
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:597
+#: code:addons/point_of_sale/models/pos_order.py:616
#, python-format
msgid "This invoice has been created from the point of sale session: <a href=# data-oe-model=pos.order data-oe-id=%d>%s</a>"
msgstr ""
@@ -3667,7 +3925,7 @@ msgid "This tax is applied to any new product created in the catalog."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:701
+#: code:addons/point_of_sale/models/pos_order.py:720
#, python-format
msgid "This transfer has been created from the point of sale session: <a href=# data-oe-model=pos.order data-oe-id=%d>%s</a>"
msgstr ""
@@ -3713,17 +3971,12 @@ msgid "To record new orders, start a new session."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:876
+#: code:addons/point_of_sale/models/pos_order.py:897
#, python-format
msgid "To return product(s), you need to open a session that will be used to register the refund."
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_search
-msgid "Today"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order__amount_total
#: model:ir.ui.view,arch_db:point_of_sale.report_saledetails
msgid "Total"
@@ -3774,15 +4027,15 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:967
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1317
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1511
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1320
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1514
#: model:ir.ui.view,arch_db:point_of_sale.report_saledetails
#, python-format
msgid "Total:"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:397
+#: code:addons/point_of_sale/models/pos_order.py:416
#, python-format
msgid "Trade Receivables"
msgstr ""
@@ -3799,6 +4052,13 @@ msgid "Unable to open the session. You have to assign a sales journal to your po
msgstr ""
#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:341
+#, python-format
+msgid "Undo"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line__price_unit
msgid "Unit Price"
msgstr ""
@@ -3809,6 +4069,14 @@ msgid "Unit Product"
msgstr ""
#. module: point_of_sale
+#: model:product.product,uom_name:point_of_sale.product_product_consumable
+#: model:product.product,uom_name:point_of_sale.product_product_tip
+#: model:product.template,uom_name:point_of_sale.product_product_consumable_product_template
+#: model:product.template,uom_name:point_of_sale.product_product_tip_product_template
+msgid "Unit(s)"
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:1036
#, python-format
@@ -3817,14 +4085,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2062
+#: code:addons/point_of_sale/static/src/js/screens.js:2076
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1348
+#: code:addons/point_of_sale/static/src/js/screens.js:1359
#, python-format
msgid "Unsupported File Format"
msgstr ""
@@ -3877,7 +4145,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1453
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1456
#, python-format
msgid "User:"
msgstr ""
@@ -3901,6 +4169,13 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1271
+#, python-format
+msgid "Valid product lot"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:650
#, python-format
msgid "Validate"
@@ -3917,19 +4192,8 @@ msgid "Virtual KeyBoard"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order__stock_location_id
-msgid "Warehouse"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
-#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
-msgid "Water"
-msgstr ""
-
-#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1366
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1369
#, python-format
msgid "Weighing"
msgstr ""
@@ -3947,16 +4211,17 @@ msgid "Whenever you close a session, one entry is generated in the following acc
msgstr ""
#. module: point_of_sale
-#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1290
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1473
-#, python-format
-msgid "With a"
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
+msgid "Whiteboard Pen"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
-msgid "Year"
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1293
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1476
+#, python-format
+msgid "With a"
msgstr ""
#. module: point_of_sale
@@ -3966,7 +4231,7 @@ msgid "You can define another list of available currencies on the\n"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:533
+#: code:addons/point_of_sale/models/pos_order.py:552
#, python-format
msgid "You cannot change the partner of a POS order for which an invoice has already been issued."
msgstr ""
@@ -4004,20 +4269,20 @@ msgid "You have to define which payment method must be available in the point of
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:851
+#: code:addons/point_of_sale/models/pos_order.py:870
#, python-format
msgid "You have to open at least one cashbox."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:985
+#: code:addons/point_of_sale/models/pos_order.py:1018
#, python-format
msgid "You have to select a pricelist in the sale form !\n"
"Please set one before choosing a product."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:999
+#: code:addons/point_of_sale/models/pos_order.py:1032
#, python-format
msgid "You have to select a pricelist in the sale form."
msgstr ""
@@ -4048,7 +4313,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2045
+#: code:addons/point_of_sale/static/src/js/screens.js:2059
#, python-format
msgid "You need to select the customer before you can invoice an order."
msgstr ""
@@ -4068,7 +4333,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1286
+#: code:addons/point_of_sale/static/src/js/screens.js:1297
#, python-format
msgid "Your Internet connection is probably down."
msgstr ""
@@ -4081,7 +4346,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1309
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1312
#, python-format
msgid "Your shopping cart is empty"
msgstr ""
@@ -4095,7 +4360,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1282
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1285
#, python-format
msgid "at"
msgstr ""
@@ -4114,7 +4379,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1578
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1581
#, python-format
msgid "caps lock"
msgstr ""
@@ -4131,23 +4396,23 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1605
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1647
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1608
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1650
#, python-format
msgid "close"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1563
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1640
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1566
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1643
#, python-format
msgid "delete"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1292
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1295
#, python-format
msgid "discount"
msgstr ""
@@ -4171,7 +4436,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2008
+#: code:addons/point_of_sale/static/src/js/screens.js:2022
#, python-format
msgid "for an order of"
msgstr ""
@@ -4185,7 +4450,7 @@ msgid "kg"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:331
+#: code:addons/point_of_sale/models/pos_config.py:335
#, python-format
msgid "not used"
msgstr ""
@@ -4230,24 +4495,24 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/models/pos_order.py:148
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1590
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1645
+#: code:addons/point_of_sale/models/pos_order.py:152
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1593
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1648
#, python-format
msgid "return"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1591
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1602
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1594
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1605
#, python-format
msgid "shift"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1564
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1567
#, python-format
msgid "tab"
msgstr ""
diff --git a/addons/portal/i18n/portal.pot b/addons/portal/i18n/portal.pot
index 39def6ec0e1..2d81aa15baa 100644
--- a/addons/portal/i18n/portal.pot
+++ b/addons/portal/i18n/portal.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:06+0000\n"
+"PO-Revision-Date: 2018-08-24 09:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,30 +16,10 @@ msgstr ""
"Plural-Forms: \n"
#. module: portal
-#: model:mail.template,body_html:portal.mail_template_data_portal_welcome
-msgid "\n"
-"<p>\n"
-" Dear ${object.user_id.name or ''},\n"
-"</p>\n"
-"<p>\n"
-" You have been given access to ${user.company_id.name}'s portal.\n"
-"</p>\n"
-"<p>\n"
-" Your login account data is:\n"
-"</p>\n"
-"<ul>\n"
-" <li>Username: ${object.user_id.login or ''}</li>\n"
-" <li>Portal: <a href=\"${'portal_url' in ctx and ctx['portal_url'] or ''}\">${'portal_url' in ctx and ctx['portal_url'] or ''}</a></li>\n"
-" <li>Database: ${'dbname' in ctx and ctx['dbname'] or ''}</li>\n"
-"</ul>\n"
-"<p>\n"
-" You can set or change your password via the following url:\n"
-"</p>\n"
-"<ul>\n"
-" <li><a href=\"${object.user_id.signup_url}\">${object.user_id.signup_url}</a></li>\n"
-"</ul>\n"
-"<p>\n"
-"${object.wizard_id.welcome_message or ''}"
+#. openerp-web
+#: code:addons/portal/static/src/js/portal_sidebar.js:46
+#, python-format
+msgid "%d days overdue"
msgstr ""
#. module: portal
@@ -48,16 +28,120 @@ msgid "<b>Sign in</b>"
msgstr ""
#. module: portal
-#: model:ir.ui.view,arch_db:portal.frontend_layout
-msgid "<span class=\"sr-only\">Toggle navigation</span>\n"
-" <span class=\"icon-bar\"/>\n"
-" <span class=\"icon-bar\"/>\n"
-" <span class=\"icon-bar\"/>"
+#: model:ir.ui.view,arch_db:portal.portal_searchbar
+msgid "<span id=\"search_label\" class=\"d-none d-md-inline mr4\">Search</span>"
msgstr ""
#. module: portal
-#: model:ir.ui.view,arch_db:portal.portal_searchbar
-msgid "<span id=\"search_label\" class=\"hidden-xs mr4\">Search</span><span class=\"caret\"/>"
+#: model:ir.ui.view,arch_db:portal.portal_share_template
+msgid "<strong>Open </strong>"
+msgstr ""
+
+#. module: portal
+#: model:mail.template,body_html:portal.mail_template_data_portal_welcome
+msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Account</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">\n"
+" ${object.user_id.name}\n"
+" </span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${object.user_id.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${object.user_id.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div>\n"
+" Dear ${object.user_id.name or ''},<br/> <br/>\n"
+" You have been given access to ${object.user_id.company_id.name}'s portal.<br/>\n"
+" Your login account data is:\n"
+" <ul>\n"
+" <li>Username: ${object.user_id.login or ''}</li>\n"
+" <li>Portal: <a href=\"${'portal_url' in ctx and ctx['portal_url'] or ''}\">${'portal_url' in ctx and ctx['portal_url'] or ''}</a></li>\n"
+" <li>Database: ${'dbname' in ctx and ctx['dbname'] or ''}</li>\n"
+" </ul>\n"
+" You can set or change your password via the following url:\n"
+" <ul>\n"
+" <li><a href=\"${object.user_id.signup_url}\">${object.user_id.signup_url}</a></li>\n"
+" </ul>\n"
+" ${object.wizard_id.welcome_message or ''}\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${object.user_id.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" ${object.user_id.company_id.phone}\n"
+" % if object.user_id.company_id.email\n"
+" | <a href=\"'mailto:%s' % ${object.user_id.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${object.user_id.company_id.email}</a>\n"
+" % endif\n"
+" % if object.user_id.company_id.website\n"
+" | <a href=\"'%s' % ${object.user_id.company_id.website}\" style=\"text-decoration:none; color: #454748;\">\n"
+" ${object.user_id.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=portalinvite\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_mixin__access_warning
+#: model:ir.model.fields,field_description:portal.field_portal_share__access_warning
+msgid "Access warning"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_share_wizard
+msgid "Add a note"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_share_wizard
+msgid "Add contacts to share the document..."
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,help:portal.field_portal_share__note
+msgid "Add extra content to display in the email"
msgstr ""
#. module: portal
@@ -71,6 +155,14 @@ msgid "Archives"
msgstr ""
#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/xml/portal_chatter.xml:26
+#, python-format
+msgid "Avatar"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_share_wizard
#: model:ir.ui.view,arch_db:portal.wizard_view
msgid "Cancel"
msgstr ""
@@ -81,7 +173,7 @@ msgid "Change"
msgstr ""
#. module: portal
-#: code:addons/portal/controllers/portal.py:219
+#: code:addons/portal/controllers/portal.py:218
#, python-format
msgid "Changing VAT number is not allowed once document(s) have been issued for your account. Please contact us directly for this operation."
msgstr ""
@@ -138,24 +230,32 @@ msgid "Country..."
msgstr ""
#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_share__create_uid
#: model:ir.model.fields,field_description:portal.field_portal_wizard__create_uid
#: model:ir.model.fields,field_description:portal.field_portal_wizard_user__create_uid
msgid "Created by"
msgstr ""
#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_share__create_date
#: model:ir.model.fields,field_description:portal.field_portal_wizard__create_date
#: model:ir.model.fields,field_description:portal.field_portal_wizard_user__create_date
msgid "Created on"
msgstr ""
#. module: portal
-#: model:ir.model.fields,help:portal.field_portal_mixin__portal_url
+#: model:ir.model.fields,help:portal.field_portal_mixin__access_url
msgid "Customer Portal URL"
msgstr ""
#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_share_template
+msgid "Dear"
+msgstr ""
+
+#. module: portal
#: model:ir.model.fields,field_description:portal.field_portal_mixin__display_name
+#: model:ir.model.fields,field_description:portal.field_portal_share__display_name
#: model:ir.model.fields,field_description:portal.field_portal_wizard__display_name
#: model:ir.model.fields,field_description:portal.field_portal_wizard_user__display_name
msgid "Display Name"
@@ -169,6 +269,20 @@ msgid "Draw your signature"
msgstr ""
#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/js/portal_sidebar.js:44
+#, python-format
+msgid "Due in %d days"
+msgstr ""
+
+#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/js/portal_sidebar.js:42
+#, python-format
+msgid "Due today"
+msgstr ""
+
+#. module: portal
#: model:ir.model.fields,field_description:portal.field_portal_wizard_user__email
#: model:ir.ui.view,arch_db:portal.portal_my_details
msgid "Email"
@@ -180,12 +294,25 @@ msgid "Email Thread"
msgstr ""
#. module: portal
+#: model:ir.actions.act_window,name:portal.partner_wizard_action
+#: model:ir.model,name:portal.model_portal_wizard
+#: model:ir.ui.view,arch_db:portal.wizard_view
+msgid "Grant Portal Access"
+msgstr ""
+
+#. module: portal
#: model:ir.model,name:portal.model_ir_http
msgid "HTTP routing"
msgstr ""
#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_layout
+msgid "Home"
+msgstr ""
+
+#. module: portal
#: model:ir.model.fields,field_description:portal.field_portal_mixin__id
+#: model:ir.model.fields,field_description:portal.field_portal_share__id
#: model:ir.model.fields,field_description:portal.field_portal_wizard__id
#: model:ir.model.fields,field_description:portal.field_portal_wizard_user__id
msgid "ID"
@@ -197,7 +324,7 @@ msgid "In Portal"
msgstr ""
#. module: portal
-#: code:addons/portal/controllers/portal.py:200
+#: code:addons/portal/controllers/portal.py:199
#, python-format
msgid "Invalid Email! Please enter a valid email address."
msgstr ""
@@ -209,18 +336,21 @@ msgstr ""
#. module: portal
#: model:ir.model.fields,field_description:portal.field_portal_mixin____last_update
+#: model:ir.model.fields,field_description:portal.field_portal_share____last_update
#: model:ir.model.fields,field_description:portal.field_portal_wizard____last_update
#: model:ir.model.fields,field_description:portal.field_portal_wizard_user____last_update
msgid "Last Modified on"
msgstr ""
#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_share__write_uid
#: model:ir.model.fields,field_description:portal.field_portal_wizard__write_uid
#: model:ir.model.fields,field_description:portal.field_portal_wizard_user__write_uid
msgid "Last Updated by"
msgstr ""
#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_share__write_date
#: model:ir.model.fields,field_description:portal.field_portal_wizard__write_date
#: model:ir.model.fields,field_description:portal.field_portal_wizard_user__write_date
msgid "Last Updated on"
@@ -228,12 +358,17 @@ msgstr ""
#. module: portal
#. openerp-web
-#: code:addons/portal/static/src/xml/portal_chatter.xml:20
+#: code:addons/portal/static/src/xml/portal_chatter.xml:21
#, python-format
msgid "Leave a comment"
msgstr ""
#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_share__share_link
+msgid "Link"
+msgstr ""
+
+#. module: portal
#: model:ir.model.fields,field_description:portal.field_portal_wizard_user__user_id
msgid "Login User"
msgstr ""
@@ -254,7 +389,10 @@ msgid "My Account"
msgstr ""
#. module: portal
+#. openerp-web
+#: code:addons/portal/static/src/xml/portal_chatter.xml:92
#: model:ir.ui.view,arch_db:portal.pager
+#, python-format
msgid "Next"
msgstr ""
@@ -264,8 +402,18 @@ msgid "No title"
msgstr ""
#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_share__note
+msgid "Note"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.frontend_layout
+msgid "Odoo"
+msgstr ""
+
+#. module: portal
#. openerp-web
-#: code:addons/portal/static/src/xml/portal_chatter.xml:38
+#: code:addons/portal/static/src/xml/portal_chatter.xml:39
#, python-format
msgid "Oops! Something went wrong. Try to reload the page and log in."
msgstr ""
@@ -276,14 +424,7 @@ msgid "Phone"
msgstr ""
#. module: portal
-#: model:ir.actions.act_window,name:portal.partner_wizard_action
-#: model:ir.model,name:portal.model_portal_wizard
-#: model:ir.ui.view,arch_db:portal.wizard_view
-msgid "Portal Access Management"
-msgstr ""
-
-#. module: portal
-#: model:ir.model.fields,field_description:portal.field_portal_mixin__portal_url
+#: model:ir.model.fields,field_description:portal.field_portal_mixin__access_url
msgid "Portal Access URL"
msgstr ""
@@ -293,18 +434,50 @@ msgid "Portal User Config"
msgstr ""
#. module: portal
+#: model:ir.ui.view,arch_db:portal.frontend_layout
+msgid "Powered by"
+msgstr ""
+
+#. module: portal
#: model:ir.ui.view,arch_db:portal.pager
msgid "Prev"
msgstr ""
#. module: portal
#. openerp-web
+#: code:addons/portal/static/src/xml/portal_chatter.xml:84
+#, python-format
+msgid "Previous"
+msgstr ""
+
+#. module: portal
+#. openerp-web
#: code:addons/portal/static/src/js/portal_chatter.js:109
#, python-format
msgid "Published on %s"
msgstr ""
#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_share__partner_ids
+msgid "Recipients"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_share__res_id
+msgid "Related Document ID"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_share__res_model
+msgid "Related Document Model"
+msgstr ""
+
+#. module: portal
+#: model:ir.model.fields,field_description:portal.field_portal_mixin__access_token
+msgid "Security Token"
+msgstr ""
+
+#. module: portal
#: model:ir.ui.view,arch_db:portal.wizard_view
msgid "Select which contacts should belong to the portal in the list below.\n"
" The email address of each selected contact must be valid and unique.\n"
@@ -313,7 +486,8 @@ msgstr ""
#. module: portal
#. openerp-web
-#: code:addons/portal/static/src/xml/portal_chatter.xml:41
+#: code:addons/portal/static/src/xml/portal_chatter.xml:42
+#: model:ir.ui.view,arch_db:portal.portal_share_wizard
#, python-format
msgid "Send"
msgstr ""
@@ -325,6 +499,12 @@ msgid "Several contacts have the same email: "
msgstr ""
#. module: portal
+#: model:ir.actions.act_window,name:portal.portal_share_action
+#: model:ir.ui.view,arch_db:portal.portal_share_wizard
+msgid "Share Document"
+msgstr ""
+
+#. module: portal
#: code:addons/portal/wizard/portal_wizard.py:97
#, python-format
msgid "Some contacts don't have a valid email: "
@@ -337,7 +517,7 @@ msgid "Some contacts have the same email as an existing portal user:"
msgstr ""
#. module: portal
-#: code:addons/portal/controllers/portal.py:223
+#: code:addons/portal/controllers/portal.py:222
#, python-format
msgid "Some required fields are empty."
msgstr ""
@@ -361,7 +541,7 @@ msgstr ""
#. module: portal
#. openerp-web
-#: code:addons/portal/static/src/xml/portal_chatter.xml:11
+#: code:addons/portal/static/src/xml/portal_chatter.xml:12
#, python-format
msgid "There are no comments for now."
msgstr ""
@@ -406,6 +586,7 @@ msgstr ""
#: model:ir.model.fields,field_description:portal.field_hr_department__website_message_ids
#: model:ir.model.fields,field_description:portal.field_hr_employee__website_message_ids
#: model:ir.model.fields,field_description:portal.field_hr_job__website_message_ids
+#: model:ir.model.fields,field_description:portal.field_mail_blacklist__website_message_ids
#: model:ir.model.fields,field_description:portal.field_mail_channel__website_message_ids
#: model:ir.model.fields,field_description:portal.field_mail_mass_mailing_contact__website_message_ids
#: model:ir.model.fields,field_description:portal.field_mail_thread__website_message_ids
@@ -430,6 +611,7 @@ msgstr ""
#: model:ir.model.fields,help:portal.field_hr_department__website_message_ids
#: model:ir.model.fields,help:portal.field_hr_employee__website_message_ids
#: model:ir.model.fields,help:portal.field_hr_job__website_message_ids
+#: model:ir.model.fields,help:portal.field_mail_blacklist__website_message_ids
#: model:ir.model.fields,help:portal.field_mail_channel__website_message_ids
#: model:ir.model.fields,help:portal.field_mail_mass_mailing_contact__website_message_ids
#: model:ir.model.fields,help:portal.field_mail_thread__website_message_ids
@@ -449,14 +631,26 @@ msgstr ""
#. module: portal
#. openerp-web
-#: code:addons/portal/static/src/xml/portal_chatter.xml:32
+#: code:addons/portal/static/src/xml/portal_chatter.xml:31
#, python-format
msgid "Write a message..."
msgstr ""
#. module: portal
+#: code:addons/portal/wizard/portal_share.py:58
+#: code:addons/portal/wizard/portal_share.py:70
+#, python-format
+msgid "You are invited to access %s"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_share_template
+msgid "You have been invited to access the following document:"
+msgstr ""
+
+#. module: portal
#. openerp-web
-#: code:addons/portal/static/src/xml/portal_chatter.xml:21
+#: code:addons/portal/static/src/xml/portal_chatter.xml:22
#, python-format
msgid "You must be"
msgstr ""
@@ -493,7 +687,7 @@ msgstr ""
#. module: portal
#: model:mail.template,subject:portal.mail_template_data_portal_welcome
-msgid "Your Odoo account at ${user.company_id.name}"
+msgid "Your Odoo account at ${object.user_id.company_id.name}"
msgstr ""
#. module: portal
@@ -510,21 +704,21 @@ msgstr ""
#. module: portal
#. openerp-web
-#: code:addons/portal/static/src/xml/portal_chatter.xml:8
+#: code:addons/portal/static/src/xml/portal_chatter.xml:9
#, python-format
msgid "comment"
msgstr ""
#. module: portal
#. openerp-web
-#: code:addons/portal/static/src/xml/portal_chatter.xml:9
+#: code:addons/portal/static/src/xml/portal_chatter.xml:10
#, python-format
msgid "comments"
msgstr ""
#. module: portal
#. openerp-web
-#: code:addons/portal/static/src/xml/portal_chatter.xml:21
+#: code:addons/portal/static/src/xml/portal_chatter.xml:22
#, python-format
msgid "logged in"
msgstr ""
@@ -535,13 +729,18 @@ msgid "portal.mixin"
msgstr ""
#. module: portal
+#: model:ir.model,name:portal.model_portal_share
+msgid "portal.share"
+msgstr ""
+
+#. module: portal
#: model:ir.ui.view,arch_db:portal.portal_my_details
msgid "select..."
msgstr ""
#. module: portal
#. openerp-web
-#: code:addons/portal/static/src/xml/portal_chatter.xml:21
+#: code:addons/portal/static/src/xml/portal_chatter.xml:22
#, python-format
msgid "to post a comment."
msgstr ""
diff --git a/addons/pos_restaurant/i18n/pos_restaurant.pot b/addons/pos_restaurant/i18n/pos_restaurant.pot
index a0748df806b..4b534d62f20 100644
--- a/addons/pos_restaurant/i18n/pos_restaurant.pot
+++ b/addons/pos_restaurant/i18n/pos_restaurant.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:11+0000\n"
-"PO-Revision-Date: 2018-08-02 09:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:03+0000\n"
+"PO-Revision-Date: 2018-08-24 09:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -48,6 +48,13 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:113
+#, python-format
+msgid "Add"
+msgstr ""
+
+#. module: pos_restaurant
+#. openerp-web
#: code:addons/pos_restaurant/static/src/js/notes.js:54
#, python-format
msgid "Add Note"
@@ -64,6 +71,13 @@ msgid "Add a new restaurant order printer"
msgstr ""
#. module: pos_restaurant
+#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:107
+#, python-format
+msgid "Add button"
+msgstr ""
+
+#. module: pos_restaurant
#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
msgid "Add notes to orderlines"
msgstr ""
@@ -119,6 +133,13 @@ msgid "Back"
msgstr ""
#. module: pos_restaurant
+#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:82
+#, python-format
+msgid "Back to floor"
+msgstr ""
+
+#. module: pos_restaurant
#: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_floor__background_color
msgid "Background Color"
msgstr ""
@@ -153,6 +174,14 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:136
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:150
+#, python-format
+msgid "Blue"
+msgstr ""
+
+#. module: pos_restaurant
+#. openerp-web
#: code:addons/pos_restaurant/static/src/xml/multiprint.xml:39
#, python-format
msgid "CANCELLED"
@@ -168,6 +197,14 @@ msgid "Changes could not be saved"
msgstr ""
#. module: pos_restaurant
+#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:131
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:145
+#, python-format
+msgid "Close"
+msgstr ""
+
+#. module: pos_restaurant
#: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_table__color
msgid "Color"
msgstr ""
@@ -188,6 +225,13 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:160
+#, python-format
+msgid "Delete"
+msgstr ""
+
+#. module: pos_restaurant
+#. openerp-web
#: code:addons/pos_restaurant/static/src/xml/printbill.xml:91
#, python-format
msgid "Discount:"
@@ -208,6 +252,13 @@ msgid "Display Name"
msgstr ""
#. module: pos_restaurant
+#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:116
+#, python-format
+msgid "Duplicate"
+msgstr ""
+
+#. module: pos_restaurant
#: model:ir.actions.act_window,help:pos_restaurant.action_restaurant_printer_form
msgid "Each Order Printer has an IP Address that defines the PosBox/Hardware\n"
" Proxy where the printer can be found, and a list of product categories.\n"
@@ -216,6 +267,13 @@ msgid "Each Order Printer has an IP Address that defines the PosBox/Hardware\n"
msgstr ""
#. module: pos_restaurant
+#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:110
+#, python-format
+msgid "Edit"
+msgstr ""
+
+#. module: pos_restaurant
#: model:ir.model.fields,help:pos_restaurant.field_pos_config__iface_splitbill
msgid "Enables Bill Splitting in the Point of Sale."
msgstr ""
@@ -243,6 +301,22 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:135
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:149
+#, python-format
+msgid "Green"
+msgstr ""
+
+#. module: pos_restaurant
+#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:140
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:154
+#, python-format
+msgid "Grey"
+msgstr ""
+
+#. module: pos_restaurant
+#. openerp-web
#: code:addons/pos_restaurant/static/src/xml/floors.xml:28
#: model:ir.model.fields,field_description:pos_restaurant.field_pos_order__customer_count
#, python-format
@@ -313,6 +387,21 @@ msgid "Last Updated on"
msgstr ""
#. module: pos_restaurant
+#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:141
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:155
+#, python-format
+msgid "Light grey"
+msgstr ""
+
+#. module: pos_restaurant
+#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/printbill.xml:39
+#, python-format
+msgid "Logo"
+msgstr ""
+
+#. module: pos_restaurant
#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
msgid "Manage table orders"
msgstr ""
@@ -334,6 +423,7 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/notes.xml:8
#: code:addons/pos_restaurant/static/src/xml/notes.xml:16
#, python-format
msgid "Note"
@@ -355,6 +445,14 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:137
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:151
+#, python-format
+msgid "Orange"
+msgstr ""
+
+#. module: pos_restaurant
+#. openerp-web
#: code:addons/pos_restaurant/static/src/xml/multiprint.xml:6
#, python-format
msgid "Order"
@@ -439,12 +537,35 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:139
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:153
+#, python-format
+msgid "Purple"
+msgstr ""
+
+#. module: pos_restaurant
+#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:134
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:148
+#, python-format
+msgid "Red"
+msgstr ""
+
+#. module: pos_restaurant
+#. openerp-web
#: code:addons/pos_restaurant/static/src/js/floors.js:563
#, python-format
msgid "Removing a table cannot be undone"
msgstr ""
#. module: pos_restaurant
+#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:119
+#, python-format
+msgid "Rename"
+msgstr ""
+
+#. module: pos_restaurant
#: model:ir.ui.view,arch_db:pos_restaurant.view_restaurant_floor_form
msgid "Restaurant Floor"
msgstr ""
@@ -471,7 +592,17 @@ msgid "Round"
msgstr ""
#. module: pos_restaurant
+#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:126
+#, python-format
+msgid "Round Shape"
+msgstr ""
+
+#. module: pos_restaurant
+#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:122
#: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_table__seats
+#, python-format
msgid "Seats"
msgstr ""
@@ -511,6 +642,13 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:125
+#, python-format
+msgid "Square Shape"
+msgstr ""
+
+#. module: pos_restaurant
+#. openerp-web
#: code:addons/pos_restaurant/static/src/xml/printbill.xml:118
#, python-format
msgid "Subtotal"
@@ -631,6 +769,13 @@ msgid "This product is used as reference on customer receipts."
msgstr ""
#. module: pos_restaurant
+#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:129
+#, python-format
+msgid "Tint"
+msgstr ""
+
+#. module: pos_restaurant
#: model:ir.ui.view,arch_db:pos_restaurant.pos_config_view_form_inherit_restaurant
msgid "Tip Product"
msgstr ""
@@ -648,6 +793,14 @@ msgid "Transfer"
msgstr ""
#. module: pos_restaurant
+#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:142
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:156
+#, python-format
+msgid "Turquoise"
+msgstr ""
+
+#. module: pos_restaurant
#: model:ir.model.fields,help:pos_restaurant.field_restaurant_floor__sequence
msgid "Used to sort Floors"
msgstr ""
@@ -671,6 +824,14 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:138
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:152
+#, python-format
+msgid "Yellow"
+msgstr ""
+
+#. module: pos_restaurant
+#. openerp-web
#: code:addons/pos_restaurant/static/src/js/floors.js:271
#: code:addons/pos_restaurant/static/src/js/floors.js:310
#: code:addons/pos_restaurant/static/src/js/floors.js:426
diff --git a/addons/pos_sale/i18n/pos_sale.pot b/addons/pos_sale/i18n/pos_sale.pot
index 2253f137ed3..4788c232d00 100644
--- a/addons/pos_sale/i18n/pos_sale.pot
+++ b/addons/pos_sale/i18n/pos_sale.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:11+0000\n"
-"PO-Revision-Date: 2018-08-02 09:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:03+0000\n"
+"PO-Revision-Date: 2018-08-24 09:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: pos_sale
-#: model:ir.model,name:pos_sale.model_report_all_channels_sales
-msgid "All sales orders grouped by sales channels"
+#: selection:sale.report,state:0
+msgid "Cancelled"
msgstr ""
#. module: pos_sale
-#: model:ir.model.fields,field_description:pos_sale.field_crm_team__team_type
-msgid "Channel Type"
+#: model:ir.model.fields,field_description:pos_sale.field_pos_order__currency_rate
+msgid "Currency Rate"
msgstr ""
#. module: pos_sale
@@ -37,6 +37,11 @@ msgid "Day"
msgstr ""
#. module: pos_sale
+#: selection:sale.report,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: pos_sale
#: model:ir.ui.view,arch_db:pos_sale.crm_team_view_form_inherit_pos_sale
msgid "Group by"
msgstr ""
@@ -47,11 +52,21 @@ msgid "How this channel's dashboard graph will group the results."
msgstr ""
#. module: pos_sale
+#: selection:sale.report,state:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: pos_sale
#: selection:crm.team,dashboard_graph_group_pos:0
msgid "Month"
msgstr ""
#. module: pos_sale
+#: selection:sale.report,state:0
+msgid "New"
+msgstr ""
+
+#. module: pos_sale
#: model:ir.model.fields,field_description:pos_sale.field_crm_team__pos_sessions_open_count
msgid "Open POS Sessions"
msgstr ""
@@ -67,6 +82,11 @@ msgid "POS Grouping"
msgstr ""
#. module: pos_sale
+#: selection:sale.report,state:0
+msgid "Paid"
+msgstr ""
+
+#. module: pos_sale
#: selection:crm.team,dashboard_graph_group_pos:0
#: model:crm.team,name:pos_sale.pos_sales_team
#: selection:crm.team,team_type:0
@@ -74,21 +94,51 @@ msgid "Point of Sale"
msgstr ""
#. module: pos_sale
+#: model:ir.model,name:pos_sale.model_pos_order
+msgid "Point of Sale Orders"
+msgstr ""
+
+#. module: pos_sale
#: model:ir.model.fields,field_description:pos_sale.field_crm_team__pos_config_ids
msgid "Point of Sales"
msgstr ""
#. module: pos_sale
+#: selection:sale.report,state:0
+msgid "Posted"
+msgstr ""
+
+#. module: pos_sale
+#: selection:sale.report,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: pos_sale
#: selection:crm.team,team_type:0
#: model:ir.ui.view,arch_db:pos_sale.crm_team_salesteams_view_kanban_inherit_pos_sale
msgid "Sales"
msgstr ""
#. module: pos_sale
+#: selection:sale.report,state:0
+msgid "Sales Done"
+msgstr ""
+
+#. module: pos_sale
+#: selection:sale.report,state:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: pos_sale
+#: model:ir.model,name:pos_sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: pos_sale
#: model:ir.model,name:pos_sale.model_crm_team
#: model:ir.model.fields,field_description:pos_sale.field_pos_config__crm_team_id
#: model:ir.model.fields,field_description:pos_sale.field_pos_session__crm_team_id
-msgid "Sales Channel"
+msgid "Sales Team"
msgstr ""
#. module: pos_sale
@@ -118,6 +168,21 @@ msgid "Sessions Running"
msgstr ""
#. module: pos_sale
+#: model:ir.model.fields,field_description:pos_sale.field_sale_report__state
+msgid "Status"
+msgstr ""
+
+#. module: pos_sale
+#: model:ir.model.fields,field_description:pos_sale.field_crm_team__team_type
+msgid "Team Type"
+msgstr ""
+
+#. module: pos_sale
+#: model:ir.model.fields,help:pos_sale.field_pos_order__currency_rate
+msgid "The rate of the currency to the currency of rate applicable at the date of the order"
+msgstr ""
+
+#. module: pos_sale
#: model:ir.model.fields,help:pos_sale.field_crm_team__team_type
msgid "The type of this channel, it will define the resources this channel uses."
msgstr ""
@@ -125,7 +190,7 @@ msgstr ""
#. module: pos_sale
#: model:ir.model.fields,help:pos_sale.field_pos_config__crm_team_id
#: model:ir.model.fields,help:pos_sale.field_pos_session__crm_team_id
-msgid "This Point of sale's sales will be related to this Sales Channel."
+msgid "This Point of sale's sales will be related to this Sales Team."
msgstr ""
#. module: pos_sale
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index 23538a33911..155c618f0ad 100644
--- a/addons/product/i18n/product.pot
+++ b/addons/product/i18n/product.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,6 @@ msgstr ""
"Plural-Forms: \n"
#. module: product
-#. openerp-web
-#: code:addons/product/static/src/js/product_template_import.js:13
-#, python-format
-msgid " Import Template for Products"
-msgstr ""
-
-#. module: product
#: selection:product.pricelist.item,applied_on:0
msgid " Product Category"
msgstr ""
@@ -39,19 +32,19 @@ msgid "# Products"
msgstr ""
#. module: product
-#: code:addons/product/models/product_pricelist.py:446
+#: code:addons/product/models/product_pricelist.py:453
#, python-format
msgid "%s %% discount"
msgstr ""
#. module: product
-#: code:addons/product/models/product_pricelist.py:448
+#: code:addons/product/models/product_pricelist.py:455
#, python-format
msgid "%s %% discount and %s surcharge"
msgstr ""
#. module: product
-#: code:addons/product/models/product_template.py:355
+#: code:addons/product/models/product_template.py:359
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -64,6 +57,11 @@ msgid "<span attrs=\"{'invisible':[('base', '!=', 'list_price')]}\">Public Price
msgstr ""
#. module: product
+#: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
+msgid "<span class=\"o_form_label\">New Price =</span>"
+msgstr ""
+
+#. module: product
#: model:ir.ui.view,arch_db:product.product_category_form_view
msgid "<span class=\"o_stat_text\"> Products</span>"
msgstr ""
@@ -95,6 +93,11 @@ msgid "<strong>Price List Name</strong>:<br/>"
msgstr ""
#. module: product
+#: model:ir.ui.view,arch_db:product.report_simple_label
+msgid "<strong>Price:</strong>"
+msgstr ""
+
+#. module: product
#: model:ir.ui.view,arch_db:product.report_pricelist
msgid "<strong>Print date</strong>:<br/>"
msgstr ""
@@ -138,7 +141,7 @@ msgstr ""
#. module: product
#: model:ir.model.fields,help:product.field_product_product__type
#: model:ir.model.fields,help:product.field_product_template__type
-msgid "A stockable product is a product for which you manage stock. The \"Inventory\" app has to be installed.\n"
+msgid "A storable product is a product for which you manage stock. The \"Inventory\" app has to be installed.\n"
"A consumable product, on the other hand, is a product for which stock is not managed.\n"
"A service is a non-material product you provide.\n"
"A digital content is a non-material product you sell online. The files attached to the products are the one that are sold on the e-commerce such as e-books, music, pictures,... The \"Digital Product\" module has to be installed."
@@ -176,7 +179,7 @@ msgid "All"
msgstr ""
#. module: product
-#: code:addons/product/models/product_pricelist.py:441
+#: code:addons/product/models/product_pricelist.py:448
#, python-format
msgid "All Products"
msgstr ""
@@ -262,6 +265,8 @@ msgstr ""
#: model:ir.model.fields,field_description:product.field_product_packaging__barcode
#: model:ir.model.fields,field_description:product.field_product_product__barcode
#: model:ir.model.fields,field_description:product.field_product_template__barcode
+#: model:ir.ui.view,arch_db:product.report_simple_barcode
+#: model:ir.ui.view,arch_db:product.report_simple_label
msgid "Barcode"
msgstr ""
@@ -331,7 +336,7 @@ msgid "Category name"
msgstr ""
#. module: product
-#: code:addons/product/models/product_pricelist.py:435
+#: code:addons/product/models/product_pricelist.py:442
#, python-format
msgid "Category: %s"
msgstr ""
@@ -544,11 +549,6 @@ msgid "Description for Customers"
msgstr ""
#. module: product
-#: model:ir.ui.view,arch_db:product.product_template_form_view
-msgid "Description for Internal"
-msgstr ""
-
-#. module: product
#: model:ir.model.fields,help:product.field_product_attribute__sequence
#: model:ir.model.fields,help:product.field_product_attribute_value__sequence
msgid "Determine the display order"
@@ -755,6 +755,24 @@ msgid "Image of the product variant (Small-sized image of product template if fa
msgstr ""
#. module: product
+#: code:addons/product/models/product_pricelist.py:339
+#, python-format
+msgid "Import Template for Pricelists"
+msgstr ""
+
+#. module: product
+#: code:addons/product/models/product_template.py:498
+#, python-format
+msgid "Import Template for Products"
+msgstr ""
+
+#. module: product
+#: code:addons/product/models/product.py:648
+#, python-format
+msgid "Import Template for Vendor Pricelists"
+msgstr ""
+
+#. module: product
#: model:ir.ui.view,arch_db:product.res_config_settings_view_form
msgid "In which unit of measure do you manage your weights"
msgstr ""
@@ -765,6 +783,11 @@ msgid "Information about a product vendor"
msgstr ""
#. module: product
+#: model:ir.ui.view,arch_db:product.product_template_form_view
+msgid "Internal Notes"
+msgstr ""
+
+#. module: product
#: model:ir.model.fields,field_description:product.field_product_product__default_code
#: model:ir.model.fields,field_description:product.field_product_template__default_code
msgid "Internal Reference"
@@ -866,6 +889,11 @@ msgid "Lines"
msgstr ""
#. module: product
+#: model:ir.ui.view,arch_db:product.product_template_form_view
+msgid "Logistics"
+msgstr ""
+
+#. module: product
#: model:ir.model.fields,field_description:product.field_res_users__has_group_pricelist_item
#: model:res.groups,name:product.group_pricelist_item
msgid "Manage Pricelist Items"
@@ -946,11 +974,6 @@ msgid "Name"
msgstr ""
#. module: product
-#: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
-msgid "New Price ="
-msgstr ""
-
-#. module: product
#: model:ir.model.fields,field_description:product.field_product_product__activity_date_deadline
#: model:ir.model.fields,field_description:product.field_product_template__activity_date_deadline
msgid "Next Activity Deadline"
@@ -1128,6 +1151,8 @@ msgstr ""
#: model:ir.model.fields,field_description:product.field_product_pricelist_item__pricelist_id
#: model:ir.model.fields,field_description:product.field_product_product__pricelist_id
#: model:ir.model.fields,field_description:product.field_product_template__pricelist_id
+#: model:ir.model.fields,field_description:product.field_res_partner__property_product_pricelist
+#: model:ir.model.fields,field_description:product.field_res_users__property_product_pricelist
#: model:ir.ui.view,arch_db:product.product_template_form_view
msgid "Pricelist"
msgstr ""
@@ -1199,12 +1224,14 @@ msgstr ""
#: model:ir.model.fields,field_description:product.field_product_pricelist_item__product_id
#: model:ir.model.fields,field_description:product.field_product_product__product_variant_id
#: model:ir.model.fields,field_description:product.field_product_template__product_variant_id
+#: model:ir.ui.view,arch_db:product.product_kanban_view
#: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
#: model:ir.ui.view,arch_db:product.product_search_form_view
#: model:ir.ui.view,arch_db:product.product_supplierinfo_form_view
#: model:ir.ui.view,arch_db:product.product_supplierinfo_search_view
#: model:ir.ui.view,arch_db:product.product_supplierinfo_tree_view
#: model:ir.ui.view,arch_db:product.product_template_form_view
+#: model:ir.ui.view,arch_db:product.product_template_kanban_view
#: model:ir.ui.view,arch_db:product.product_template_search_view
#: model:ir.ui.view,arch_db:product.product_template_tree_view
#: selection:product.pricelist.item,applied_on:0
@@ -1234,6 +1261,12 @@ msgid "Product Attributes"
msgstr ""
#. module: product
+#: model:ir.actions.report,name:product.report_product_product_barcode
+#: model:ir.actions.report,name:product.report_product_template_barcode
+msgid "Product Barcode (PDF)"
+msgstr ""
+
+#. module: product
#: model:ir.actions.act_window,name:product.product_category_action_form
#: model:ir.ui.view,arch_db:product.product_category_list_view
#: model:ir.ui.view,arch_db:product.product_category_search_view
@@ -1250,6 +1283,12 @@ msgid "Product Category"
msgstr ""
#. module: product
+#: model:ir.actions.report,name:product.report_product_label
+#: model:ir.actions.report,name:product.report_product_template_label
+msgid "Product Label (PDF)"
+msgstr ""
+
+#. module: product
#: model:ir.ui.view,arch_db:product.product_template_form_view
#: model:ir.ui.view,arch_db:product.product_variant_easy_edit_view
msgid "Product Name"
@@ -1317,12 +1356,6 @@ msgid "Products"
msgstr ""
#. module: product
-#: model:ir.actions.report,name:product.report_product_label
-#: model:ir.actions.report,name:product.report_product_template_label
-msgid "Products Labels"
-msgstr ""
-
-#. module: product
#: model:ir.ui.view,arch_db:product.product_pricelist_view_search
msgid "Products Price"
msgstr ""
@@ -1339,7 +1372,7 @@ msgid "Products Price Search"
msgstr ""
#. module: product
-#: code:addons/product/models/product.py:464
+#: code:addons/product/models/product.py:465
#, python-format
msgid "Products: "
msgstr ""
@@ -1425,12 +1458,6 @@ msgid "Sale Price"
msgstr ""
#. module: product
-#: model:ir.model.fields,field_description:product.field_res_partner__property_product_pricelist
-#: model:ir.model.fields,field_description:product.field_res_users__property_product_pricelist
-msgid "Sale Pricelist"
-msgstr ""
-
-#. module: product
#: model:product.category,name:product.product_category_1
msgid "Saleable"
msgstr ""
@@ -1591,7 +1618,7 @@ msgstr ""
#. module: product
#: selection:product.template,type:0
-msgid "Stockable Product"
+msgid "Storable Product"
msgstr ""
#. module: product
@@ -1606,7 +1633,7 @@ msgid "The computed price is expressed in the default Unit of Measure of the pro
msgstr ""
#. module: product
-#: code:addons/product/models/product_template.py:304
+#: code:addons/product/models/product_template.py:305
#, python-format
msgid "The default Unit of Measure and the purchase Unit of Measure must be in the same category."
msgstr ""
@@ -1622,7 +1649,7 @@ msgid "The minimal quantity to purchase from this vendor, expressed in the vendo
msgstr ""
#. module: product
-#: code:addons/product/models/product_pricelist.py:427
+#: code:addons/product/models/product_pricelist.py:434
#, python-format
msgid "The minimum margin should be lower than the maximum margin."
msgstr ""
@@ -1729,11 +1756,18 @@ msgstr ""
#. module: product
#: model:ir.model.fields,field_description:product.field_product_product__uom_id
+#: model:ir.model.fields,field_description:product.field_product_supplierinfo__product_uom
#: model:ir.model.fields,field_description:product.field_product_template__uom_id
msgid "Unit of Measure"
msgstr ""
#. module: product
+#: model:ir.model.fields,field_description:product.field_product_product__uom_name
+#: model:ir.model.fields,field_description:product.field_product_template__uom_name
+msgid "Unit of Measure Name"
+msgstr ""
+
+#. module: product
#: model:ir.model.fields,field_description:product.field_res_config_settings__group_uom
msgid "Units of Measure"
msgstr ""
@@ -1856,11 +1890,6 @@ msgid "Vendor Product Name"
msgstr ""
#. module: product
-#: model:ir.model.fields,field_description:product.field_product_supplierinfo__product_uom
-msgid "Vendor Unit of Measure"
-msgstr ""
-
-#. module: product
#: model:ir.model.fields,help:product.field_product_supplierinfo__name
msgid "Vendor of this product"
msgstr ""
@@ -1929,7 +1958,7 @@ msgid "You can assign pricelists to your customers or select one when creating a
msgstr ""
#. module: product
-#: code:addons/product/models/product_pricelist.py:421
+#: code:addons/product/models/product_pricelist.py:428
#, python-format
msgid "You cannot assign the Main Pricelist as Other Pricelist in PriceList Item"
msgstr ""
@@ -2013,8 +2042,8 @@ msgid "e.g. USD Retailers"
msgstr ""
#. module: product
-#: code:addons/product/models/product.py:570
-#: code:addons/product/models/product_template.py:484
+#: code:addons/product/models/product.py:571
+#: code:addons/product/models/product_template.py:491
#, python-format
msgid "product"
msgstr ""
diff --git a/addons/product_email_template/i18n/product_email_template.pot b/addons/product_email_template/i18n/product_email_template.pot
index 7433676a940..117aa2e7306 100644
--- a/addons/product_email_template/i18n/product_email_template.pot
+++ b/addons/product_email_template/i18n/product_email_template.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:10+0000\n"
-"PO-Revision-Date: 2018-03-22 14:10+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: product_email_template
-#: model:ir.ui.view,arch_db:product_email_template.email_template_form_simplified
-msgid "Body"
+#: model:ir.ui.view,arch_db:product_email_template.product_template_form_view
+msgid "Automatic Email at Invoice"
msgstr ""
#. module: product_email_template
-#: model:ir.ui.view,arch_db:product_email_template.product_template_form_view
-msgid "Email"
+#: model:ir.ui.view,arch_db:product_email_template.email_template_form_simplified
+msgid "Body"
msgstr ""
#. module: product_email_template
diff --git a/addons/product_expiry/i18n/product_expiry.pot b/addons/product_expiry/i18n/product_expiry.pot
index fadae6e8c08..cdffab181e6 100644
--- a/addons/product_expiry/i18n/product_expiry.pot
+++ b/addons/product_expiry/i18n/product_expiry.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:10+0000\n"
-"PO-Revision-Date: 2018-03-22 14:10+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -18,12 +18,7 @@ msgstr ""
#. module: product_expiry
#: model:ir.ui.view,arch_db:product_expiry.view_move_form_expiry
#: model:ir.ui.view,arch_db:product_expiry.view_move_form_expiry_simple
-msgid "<span class=\"label label-danger\" attrs=\"{'invisible': [('product_expiry_alert', '=', False)]}\">Expiration Alert</span>"
-msgstr ""
-
-#. module: product_expiry
-#: model:ir.ui.view,arch_db:product_expiry.report_delivery_document_inherit_product_expiry
-msgid "<span class=\"pull-right\">Expiry Date</span>"
+msgid "<span class=\"badge badge-danger\" attrs=\"{'invisible': [('product_expiry_alert', '=', False)]}\">Expiration Alert</span>"
msgstr ""
#. module: product_expiry
@@ -37,6 +32,11 @@ msgid "Alert Date"
msgstr ""
#. module: product_expiry
+#: model:mail.activity.type,name:product_expiry.mail_activity_type_alert_date_reached
+msgid "Alert Date Reached"
+msgstr ""
+
+#. module: product_expiry
#: model:ir.model.fields,field_description:product_expiry.field_stock_production_lot__use_date
msgid "Best before Date"
msgstr ""
@@ -93,6 +93,11 @@ msgid "Number of days before the goods starts deteriorating, without being dange
msgstr ""
#. module: product_expiry
+#: model:ir.model,name:product_expiry.model_procurement_group
+msgid "Procurement Requisition"
+msgstr ""
+
+#. module: product_expiry
#: model:ir.model.fields,field_description:product_expiry.field_product_product__alert_time
#: model:ir.model.fields,field_description:product_expiry.field_product_template__alert_time
msgid "Product Alert Time"
@@ -143,6 +148,12 @@ msgid "The Alert Date has been reached."
msgstr ""
#. module: product_expiry
+#: code:addons/product_expiry/models/production_lot.py:84
+#, python-format
+msgid "The alert date has been reached for this lot/serial number"
+msgstr ""
+
+#. module: product_expiry
#: model:ir.model.fields,help:product_expiry.field_stock_production_lot__life_date
msgid "This is the date on which the goods with this Serial Number may become dangerous and must not be consumed."
msgstr ""
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index 0c77361d406..63399ca4318 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:11+0000\n"
-"PO-Revision-Date: 2018-08-02 09:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:03+0000\n"
+"PO-Revision-Date: 2018-08-24 09:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,104 +16,6 @@ msgstr ""
"Plural-Forms: \n"
#. module: project
-#: model:mail.template,body_html:project.mail_template_data_module_install_project
-msgid "\n"
-" <div style=\"margin: 10px auto;\">\n"
-" % set last_created_project = user.env['project.project'].search([('alias_id','!=',False)], order=\"create_date desc\")[0]\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
-" <tbody>\n"
-" <tr>\n"
-" <td style=\"padding:2px;width:30%;\">\n"
-" <img src=\"web/static/src/img/logo.png\"/>\n"
-" </td>\n"
-" <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
-" <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #875A7B;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
-" </td>\n"
-" </tr>\n"
-" </tbody>\n"
-" </table>\n"
-" <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
-" <tbody>\n"
-" <tr>\n"
-" <td style=\"padding:15px 10px;font-size:20px\">\n"
-" <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-" <span>Your Odoo Project application is up and running</span></p><br>\n"
-" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-" <span style=\"font-size:13px;font-weight:bold;\">What’s next?</span></p>\n"
-" <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-" % if last_created_project:\n"
-" <li dir=\"ltr\">\n"
-" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-" <span>Try creating a task by sending an email to </span>\n"
-" <a href=\"mailto:${last_created_project.alias_id.name_get()[0][1] if last_created_project.alias_id.alias_domain else user.company_id.email}\">\n"
-" <span style=\"font-weight:bold; text-decoration:underline;\">${last_created_project.alias_id.name_get()[0][1] if last_created_project.alias_id.alias_domain else user.company_id.email}</span>\n"
-" </a>\n"
-" </p>\n"
-" </li>\n"
-" % endif\n"
-" <li dir=\"ltr\">\n"
-" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-" <span><a href=\"/web#view_type=list&model=res.users&action=base.action_res_users\">\n"
-" <span style=\"font-weight:bold; text-decoration:underline;\">Invite new users</span></a></span>\n"
-" <span>to collaborate</span>\n"
-" </p>\n"
-" </li>\n"
-" </ul> <br>\n"
-" <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-" <li dir=\"ltr\">\n"
-" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-" <span>Track hours with timesheets,</span>\n"
-" </p>\n"
-" </li>\n"
-" <li dir=\"ltr\">\n"
-" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-" <span>Plan tasks and resources with forecasts,</span>\n"
-" </p>\n"
-" </li>\n"
-" <li dir=\"ltr\">\n"
-" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-" <span>Get smart reporting and accurate dashboards,</span>\n"
-" </p>\n"
-" </li>\n"
-" <li dir=\"ltr\">\n"
-" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-" <span>Bill time on tasks or issues,</span>\n"
-" </p>\n"
-" </li>\n"
-" <li dir=\"ltr\">\n"
-" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-" <span>And much more...</span>\n"
-" </p>\n"
-" </li>\n"
-" </ul>\n"
-" <br>\n"
-" <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
-" <span style=\"font-weight:bold;\">Need Help?</span>\n"
-" <span style=\"font-style:italic;\">You’re not alone</span>\n"
-" </p>\n"
-" <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-" <span>We would be delighted to assist you along the way. Contact us through our\n"
-" <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n"
-" You can also discover how to get the best out of Odoo Project with our </span>\n"
-" <a target=\"_blank\" href=\"https://www.odoo.com/documentation/user/11.0/project.html\">\n"
-" <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
-" </span><span> or with our </span>\n"
-" <a target=\"_blank\" href=\"https://www.odoo.com/documentation\">\n"
-" <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
-" </p>\n"
-" <br>\n"
-" <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
-" </td>\n"
-" </tr>\n"
-" </tbody>\n"
-" </table>\n"
-" <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
-" <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a target=\"_blank\" href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
-" </div>\n"
-" </div>"
-msgstr ""
-
-#. module: project
#: model:ir.model.fields,field_description:project.field_report_project_task_user__delay_endings_days
msgid "# Days to Deadline"
msgstr ""
@@ -150,8 +52,8 @@ msgid "% On"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:288
-#: code:addons/project/models/project.py:626
+#: code:addons/project/models/project.py:293
+#: code:addons/project/models/project.py:614
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -163,28 +65,21 @@ msgstr ""
#. module: project
#. openerp-web
-#: code:addons/project/static/src/js/tour.js:73
+#: code:addons/project/static/src/js/tour.js:85
#, python-format
msgid "<b>Assign the task</b> to someone. <i>You can create and invite a new user on the fly.</i>"
msgstr ""
#. module: project
#. openerp-web
-#: code:addons/project/static/src/js/tour.js:84
+#: code:addons/project/static/src/js/tour.js:96
#, python-format
msgid "<b>Click the save button</b> to apply your changes to the task."
msgstr ""
#. module: project
#. openerp-web
-#: code:addons/project/static/src/js/tour.js:98
-#, python-format
-msgid "<b>Invite coworkers</b> via email.<br/><i>Enter one email per line.</i>"
-msgstr ""
-
-#. module: project
-#. openerp-web
-#: code:addons/project/static/src/js/tour.js:58
+#: code:addons/project/static/src/js/tour.js:65
#, python-format
msgid "<b>Star tasks</b> to mark team priorities."
msgstr ""
@@ -283,7 +178,7 @@ msgid "<i class=\"fa fa-smile-o\"/> No rating yet"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:122
+#: code:addons/project/models/project.py:121
#, python-format
msgid "<p class=\"o_view_nocontent_smiling_face\">\n"
" Documents are attached to the tasks and issues of your project.</p><p>\n"
@@ -293,7 +188,7 @@ msgid "<p class=\"o_view_nocontent_smiling_face\">\n"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:150
+#: code:addons/project/models/project.py:149
#, python-format
msgid "<p class=\"o_view_nocontent_smiling_face\">\n"
" Create a new project</p>"
@@ -301,12 +196,17 @@ msgstr ""
#. module: project
#. openerp-web
-#: code:addons/project/static/src/js/tour.js:53
+#: code:addons/project/static/src/js/tour.js:60
#, python-format
msgid "<p>Once your task is ready, you can save it.</p>"
msgstr ""
#. module: project
+#: model:digest.tip,tip_description:project.digest_tip_project_0
+msgid "<strong style=\"font-size: 16px;\">Try the mail gateway</strong>"
+msgstr ""
+
+#. module: project
#: model:ir.ui.view,arch_db:project.portal_my_task
msgid "<strong>Assigned to</strong>"
msgstr ""
@@ -367,6 +267,12 @@ msgid "Accept Emails From"
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_project_project__access_warning
+#: model:ir.model.fields,field_description:project.field_project_task__access_warning
+msgid "Access warning"
+msgstr ""
+
+#. module: project
#: model:ir.model.fields,field_description:project.field_project_project__message_needaction
#: model:ir.model.fields,field_description:project.field_project_task__message_needaction
msgid "Action Needed"
@@ -402,8 +308,9 @@ msgstr ""
#. module: project
#. openerp-web
#: code:addons/project/static/src/js/tour.js:34
+#: code:addons/project/static/src/js/tour.js:41
#, python-format
-msgid "Add columns to configure <b>stages for your tasks</b>.<br/><i>e.g. Specification &gt; Development &gt; Done</i>"
+msgid "Add columns to configure <b>stages for your tasks</b>.<br/><i>e.g. New - In Progress - Done</i>"
msgstr ""
#. module: project
@@ -444,7 +351,7 @@ msgid "Aliased Model"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:91
+#: code:addons/project/controllers/portal.py:115
#, python-format
msgid "All"
msgstr ""
@@ -503,7 +410,10 @@ msgid "At each stage employees can block or make task/issue ready for next stage
msgstr ""
#. module: project
+#. openerp-web
+#: code:addons/project/static/src/xml/project.xml:7
#: model:ir.ui.view,arch_db:project.portal_my_task
+#, python-format
msgid "Attachment"
msgstr ""
@@ -513,7 +423,7 @@ msgid "Attachment that don't come from message."
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:115
+#: code:addons/project/models/project.py:114
#: model:ir.ui.view,arch_db:project.portal_my_task
#, python-format
msgid "Attachments"
@@ -556,7 +466,7 @@ msgid "Basic"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:30
+#: code:addons/project/models/project.py:29
#: model:project.task,legend_blocked:project.project_task_data_0
#: model:project.task,legend_blocked:project.project_task_data_1
#: model:project.task,legend_blocked:project.project_task_data_11
@@ -598,7 +508,7 @@ msgstr ""
#. module: project
#. openerp-web
-#: code:addons/project/static/src/js/tour.js:48
+#: code:addons/project/static/src/js/tour.js:55
#, python-format
msgid "Choose a <b>task name</b>. (e.g. Website Design, Purchase Goods etc.)"
msgstr ""
@@ -626,14 +536,21 @@ msgstr ""
#. module: project
#. openerp-web
-#: code:addons/project/static/src/js/tour.js:63
+#: code:addons/project/static/src/js/tour.js:70
#, python-format
msgid "Click on a card to get the details of the task."
msgstr ""
#. module: project
#. openerp-web
-#: code:addons/project/static/src/js/tour.js:68
+#: code:addons/project/static/src/js/tour.js:75
+#, python-format
+msgid "Click on the card to write more information about it and collaborate with your coworkers."
+msgstr ""
+
+#. module: project
+#. openerp-web
+#: code:addons/project/static/src/js/tour.js:80
#, python-format
msgid "Click on this button to modify the task."
msgstr ""
@@ -653,11 +570,6 @@ msgid "Communicate with customers on the task using the email gateway. Attach lo
msgstr ""
#. module: project
-#: model:ir.model,name:project.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: project
#: model:ir.model.fields,field_description:project.field_project_project__company_id
#: model:ir.model.fields,field_description:project.field_project_task__company_id
#: model:ir.model.fields,field_description:project.field_report_project_task_user__company_id
@@ -679,13 +591,6 @@ msgstr ""
#. module: project
#. openerp-web
-#: code:addons/project/static/src/js/tour.js:94
-#, python-format
-msgid "Configuration options are available in the Settings app."
-msgstr ""
-
-#. module: project
-#. openerp-web
#: code:addons/project/static/src/js/project_task_kanban_examples.js:57
#, python-format
msgid "Consulting"
@@ -763,6 +668,11 @@ msgid "Created on"
msgstr ""
#. module: project
+#: model:ir.ui.view,arch_db:project.rating_rating_view_search_project
+msgid "Creation Date"
+msgstr ""
+
+#. module: project
#: model:ir.filters,name:project.filter_task_report_cumulative_flow
msgid "Cumulative Flow"
msgstr ""
@@ -783,7 +693,7 @@ msgid "Current stage of this task"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:940
+#: code:addons/project/models/project.py:869
#: model:ir.model.fields,field_description:project.field_project_project__partner_id
#: model:ir.model.fields,field_description:project.field_project_task__partner_id
#: model:ir.model.fields,field_description:project.field_report_project_task_user__partner_id
@@ -793,8 +703,8 @@ msgid "Customer"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:940
-#: code:addons/project/models/project.py:943
+#: code:addons/project/models/project.py:869
+#: code:addons/project/models/project.py:872
#, python-format
msgid "Customer Email"
msgstr ""
@@ -807,8 +717,8 @@ msgid "Customer Feedback"
msgstr ""
#. module: project
-#: model:ir.model.fields,help:project.field_project_project__portal_url
-#: model:ir.model.fields,help:project.field_project_task__portal_url
+#: model:ir.model.fields,help:project.field_project_project__access_url
+#: model:ir.model.fields,help:project.field_project_task__access_url
msgid "Customer Portal URL"
msgstr ""
@@ -908,6 +818,11 @@ msgid "Development"
msgstr ""
#. module: project
+#: model:ir.model,name:project.model_digest_digest
+msgid "Digest"
+msgstr ""
+
+#. module: project
#. openerp-web
#: code:addons/project/static/src/js/project_task_kanban_examples.js:38
#, python-format
@@ -932,6 +847,12 @@ msgid "Display Name"
msgstr ""
#. module: project
+#: code:addons/project/models/digest.py:16
+#, python-format
+msgid "Do not have access, skip this data for user's digest email"
+msgstr ""
+
+#. module: project
#: model:ir.ui.view,arch_db:project.edit_project
msgid "Documents"
msgstr ""
@@ -955,6 +876,11 @@ msgid "Draft"
msgstr ""
#. module: project
+#: model:ir.ui.view,arch_db:project.view_task_kanban
+msgid "Dropdown menu"
+msgstr ""
+
+#. module: project
#: model:ir.ui.view,arch_db:project.view_project_kanban
msgid "Edit"
msgstr ""
@@ -1004,7 +930,7 @@ msgid "Ending Date"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:633
+#: code:addons/project/models/project.py:621
#, python-format
msgid "Error! You cannot create recursive hierarchy of task(s)."
msgstr ""
@@ -1126,13 +1052,6 @@ msgid "Gives the sequence order when displaying a list of tasks."
msgstr ""
#. module: project
-#. openerp-web
-#: code:addons/project/static/src/js/tour.js:103
-#, python-format
-msgid "Good job! You completed the Project Management tour."
-msgstr ""
-
-#. module: project
#: selection:project.task,kanban_state:0
msgid "Green"
msgstr ""
@@ -1175,6 +1094,12 @@ msgid "Happy % on Task"
msgstr ""
#. module: project
+#: model:ir.ui.view,arch_db:project.portal_project_rating_partner_stat
+#: model:ir.ui.view,arch_db:project.view_task_kanban
+msgid "Happy face"
+msgstr ""
+
+#. module: project
#: selection:report.project.task.user,priority:0
msgid "High"
msgstr ""
@@ -1205,7 +1130,7 @@ msgid "How to get the customer's feedbacks?\n"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:867
+#: code:addons/project/models/project.py:798
#, python-format
msgid "I take it"
msgstr ""
@@ -1266,7 +1191,7 @@ msgstr ""
#. module: project
#. openerp-web
-#: code:addons/project/models/project.py:36
+#: code:addons/project/models/project.py:35
#: code:addons/project/static/src/js/project_task_kanban_examples.js:58
#: model:project.task,legend_normal:project.project_task_data_0
#: model:project.task,legend_normal:project.project_task_data_1
@@ -1350,13 +1275,17 @@ msgid "Kanban Valid Explanation"
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_digest_digest__kpi_project_task_opened_value
+msgid "Kpi Project Task Opened Value"
+msgstr ""
+
+#. module: project
#: model:ir.ui.view,arch_db:project.rating_project_rating_page
msgid "Last 3 months"
msgstr ""
#. module: project
#: model:ir.ui.view,arch_db:project.rating_project_rating_page
-#: model:ir.ui.view,arch_db:project.rating_rating_view_search_project
msgid "Last 30 days"
msgstr ""
@@ -1375,7 +1304,7 @@ msgid "Last Modified on"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:88
+#: code:addons/project/controllers/portal.py:112
#: model:ir.model.fields,field_description:project.field_project_task__date_last_stage_update
#: model:ir.model.fields,field_description:project.field_report_project_task_user__date_last_stage_update
#, python-format
@@ -1418,6 +1347,11 @@ msgid "Latest Rating: Satisfied"
msgstr ""
#. module: project
+#: model:ir.ui.view,arch_db:project.task_type_edit
+msgid "Legend priority"
+msgstr ""
+
+#. module: project
#. openerp-web
#: code:addons/project/static/src/js/tour.js:18
#, python-format
@@ -1426,7 +1360,7 @@ msgstr ""
#. module: project
#. openerp-web
-#: code:addons/project/static/src/js/tour.js:42
+#: code:addons/project/static/src/js/tour.js:49
#, python-format
msgid "Let's create your first task."
msgstr ""
@@ -1444,6 +1378,11 @@ msgid "Live"
msgstr ""
#. module: project
+#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
+msgid "Log time on tasks"
+msgstr ""
+
+#. module: project
#. openerp-web
#: code:addons/project/static/src/js/project_task_kanban_examples.js:67
#, python-format
@@ -1517,7 +1456,7 @@ msgid "My Tasks"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:35
+#: code:addons/project/controllers/portal.py:46
#: model:ir.model.fields,field_description:project.field_project_project__name
#: model:ir.model.fields,field_description:project.field_project_tags__name
#: model:ir.ui.view,arch_db:project.portal_my_projects
@@ -1532,6 +1471,12 @@ msgid "Name of the tasks :"
msgstr ""
#. module: project
+#: model:ir.ui.view,arch_db:project.portal_project_rating_partner_stat
+#: model:ir.ui.view,arch_db:project.view_task_kanban
+msgid "Neutral face"
+msgstr ""
+
+#. module: project
#. openerp-web
#: code:addons/project/static/src/js/project_task_kanban_examples.js:45
#: model:ir.ui.view,arch_db:project.view_task_project_user_search
@@ -1555,8 +1500,13 @@ msgid "New Projects"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:34
-#: code:addons/project/controllers/portal.py:85
+#: model:digest.tip,tip_description:project.digest_tip_project_0
+msgid "New tasks can be generated from incoming emails. You just need to set email aliases on your projects.<br>"
+msgstr ""
+
+#. module: project
+#: code:addons/project/controllers/portal.py:45
+#: code:addons/project/controllers/portal.py:109
#, python-format
msgid "Newest"
msgstr ""
@@ -1583,7 +1533,7 @@ msgid "Next Activity Type"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:913
+#: code:addons/project/models/project.py:842
#, python-format
msgid "No Subject"
msgstr ""
@@ -1610,7 +1560,7 @@ msgid "No scheduled activity at the moment"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:101
+#: code:addons/project/controllers/portal.py:125
#, python-format
msgid "None"
msgstr ""
@@ -1678,7 +1628,7 @@ msgid "Odoo's project management allows you to manage the pipeline of your tasks
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:206
+#: code:addons/project/models/project.py:205
#: selection:project.project,privacy_visibility:0
#, python-format
msgid "On invitation only"
@@ -1697,6 +1647,11 @@ msgid "Once a task is specified, set it %s in the Specifications column, so that
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_digest_digest__kpi_project_task_opened
+msgid "Open Tasks"
+msgstr ""
+
+#. module: project
#: model:ir.model.fields,help:project.field_project_project__alias_force_thread_id
msgid "Optional ID of a thread (record) to which all incoming messages will be attached, even if they did not reply to it. If set, this will disable the creation of new records completely."
msgstr ""
@@ -1762,7 +1717,7 @@ msgid "Parent Record Thread ID"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:980
+#: code:addons/project/models/project.py:909
#: model:ir.model.fields,field_description:project.field_project_task__parent_id
#: model:ir.ui.view,arch_db:project.view_task_form2
#, python-format
@@ -1785,6 +1740,12 @@ msgid "Periodical Rating"
msgstr ""
#. module: project
+#: model:ir.ui.view,arch_db:project.portal_project_rating_partner_stat
+#: model:ir.ui.view,arch_db:project.portal_project_rating_popover
+msgid "Placeholder"
+msgstr ""
+
+#. module: project
#: selection:project.task,activity_state:0
msgid "Planned"
msgstr ""
@@ -1804,8 +1765,8 @@ msgid "Policy to post a message on the document using the mailgateway.\n"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project__portal_url
-#: model:ir.model.fields,field_description:project.field_project_task__portal_url
+#: model:ir.model.fields,field_description:project.field_project_project__access_url
+#: model:ir.model.fields,field_description:project.field_project_task__access_url
msgid "Portal Access URL"
msgstr ""
@@ -1821,12 +1782,13 @@ msgid "Privacy"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:102
+#: code:addons/project/controllers/portal.py:126
#: model:ir.model,name:project.model_project_project
#: model:ir.model.fields,field_description:project.field_project_task__project_id
#: model:ir.model.fields,field_description:project.field_report_project_task_user__project_id
#: model:ir.model.fields,field_description:project.field_res_users__group_project_user
#: model:ir.ui.menu,name:project.menu_main_pm
+#: model:ir.ui.view,arch_db:project.digest_digest_view_form
#: model:ir.ui.view,arch_db:project.edit_project
#: model:ir.ui.view,arch_db:project.project_project_view_form_simplified
#: model:ir.ui.view,arch_db:project.rating_rating_view_search_project
@@ -1873,13 +1835,6 @@ msgid "Project Tasks"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_res_company__project_time_mode_id
-#: model:ir.model.fields,field_description:project.field_res_config_settings__project_time_mode_id
-#: model:ir.model.fields,field_description:project.project_time_mode_id_duplicate_xmlid
-msgid "Project Time Unit"
-msgstr ""
-
-#. module: project
#: model:ir.actions.act_window,name:project.dblc_proj
msgid "Project's tasks"
msgstr ""
@@ -1915,6 +1870,12 @@ msgid "Quarterly"
msgstr ""
#. module: project
+#: model:ir.ui.view,arch_db:project.portal_project_rating_partner_stat
+#: model:ir.ui.view,arch_db:project.portal_project_rating_popover
+msgid "Rated partner"
+msgstr ""
+
+#. module: project
#: model:ir.ui.view,arch_db:project.view_task_search_form
msgid "Rated tasks"
msgstr ""
@@ -1977,13 +1938,13 @@ msgid "Ratings"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:398
+#: code:addons/project/models/project.py:379
#, python-format
msgid "Ratings of %s"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:33
+#: code:addons/project/models/project.py:32
#: model:project.task,legend_done:project.project_task_data_0
#: model:project.task,legend_done:project.project_task_data_1
#: model:project.task,legend_done:project.project_task_data_11
@@ -2096,6 +2057,12 @@ msgid "Responsible User"
msgstr ""
#. module: project
+#: model:ir.ui.view,arch_db:project.portal_project_rating_partner_stat
+#: model:ir.ui.view,arch_db:project.view_task_kanban
+msgid "Sad face"
+msgstr ""
+
+#. module: project
#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
msgid "Schedule your teams across projects and estimate deadlines more accurately."
msgstr ""
@@ -2106,7 +2073,7 @@ msgid "Search"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:94
+#: code:addons/project/controllers/portal.py:118
#, python-format
msgid "Search <span class=\"nolabel\"> (in Content)</span>"
msgstr ""
@@ -2117,30 +2084,36 @@ msgid "Search Project"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:98
+#: code:addons/project/controllers/portal.py:122
#, python-format
msgid "Search in All"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:96
+#: code:addons/project/controllers/portal.py:120
#, python-format
msgid "Search in Customer"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:95
+#: code:addons/project/controllers/portal.py:119
#, python-format
msgid "Search in Messages"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:97
+#: code:addons/project/controllers/portal.py:121
#, python-format
msgid "Search in Stages"
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_project_project__access_token
+#: model:ir.model.fields,field_description:project.field_project_task__access_token
+msgid "Security Token"
+msgstr ""
+
+#. module: project
#. openerp-web
#: code:addons/project/static/src/js/project.js:65
#, python-format
@@ -2160,6 +2133,11 @@ msgid "Set Cover Image"
msgstr ""
#. module: project
+#: model:digest.tip,tip_description:project.digest_tip_project_0
+msgid "Set Email Aliases"
+msgstr ""
+
+#. module: project
#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
msgid "Set Email Template to Stages"
msgstr ""
@@ -2179,6 +2157,14 @@ msgid "Settings"
msgstr ""
#. module: project
+#: model:ir.ui.view,arch_db:project.edit_project
+#: model:ir.ui.view,arch_db:project.view_project_kanban
+#: model:ir.ui.view,arch_db:project.view_task_form2
+#: model:ir.ui.view,arch_db:project.view_task_kanban
+msgid "Share"
+msgstr ""
+
+#. module: project
#: model:ir.model.fields,field_description:project.field_project_project__is_favorite
msgid "Show Project on dashboard"
msgstr ""
@@ -2208,7 +2194,7 @@ msgid "Split your tasks to organize your work into sub-milestones"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:87
+#: code:addons/project/controllers/portal.py:111
#: model:ir.model.fields,field_description:project.field_project_task__stage_id
#: model:ir.model.fields,field_description:project.field_report_project_task_user__stage_id
#: model:ir.ui.view,arch_db:project.portal_my_tasks
@@ -2325,7 +2311,7 @@ msgid "Task"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:618
+#: code:addons/project/models/project.py:606
#, python-format
msgid "Task %s cannot have several subtask levels."
msgstr ""
@@ -2359,6 +2345,11 @@ msgid "Task Created"
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_res_config_settings__module_hr_timesheet
+msgid "Task Logs"
+msgstr ""
+
+#. module: project
#: model:ir.filters,name:project.filter_task_report_task_pipe
msgid "Task Pipe"
msgstr ""
@@ -2389,6 +2380,7 @@ msgstr ""
#. module: project
#: model:ir.model.fields,field_description:project.field_report_project_task_user__name
+#: model:ir.ui.view,arch_db:project.quick_create_task_form
msgid "Task Title"
msgstr ""
@@ -2403,6 +2395,16 @@ msgid "Task blocked"
msgstr ""
#. module: project
+#: model:ir.ui.view,arch_db:project.task_type_edit
+msgid "Task in progress. Click to block or set as done."
+msgstr ""
+
+#. module: project
+#: model:ir.ui.view,arch_db:project.task_type_edit
+msgid "Task is blocked. Click to unblock or set as done."
+msgstr ""
+
+#. module: project
#: model:mail.message.subtype,description:project.mt_task_ready
msgid "Task ready for Next Stage"
msgstr ""
@@ -2487,6 +2489,18 @@ msgid "The owner of records created upon receiving emails on this alias. If this
msgstr ""
#. module: project
+#: code:addons/project/models/project.py:252
+#, python-format
+msgid "The project cannot be shared with the recipient(s) because the privacy of the project is too restricted. Set the privacy to 'Visible by following customers' in order to make it accessible by the recipient(s)."
+msgstr ""
+
+#. module: project
+#: code:addons/project/models/project.py:561
+#, python-format
+msgid "The task cannot be shared with the recipient(s) because the privacy of the project is too restricted. Set the privacy of the project to 'Visible by following customers' in order to make it accessible by the recipient(s)."
+msgstr ""
+
+#. module: project
#: model:ir.ui.view,arch_db:project.portal_my_projects
msgid "There are no projects."
msgstr ""
@@ -2544,18 +2558,15 @@ msgid "This stage is folded in the kanban view when there are no records in that
msgstr ""
#. module: project
-#. openerp-web
-#: code:addons/project/static/src/js/tour.js:27
-#, python-format
-msgid "This will create new project and redirect us to its tasks."
+#: model:ir.ui.view,arch_db:project.task_type_edit
+msgid "This step is done. Click to block or set in progress."
msgstr ""
#. module: project
-#: model:ir.model.fields,help:project.field_res_company__project_time_mode_id
-#: model:ir.model.fields,help:project.field_res_config_settings__project_time_mode_id
-#: model:ir.model.fields,help:project.project_time_mode_id_duplicate_xmlid
-msgid "This will set the unit of measure used in projects and tasks.\n"
-"If you use the timesheet linked to projects, don't forget to setup the right unit of measure in your employees."
+#. openerp-web
+#: code:addons/project/static/src/js/tour.js:27
+#, python-format
+msgid "This will create a new project and redirect us to its stages."
msgstr ""
#. module: project
@@ -2574,7 +2585,7 @@ msgid "Timetable working hours to adjust the gantt diagram report"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:86
+#: code:addons/project/controllers/portal.py:110
#: model:ir.model.fields,field_description:project.field_project_task__name
#, python-format
msgid "Title"
@@ -2673,7 +2684,7 @@ msgstr ""
#. module: project
#. openerp-web
-#: code:addons/project/static/src/js/tour.js:89
+#: code:addons/project/static/src/js/tour.js:101
#, python-format
msgid "Use the breadcrumbs to <b>go back to your tasks pipeline</b>."
msgstr ""
@@ -2694,14 +2705,14 @@ msgid "Users"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:207
+#: code:addons/project/models/project.py:206
#: selection:project.project,privacy_visibility:0
#, python-format
msgid "Visible by all employees"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:208
+#: code:addons/project/models/project.py:207
#: selection:project.project,privacy_visibility:0
#, python-format
msgid "Visible by following customers"
@@ -2823,19 +2834,24 @@ msgid "You can also give a tooltip about the use of the stars available in the k
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:87
+#: code:addons/project/models/project.py:86
#, python-format
msgid "You cannot delete a project containing tasks. You can either archive it or first delete all of its tasks."
msgstr ""
#. module: project
-#: model:mail.template,subject:project.mail_template_data_module_install_project
-msgid "Your Odoo Project application"
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid "activate a sample project"
msgstr ""
#. module: project
-#: model:ir.actions.act_window,help:project.open_view_project_all
-msgid "activate a sample project"
+#: model:ir.ui.view,arch_db:project.portal_project_rating_partner_stat
+msgid "average"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.view,arch_db:project.portal_project_rating_partner_stat
+msgid "bad"
msgstr ""
#. module: project
@@ -2864,7 +2880,7 @@ msgid "res.config.settings"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:678
+#: code:addons/project/models/project.py:625
#, python-format
msgid "task"
msgstr ""
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index a8b9216d6cc..072d1757466 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:12+0000\n"
-"PO-Revision-Date: 2018-08-02 09:12+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,68 +16,6 @@ msgstr ""
"Plural-Forms: \n"
#. module: purchase
-#: model:mail.template,body_html:purchase.email_template_edi_purchase
-msgid "\n"
-"<p>Dear\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"
-"% endif\n"
-",</p><p>\n"
-"Here is, in attachment, a ${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order confirmation'} <strong>${object.name}</strong>\n"
-"% if object.partner_ref:\n"
-" with reference: ${object.partner_ref}\n"
-"% endif\n"
-"% if object.origin:\n"
-" (RFQ origin: ${object.origin})\n"
-"% endif\n"
-"amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
-"from ${object.company_id.name}.\n"
-"</p>\n"
-"\n"
-"<p>Do not hesitate to contact us, further you have any question.</p>\n"
-"<p>Best regards,</p>\n"
-"<p style=\"color:#888888;\">\n"
-"% if object.user_id and object.user_id.signature:\n"
-" ${object.user_id.signature | safe}\n"
-"% endif\n"
-"</p>\n"
-""
-msgstr ""
-
-#. module: purchase
-#: model:mail.template,body_html:purchase.email_template_edi_purchase_done
-msgid "\n"
-"<p>Dear ${object.partner_id.name}\n"
-"% if object.partner_id.parent_id:\n"
-" (<i>${object.partner_id.parent_id.name}</i>)\n"
-"% endif\n"
-",</p>\n"
-"<p>\n"
-"Please find in attachment a <strong>${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order confirmation'} ${object.name}</strong>\n"
-"% if object.partner_ref:\n"
-" with reference: ${object.partner_ref}\n"
-"% endif\n"
-"% if object.origin:\n"
-" (RFQ origin: ${object.origin})\n"
-"% endif\n"
-"amounting <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
-"from ${object.company_id.name}.\n"
-"</p>\n"
-"\n"
-"<p>You can reply to this email if you have any questions.</p>\n"
-"<p>Thank you,</p>\n"
-""
-msgstr ""
-
-#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_product_product__purchase_count
-#: model:ir.model.fields,field_description:purchase.field_product_template__purchase_count
-msgid "# Purchases"
-msgstr ""
-
-#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_res_partner__supplier_invoice_count
#: model:ir.model.fields,field_description:purchase.field_res_users__supplier_invoice_count
msgid "# Vendor Bills"
@@ -105,13 +43,46 @@ msgid "3-way matching: purchases, receptions and bills"
msgstr ""
#. module: purchase
+#: model:mail.template,body_html:purchase.email_template_edi_purchase
+#: model:mail.template,body_html:purchase.email_template_edi_purchase_done
+msgid "<div style=\"margin: 0px; padding: 0px;\">\n"
+" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+" Dear ${object.partner_id.name}\n"
+" % if object.partner_id.parent_id:\n"
+" (${object.partner_id.parent_id.name})\n"
+" % endif\n"
+" <br/><br/>\n"
+" Here is in attachment a ${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order'} <strong>${object.name}</strong>\n"
+" % if object.partner_ref:\n"
+" with reference: ${object.partner_ref}\n"
+" % endif\n"
+" % if object.origin:\n"
+" (RFQ origin: ${object.origin})\n"
+" % endif\n"
+" amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
+" from ${object.company_id.name}.\n"
+" <br/><br/>\n"
+" Do not hesitate to contact us if you have any question.\n"
+" <br/><br/>\n"
+" Best regards,\n"
+" </p>\n"
+"</div>"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_orders
-msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/> Cancelled</span>"
+msgid "<span class=\"badge badge-info\"><i class=\"fa fa-fw fa-file-text\"/> Waiting for Bill</span>"
msgstr ""
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_orders
-msgid "<span class=\"label label-info\"><i class=\"fa fa-fw fa-file-text\"/> Waiting for Bill</span>"
+msgid "<span class=\"badge badge-secondary\"><i class=\"fa fa-fw fa-remove\"/> Cancelled</span>"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.view,arch_db:purchase.product_normal_form_view_inherit_purchase
+#: model:ir.ui.view,arch_db:purchase.view_product_template_purchase_buttons_from
+msgid "<span class=\"o_stat_text\">Purchased</span>"
msgstr ""
#. module: purchase
@@ -211,7 +182,7 @@ msgstr ""
#. module: purchase
#: model:ir.model.fields,help:purchase.field_purchase_order_line__product_type
-msgid "A stockable product is a product for which you manage stock. The \"Inventory\" app has to be installed.\n"
+msgid "A storable product is a product for which you manage stock. The \"Inventory\" app has to be installed.\n"
"A consumable product, on the other hand, is a product for which stock is not managed.\n"
"A service is a non-material product you provide.\n"
"A digital content is a non-material product you sell online. The files attached to the products are the one that are sold on the e-commerce such as e-books, music, pictures,... The \"Digital Product\" module has to be installed."
@@ -224,6 +195,11 @@ msgid "A warning can be set on a product or a customer (Purchase)"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__access_warning
+msgid "Access warning"
+msgstr ""
+
+#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_order__message_needaction
msgid "Action Needed"
msgstr ""
@@ -244,7 +220,7 @@ msgid "Add Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/controllers/portal.py:53
+#: code:addons/purchase/controllers/portal.py:50
#, python-format
msgid "All"
msgstr ""
@@ -372,7 +348,7 @@ msgid "Cancel"
msgstr ""
#. module: purchase
-#: code:addons/purchase/controllers/portal.py:55
+#: code:addons/purchase/controllers/portal.py:52
#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
#, python-format
@@ -385,7 +361,7 @@ msgid "Cancelled Purchase Order #"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:492
+#: code:addons/purchase/models/purchase.py:511
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
@@ -415,7 +391,7 @@ msgid "Company Currency"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:270
+#: code:addons/purchase/models/purchase.py:268
#, python-format
msgid "Compose Email"
msgstr ""
@@ -502,6 +478,11 @@ msgid "Currency"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,help:purchase.field_purchase_order__access_url
+msgid "Customer Portal URL"
+msgstr ""
+
+#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_bill_union__date
msgid "Date"
msgstr ""
@@ -591,7 +572,7 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:474
+#: code:addons/purchase/models/purchase.py:493
#, python-format
msgid "Extra line with %s "
msgstr ""
@@ -684,17 +665,33 @@ msgid "If enabled, activates 3-way matching on vendor bills : the items must be
msgstr ""
#. module: purchase
+#: code:addons/purchase/models/product.py:39
+#, python-format
+msgid "Import Template for Products"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
msgid "Import vendor pricelists"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:167
+#: code:addons/purchase/models/purchase.py:165
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__incoterm_id
+msgid "Incoterm"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model.fields,help:purchase.field_purchase_order__incoterm_id
+msgid "International Commercial Terms are a series of predefined commercial terms used in international transactions."
+msgstr ""
+
+#. module: purchase
#: model:ir.model,name:purchase.model_account_invoice
msgid "Invoice"
msgstr ""
@@ -775,7 +772,7 @@ msgid "Lock Confirmed Orders"
msgstr ""
#. module: purchase
-#: code:addons/purchase/controllers/portal.py:56
+#: code:addons/purchase/controllers/portal.py:53
#: selection:purchase.order,state:0
#, python-format
msgid "Locked"
@@ -872,13 +869,13 @@ msgid "My Purchases"
msgstr ""
#. module: purchase
-#: code:addons/purchase/controllers/portal.py:44
+#: code:addons/purchase/controllers/portal.py:41
#, python-format
msgid "Name"
msgstr ""
#. module: purchase
-#: code:addons/purchase/controllers/portal.py:43
+#: code:addons/purchase/controllers/portal.py:40
#, python-format
msgid "Newest"
msgstr ""
@@ -1060,6 +1057,11 @@ msgid "Planned"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__access_url
+msgid "Portal Access URL"
+msgstr ""
+
+#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_product_category__property_account_creditor_price_difference_categ
#: model:ir.model.fields,field_description:purchase.field_product_product__property_account_creditor_price_difference
#: model:ir.model.fields,field_description:purchase.field_product_template__property_account_creditor_price_difference
@@ -1081,6 +1083,7 @@ msgstr ""
#: model:ir.model.fields,field_description:purchase.field_purchase_order__product_id
#: model:ir.model.fields,field_description:purchase.field_purchase_order_line__product_id
#: model:ir.model.fields,field_description:purchase.field_purchase_report__product_id
+#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_order
#: model:ir.ui.view,arch_db:purchase.purchase_order_line_search
msgid "Product"
msgstr ""
@@ -1151,6 +1154,7 @@ msgstr ""
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_procurement_management
+#: model:ir.ui.menu,name:purchase.menu_purchase_root
#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
msgid "Purchase"
msgstr ""
@@ -1177,7 +1181,7 @@ msgid "Purchase Lead Time"
msgstr ""
#. module: purchase
-#: code:addons/purchase/controllers/portal.py:54
+#: code:addons/purchase/controllers/portal.py:51
#: model:ir.actions.report,name:purchase.action_report_purchase_order
#: model:ir.model,name:purchase.model_purchase_order
#: model:ir.model.fields,field_description:purchase.field_account_invoice_line__purchase_id
@@ -1227,7 +1231,6 @@ msgid "Purchase Order Line"
msgstr ""
#. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
#: model:ir.ui.view,arch_db:purchase.purchase_order_form
#: model:ir.ui.view,arch_db:purchase.purchase_order_line_tree
msgid "Purchase Order Lines"
@@ -1302,10 +1305,25 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_product_product__purchased_product_qty
+#: model:ir.model.fields,field_description:purchase.field_product_template__purchased_product_qty
+msgid "Purchased"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.view,arch_db:purchase.view_purchase_order_search
+msgid "Purchased Last 365 Days"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.view,arch_db:purchase.product_normal_form_view_inherit_purchase
+#: model:ir.ui.view,arch_db:purchase.view_product_template_purchase_buttons_from
+msgid "Purchased in the last 365 days"
+msgstr ""
+
+#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_res_users__group_purchase_user
-#: model:ir.ui.menu,name:purchase.menu_purchase_root
#: model:ir.ui.view,arch_db:purchase.res_partner_view_purchase_buttons
-#: model:ir.ui.view,arch_db:purchase.view_product_template_purchase_buttons_from
msgid "Purchases"
msgstr ""
@@ -1431,7 +1449,6 @@ msgstr ""
#. module: purchase
#: model:ir.actions.report,name:purchase.report_purchase_quotation
-#: model:ir.ui.view,arch_db:purchase.purchase_order_form
#: model:ir.ui.view,arch_db:purchase.report_purchasequotation_document
msgid "Request for Quotation"
msgstr ""
@@ -1475,6 +1492,11 @@ msgid "Security Lead Time for Purchase"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__access_token
+msgid "Security Token"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.view,arch_db:purchase.view_invoice_supplier_purchase_form
msgid "Select a purchase order or an old bill"
msgstr ""
@@ -1519,6 +1541,11 @@ msgid "Settings"
msgstr ""
#. module: purchase
+#: model:ir.actions.server,name:purchase.model_purchase_order_action_share
+msgid "Share"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
msgid "Show all records which has next action date is before today"
msgstr ""
@@ -1583,11 +1610,6 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,help:purchase.field_purchase_order__website_url
-msgid "The full URL to access the document through the website."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_rfq
msgid "The quotation contains the history of the discussion\n"
" you had with your vendor."
@@ -1601,14 +1623,14 @@ msgid "The request for quotation is the first step of the purchases flow. Once\n
msgstr ""
#. module: purchase
-#: model:ir.model.fields,help:purchase.field_product_category__property_account_creditor_price_difference_categ
-msgid "This account will be used to value price difference between purchase price and accounting cost."
+#: model:ir.model.fields,help:purchase.field_product_product__property_account_creditor_price_difference
+#: model:ir.model.fields,help:purchase.field_product_template__property_account_creditor_price_difference
+msgid "This account is used in automated inventory valuation to record the price difference between a purchase order and its related vendor bill when validating this vendor bill."
msgstr ""
#. module: purchase
-#: model:ir.model.fields,help:purchase.field_product_product__property_account_creditor_price_difference
-#: model:ir.model.fields,help:purchase.field_product_template__property_account_creditor_price_difference
-msgid "This account will be used to value price difference between purchase price and cost price."
+#: model:ir.model.fields,help:purchase.field_product_category__property_account_creditor_price_difference_categ
+msgid "This account will be used to value price difference between purchase price and accounting cost."
msgstr ""
#. module: purchase
@@ -1634,13 +1656,13 @@ msgid "This note will show up on purchase orders."
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/account_invoice.py:154
+#: code:addons/purchase/models/account_invoice.py:155
#, python-format
msgid "This vendor bill has been created from: %s"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/account_invoice.py:168
+#: code:addons/purchase/models/account_invoice.py:169
#, python-format
msgid "This vendor bill has been modified from: %s"
msgstr ""
@@ -1668,7 +1690,7 @@ msgid "Today Activities"
msgstr ""
#. module: purchase
-#: code:addons/purchase/controllers/portal.py:45
+#: code:addons/purchase/controllers/portal.py:42
#: model:ir.model.fields,field_description:purchase.field_purchase_order__amount_total
#: model:ir.model.fields,field_description:purchase.field_purchase_order_line__price_total
#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_orders
@@ -1682,6 +1704,11 @@ msgid "Total Price"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order_line__product_uom_qty
+msgid "Total Quantity"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.view,arch_db:purchase.purchase_order_tree
msgid "Total Untaxed amount"
msgstr ""
@@ -1692,7 +1719,7 @@ msgid "Total amount"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:326
+#: code:addons/purchase/models/purchase.py:324
#, python-format
msgid "Unable to cancel this purchase order. You must first cancel the related vendor bills."
msgstr ""
@@ -1836,8 +1863,8 @@ msgid "Warning"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:229
-#: code:addons/purchase/models/purchase.py:557
+#: code:addons/purchase/models/purchase.py:227
+#: code:addons/purchase/models/purchase.py:576
#, python-format
msgid "Warning for %s"
msgstr ""
@@ -1863,11 +1890,6 @@ msgid "Website Messages"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order__website_url
-msgid "Website URL"
-msgstr ""
-
-#. module: purchase
#: model:ir.model.fields,help:purchase.field_purchase_order__website_message_ids
msgid "Website communication history"
msgstr ""
diff --git a/addons/purchase_mrp/i18n/purchase_mrp.pot b/addons/purchase_mrp/i18n/purchase_mrp.pot
index 664ae7c978f..337594d4442 100644
--- a/addons/purchase_mrp/i18n/purchase_mrp.pot
+++ b/addons/purchase_mrp/i18n/purchase_mrp.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:10+0000\n"
-"PO-Revision-Date: 2018-03-22 14:10+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: purchase_mrp
+#: model:ir.model,name:purchase_mrp.model_mrp_production
+msgid "Production"
+msgstr ""
+
+#. module: purchase_mrp
#: model:ir.model,name:purchase_mrp.model_purchase_order_line
msgid "Purchase Order Line"
msgstr ""
diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot
index 1f9b66bc8b8..0f2f5f1154e 100644
--- a/addons/purchase_requisition/i18n/purchase_requisition.pot
+++ b/addons/purchase_requisition/i18n/purchase_requisition.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -129,6 +129,11 @@ msgid "Blanket order"
msgstr ""
#. module: purchase_requisition
+#: model:purchase.requisition.type,name:purchase_requisition.type_multi
+msgid "Call for Tender"
+msgstr ""
+
+#. module: purchase_requisition
#: model:ir.actions.report,name:purchase_requisition.action_report_purchase_requisitions
#: model:ir.ui.view,arch_db:purchase_requisition.report_purchaserequisitions
msgid "Call for Tenders"
@@ -445,11 +450,6 @@ msgid "Procurement"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_rule
-msgid "Procurement Rule"
-msgstr ""
-
-#. module: purchase_requisition
#: model:ir.model,name:purchase_requisition.model_product_product
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line__product_id
msgid "Product"
@@ -547,16 +547,12 @@ msgid "Purchase Requisition Line"
msgstr ""
#. module: purchase_requisition
-#: model:purchase.requisition.type,name:purchase_requisition.type_multi
-msgid "Purchase Tender"
-msgstr ""
-
-#. module: purchase_requisition
#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
msgid "Purchase orders"
msgstr ""
#. module: purchase_requisition
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_order__is_quantity_copy
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__is_quantity_copy
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type__quantity_copy
msgid "Quantities"
@@ -676,6 +672,11 @@ msgid "Stock Move"
msgstr ""
#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_stock_rule
+msgid "Stock Rule"
+msgstr ""
+
+#. module: purchase_requisition
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line__supplier_info_ids
msgid "Supplier Info"
msgstr ""
@@ -771,7 +772,7 @@ msgstr ""
#. module: purchase_requisition
#: code:addons/purchase_requisition/models/purchase_requisition.py:122
#, python-format
-msgid "You cannot confirm agreement because there is no product line."
+msgid "You cannot confirm agreement '%s' because there is no product line."
msgstr ""
#. module: purchase_requisition
diff --git a/addons/purchase_stock/i18n/purchase_stock.pot b/addons/purchase_stock/i18n/purchase_stock.pot
index 694dd82c60d..80b704cabd6 100644
--- a/addons/purchase_stock/i18n/purchase_stock.pot
+++ b/addons/purchase_stock/i18n/purchase_stock.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:12+0000\n"
-"PO-Revision-Date: 2018-08-02 09:12+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,21 +16,19 @@ msgstr ""
"Plural-Forms: \n"
#. module: purchase_stock
-#: code:addons/purchase_stock/models/stock.py:123
-#, python-format
-msgid " Buy"
+#: model:ir.ui.view,arch_db:purchase_stock.stock_production_lot_view_form
+msgid "<span class=\"o_stat_text\">Purchase Orders</span>"
msgstr ""
#. module: purchase_stock
-#: model:ir.model.fields,field_description:purchase_stock.field_procurement_rule__action
+#: model:ir.model.fields,field_description:purchase_stock.field_stock_rule__action
msgid "Action"
msgstr ""
#. module: purchase_stock
-#: code:addons/purchase_stock/models/stock.py:118
-#: selection:procurement.rule,action:0
+#: model:ir.ui.view,arch_db:purchase_stock.purchase_report_stock_rule
#: model:stock.location.route,name:purchase_stock.route_warehouse0_buy
-#, python-format
+#: selection:stock.rule,action:0
msgid "Buy"
msgstr ""
@@ -40,9 +38,8 @@ msgid "Buy rule"
msgstr ""
#. module: purchase_stock
-#: code:addons/purchase_stock/models/stock.py:120
-#, python-format
-msgid "Can't find any Buy route. Please create a route with the 'Buy' action for your receipts operation types."
+#: model:ir.model.fields,field_description:purchase_stock.field_stock_warehouse__buy_to_resupply
+msgid "Buy to Resupply"
msgstr ""
#. module: purchase_stock
@@ -126,12 +123,17 @@ msgid "Logistics"
msgstr ""
#. module: purchase_stock
+#: model:ir.model,name:purchase_stock.model_stock_production_lot
+msgid "Lot/Serial"
+msgstr ""
+
+#. module: purchase_stock
#: model:ir.ui.view,arch_db:purchase_stock.exception_on_po
msgid "Manual actions may be needed."
msgstr ""
#. module: purchase_stock
-#: selection:procurement.rule,action:0
+#: selection:stock.rule,action:0
msgid "Manufacture"
msgstr ""
@@ -146,11 +148,6 @@ msgid "Minimum Inventory Rule"
msgstr ""
#. module: purchase_stock
-#: selection:procurement.rule,action:0
-msgid "Move From Another Location"
-msgstr ""
-
-#. module: purchase_stock
#: model:ir.ui.view,arch_db:purchase_stock.res_config_settings_view_form_stock
msgid "Move forward expected delivery dates by"
msgstr ""
@@ -176,13 +173,18 @@ msgid "Procurement Group"
msgstr ""
#. module: purchase_stock
-#: model:ir.model,name:purchase_stock.model_procurement_rule
-msgid "Procurement Rule"
+#: model:ir.model,name:purchase_stock.model_product_template
+msgid "Product Template"
msgstr ""
#. module: purchase_stock
-#: model:ir.model,name:purchase_stock.model_product_template
-msgid "Product Template"
+#: selection:stock.rule,action:0
+msgid "Pull & Push"
+msgstr ""
+
+#. module: purchase_stock
+#: selection:stock.rule,action:0
+msgid "Pull From"
msgstr ""
#. module: purchase_stock
@@ -198,12 +200,14 @@ msgstr ""
#. module: purchase_stock
#: model:ir.model.fields,field_description:purchase_stock.field_stock_picking__purchase_id
+#: model:ir.model.fields,field_description:purchase_stock.field_stock_production_lot__purchase_order_ids
+#: model:ir.ui.view,arch_db:purchase_stock.stock_production_lot_view_form
msgid "Purchase Orders"
msgstr ""
#. module: purchase_stock
-#: model:ir.model.fields,field_description:purchase_stock.field_stock_warehouse__buy_to_resupply
-msgid "Purchase to resupply this warehouse"
+#: model:ir.model.fields,field_description:purchase_stock.field_stock_production_lot__purchase_order_count
+msgid "Purchase order count"
msgstr ""
#. module: purchase_stock
@@ -212,6 +216,11 @@ msgid "Purchases Orders"
msgstr ""
#. module: purchase_stock
+#: selection:stock.rule,action:0
+msgid "Push To"
+msgstr ""
+
+#. module: purchase_stock
#: model:ir.ui.view,arch_db:purchase_stock.purchase_order_view_form_inherit
msgid "Receipt"
msgstr ""
@@ -263,18 +272,23 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase_stock
+#: model:ir.model,name:purchase_stock.model_stock_rule
+msgid "Stock Rule"
+msgstr ""
+
+#. module: purchase_stock
#: model:ir.model.fields,help:purchase_stock.field_purchase_order__default_location_dest_id_usage
msgid "Technical field used to display the Drop Ship Address"
msgstr ""
#. module: purchase_stock
-#: code:addons/purchase_stock/models/purchase.py:261
+#: code:addons/purchase_stock/models/purchase.py:265
#, python-format
msgid "The quantities on your purchase order indicate less than billed. You should ask for a refund. "
msgstr ""
#. module: purchase_stock
-#: code:addons/purchase_stock/models/procurement.py:22
+#: code:addons/purchase_stock/models/stock_rule.py:38
#, python-format
msgid "There is no vendor associated to the product %s. Please define a vendor for this product."
msgstr ""
@@ -312,14 +326,20 @@ msgid "When products are bought, they can be delivered to this warehouse"
msgstr ""
#. module: purchase_stock
-#: code:addons/purchase_stock/models/purchase.py:253
+#: code:addons/purchase_stock/models/stock_rule.py:20
+#, python-format
+msgid "When products are needed in <b>%s</b>, <br/> a request for quotation is created to fulfill the need."
+msgstr ""
+
+#. module: purchase_stock
+#: code:addons/purchase_stock/models/purchase.py:257
#, python-format
msgid "You cannot decrease the ordered quantity below the received quantity.\n"
"Create a return first."
msgstr ""
#. module: purchase_stock
-#: code:addons/purchase_stock/models/purchase.py:182
+#: code:addons/purchase_stock/models/purchase.py:186
#, python-format
msgid "You must set a Vendor Location for this partner %s"
msgstr ""
@@ -340,6 +360,11 @@ msgid "ordered instead of"
msgstr ""
#. module: purchase_stock
+#: model:ir.model,name:purchase_stock.model_report_stock_report_stock_rule
+msgid "report.stock.report_stock_rule"
+msgstr ""
+
+#. module: purchase_stock
#: model:ir.model,name:purchase_stock.model_res_config_settings
msgid "res.config.settings"
msgstr ""
diff --git a/addons/rating/i18n/rating.pot b/addons/rating/i18n/rating.pot
index 1d95e3a2c6c..d041e701129 100644
--- a/addons/rating/i18n/rating.pot
+++ b/addons/rating/i18n/rating.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -94,6 +94,11 @@ msgid "Enabled if the rating has been filled."
msgstr ""
#. module: rating
+#: model:ir.ui.view,arch_db:rating.rating_rating_view_kanban
+msgid "Feedback:\\n#{record.feedback.raw_value}"
+msgstr ""
+
+#. module: rating
#: model:ir.model.fields,field_description:rating.field_rating_rating__consumed
msgid "Filled Rating"
msgstr ""
diff --git a/addons/repair/i18n/repair.pot b/addons/repair/i18n/repair.pot
index cd5fdba38b6..cce6847c2cd 100644
--- a/addons/repair/i18n/repair.pot
+++ b/addons/repair/i18n/repair.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:06+0000\n"
+"PO-Revision-Date: 2018-08-24 09:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -48,19 +48,23 @@ msgstr ""
#. module: repair
#: model:mail.template,body_html:repair.mail_template_repair_quotation
msgid "<?xml version=\"1.0\"?>\n"
-"<data><p>Dear ${object.partner_id.name}</p>\n"
-" <p>\n"
-" Here is your repair order ${doc_name} <strong>${object.name}</strong>\n"
-" % if object.origin:\n"
-" (with reference: ${object.origin} )\n"
-" % endif\n"
-" % if object.invoice_method != 'none':\n"
-" amounting in <strong>${format_amount(object.amount_total, object.pricelist_id.currency_id)}.</strong>\n"
-" % endif\n"
-" </p>\n"
-" <p>You can reply to this email if you have any questions.</p>\n"
-" <p>Thank you,</p>\n"
-" </data>"
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+" <p style=\"margin: 0px; padding: 0px;font-size: 13px;\">\n"
+" Hello ${object.partner_id.name},<br/>\n"
+" Here is your repair order ${doc_name} <strong>${object.name}</strong>\n"
+" % if object.origin:\n"
+" (with reference: ${object.origin} )\n"
+" % endif\n"
+" % if object.invoice_method != 'none':\n"
+" amounting in <strong>${format_amount(object.amount_total, object.pricelist_id.currency_id)}.</strong><br/>\n"
+" % else:\n"
+" .<br/>\n"
+" % endif\n"
+" You can reply to this email if you have any questions.\n"
+" <br/><br/>\n"
+" Thank you,\n"
+" </p>\n"
+"</div>"
msgstr ""
#. module: repair
@@ -69,6 +73,11 @@ msgid "<i>(Add)</i>"
msgstr ""
#. module: repair
+#: model:ir.ui.view,arch_db:repair.view_cancel_repair
+msgid "<span class=\"o_form_label\">This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?</span>"
+msgstr ""
+
+#. module: repair
#: model:ir.ui.view,arch_db:repair.report_repairorder
msgid "<strong>Lot/Serial Number:</strong>"
msgstr ""
@@ -207,8 +216,8 @@ msgid "Confirmed"
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:604
-#: code:addons/repair/models/repair.py:662
+#: code:addons/repair/models/repair.py:607
+#: code:addons/repair/models/repair.py:667
#, python-format
msgid "Couldn't find a pricelist line matching this product and quantity.\n"
"You have to change either the product, the quantity or the pricelist."
@@ -434,7 +443,7 @@ msgid "Invoice and shipping address:"
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:384
+#: code:addons/repair/models/repair.py:385
#, python-format
msgid "Invoice created"
msgstr ""
@@ -555,34 +564,34 @@ msgid "No Invoice"
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:307
+#: code:addons/repair/models/repair.py:308
#, python-format
msgid "No account defined for partner \"%s\"."
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:333
-#: code:addons/repair/models/repair.py:361
+#: code:addons/repair/models/repair.py:334
+#: code:addons/repair/models/repair.py:362
#, python-format
msgid "No account defined for product \"%s\"."
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:595
-#: code:addons/repair/models/repair.py:653
+#: code:addons/repair/models/repair.py:598
+#: code:addons/repair/models/repair.py:658
#, python-format
msgid "No pricelist found."
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:354
+#: code:addons/repair/models/repair.py:355
#, python-format
msgid "No product defined on fees."
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:602
-#: code:addons/repair/models/repair.py:660
+#: code:addons/repair/models/repair.py:605
+#: code:addons/repair/models/repair.py:665
#, python-format
msgid "No valid pricelist line found."
msgstr ""
@@ -805,19 +814,19 @@ msgid "Repair must be canceled in order to reset it to draft."
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:403
+#: code:addons/repair/models/repair.py:404
#, python-format
msgid "Repair must be confirmed before starting reparation."
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:431
+#: code:addons/repair/models/repair.py:432
#, python-format
msgid "Repair must be repaired in order to make the product moves."
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:414
+#: code:addons/repair/models/repair.py:415
#, python-format
msgid "Repair must be under repair in order to end reparation."
msgstr ""
@@ -866,7 +875,7 @@ msgid "Send Quotation"
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:544
+#: code:addons/repair/models/repair.py:545
#, python-format
msgid "Serial number is required for operation line with product '%s'"
msgstr ""
@@ -965,11 +974,6 @@ msgid "This is the location where the product to repair is located."
msgstr ""
#. module: repair
-#: model:ir.ui.view,arch_db:repair.view_cancel_repair
-msgid "This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"
-msgstr ""
-
-#. module: repair
#: selection:repair.order,state:0
msgid "To be Invoiced"
msgstr ""
@@ -1069,15 +1073,15 @@ msgid "Yes"
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:597
-#: code:addons/repair/models/repair.py:655
+#: code:addons/repair/models/repair.py:600
+#: code:addons/repair/models/repair.py:660
#, python-format
msgid "You have to select a pricelist in the Repair form !\n"
" Please set one before choosing a product."
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:295
+#: code:addons/repair/models/repair.py:296
#, python-format
msgid "You have to select an invoice address in the repair form."
msgstr ""
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index 3bec74b142b..44c10bf21ac 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,64 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: sale
-#: model:mail.template,body_html:sale.email_template_edi_sale
-msgid "\n"
-"<p>Dear ${object.partner_id.name}\n"
-"% set access_action = object.with_context(force_website=True).get_access_action()\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 == '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"
-" (<i>${object.partner_id.parent_id.name}</i>)\n"
-"% endif\n"
-",</p>\n"
-"<p>\n"
-"Here is\n"
-"% if ctx.get('proforma')\n"
-"in attachment, your pro-forma invoice\n"
-"% else\n"
-"the ${doc_name} <strong>${object.name}</strong>\n"
-"% endif\n"
-"% if object.origin:\n"
-"(with reference: ${object.origin} )\n"
-"% endif\n"
-"amounting in <strong>${format_amount(object.amount_total, object.pricelist_id.currency_id)}</strong>\n"
-"from ${object.company_id.name}.\n"
-"</p>\n"
-"\n"
-"% if is_online and not ctx.get('proforma'):\n"
-" <br/><br/>\n"
-" <center>\n"
-" <a href=\"${access_url}\" style=\"background-color: #1abc9c; padding: 20px; text-decoration: none; color: #fff; border-radius: 5px; font-size: 16px;\" class=\"o_default_snippet_text\">${access_name}</a>\n"
-" <br/><br/><br/>\n"
-" <span style=\"color:#888888\">(or view attached PDF)</span>\n"
-" </center>\n"
-" <br/>\n"
-"% endif\n"
-"\n"
-"<p>You can reply to this email if you have any questions.</p>\n"
-"<p>Thank you,</p>\n"
-"\n"
-"<p style=\"color:#888888;\">\n"
-"% if object.user_id and object.user_id.signature:\n"
-" ${object.user_id.signature | safe}\n"
-"% endif\n"
-"</p>\n"
-""
-msgstr ""
-
-#. module: sale
-#: model:ir.model.fields,field_description:sale.field_product_product__sales_count
-#: model:ir.model.fields,field_description:sale.field_product_template__sales_count
-msgid "# Sales"
+#: model:ir.model.fields,field_description:sale.field_sale_report__nbr
+msgid "# of Lines"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_report__nbr
-msgid "# of Lines"
+#: model:ir.model.fields,field_description:sale.field_payment_transaction__sale_order_ids_nbr
+msgid "# of Sales Orders"
msgstr ""
#. module: sale
@@ -87,9 +36,8 @@ msgid "${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotat
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.report_invoice_layouted
-#: model:ir.ui.view,arch_db:sale.report_saleorder_document
-msgid "&amp;bull;"
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
+msgid "% discount"
msgstr ""
#. module: sale
@@ -98,117 +46,215 @@ msgid "&amp;nbsp;"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
msgid "&amp;nbsp;<span>on</span>&amp;nbsp;"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
-msgid "<i class=\"fa fa-arrow-circle-right\"/> Accept &amp; Sign"
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "&amp;times;"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
-msgid "<i class=\"fa fa-check-circle\"/> Signed"
+#: model:ir.ui.view,arch_db:sale.brand_promotion
+msgid ",\n"
+" an awesome"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_my_orders
-msgid "<span class=\"hidden-xs\">Sales Order #</span>\n"
-" <span class=\"visible-xs\">Ref.</span>"
+#: model:ir.ui.view,arch_db:sale.sale_quotation_onboarding_panel
+msgid "/sale/static/src/img/sale_quotation_onboarding_bg.jpg"
+msgstr ""
+
+#. module: sale
+#. openerp-web
+#: code:addons/sale/static/src/js/tour.js:64
+#, python-format
+msgid "<b>Print this quotation to preview it.</b>"
+msgstr ""
+
+#. module: sale
+#: model:mail.template,body_html:sale.email_template_edi_sale
+msgid "<div style=\"margin: 0px; padding: 0px;\">\n"
+" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+" % set doc_name = 'quotation' if object.state in ('draft', 'sent') else 'order'\n"
+" Dear ${object.partner_id.name}\n"
+" % if object.partner_id.parent_id:\n"
+" (${object.partner_id.parent_id.name})\n"
+" % endif\n"
+" <br/><br/>\n"
+" Here is\n"
+" % if ctx.get('proforma')\n"
+" in attachment your pro-forma invoice\n"
+" % else\n"
+" the ${doc_name} <strong>${object.name}</strong>\n"
+" % endif\n"
+" % if object.origin:\n"
+" (with reference: ${object.origin} )\n"
+" % endif\n"
+" amounting in <strong>${format_amount(object.amount_total, object.pricelist_id.currency_id)}</strong>\n"
+" from ${object.company_id.name}.\n"
+" <br/><br/>\n"
+" Do not hesitate to contact us if you have any question.\n"
+" </p>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "<i class=\"fa fa-check\"/> Accept"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "<i class=\"fa fa-check\"/> Pay Now"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "<i class=\"fa fa-comment\"/> Contact us"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "<i class=\"fa fa-comment\"/> Feedback"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "<i class=\"fa fa-times\"/> Reject"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
+msgid "<span class=\"badge badge-info orders_label_text_align\"><i class=\"fa fa-fw fa-clock-o\"/> Waiting Payment</span>"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.portal_my_quotations
-msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-clock-o\"/> Expired</span>"
+msgid "<span class=\"badge badge-secondary\"><i class=\"fa fa-fw fa-clock-o\"/> Expired</span>"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.portal_my_quotations
-#: model:ir.ui.view,arch_db:sale.portal_order_page
-msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/> Cancelled</span>"
+msgid "<span class=\"badge badge-secondary\"><i class=\"fa fa-fw fa-remove\"/> Cancelled</span>"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.portal_my_orders
+msgid "<span class=\"badge badge-success d-none d-md-inline-block\"><i class=\"fa fa-fw fa-check\" role=\"img\" aria-label=\"Done\" title=\"Done\"/><span class=\"d-none d-md-inline\"> Done</span></span>"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
-msgid "<span class=\"label label-info orders_label_text_align\"><i class=\"fa fa-fw fa-clock-o\"/> Waiting</span>"
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
+msgid "<span class=\"badge badge-success orders_label_text_align\"><i class=\"fa fa-fw fa-check\"/> Paid</span>"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.portal_my_orders
-msgid "<span class=\"label label-success hidden-xs\"><i class=\"fa fa-fw fa-check\"/><span class=\"hidden-xs\"> Done</span></span>"
+msgid "<span class=\"d-none d-md-inline\">Sales Order #</span>\n"
+" <span class=\"d-block d-md-none\">Ref.</span>"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
-msgid "<span class=\"label label-success orders_label_text_align\"><i class=\"fa fa-fw fa-check\"/> Paid</span>"
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "<span class=\"o_form_label\">Down Payments</span>"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
-msgid "<span class=\"label label-success\"><i class=\"fa fa-fw fa-check\"/> Done</span>"
+#: model:ir.ui.view,arch_db:sale.product_form_view_sale_order_button
+#: model:ir.ui.view,arch_db:sale.product_template_form_view_sale_order_button
+msgid "<span class=\"o_stat_text\">Sold</span>"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.report_saleorder_document
-msgid "<span>Pro-Forma Invoice # </span>"
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
+msgid "<span groups=\"account.group_show_line_subtotals_tax_excluded\">Amount</span>\n"
+" <span groups=\"account.group_show_line_subtotals_tax_included\">Total Price</span>"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
-msgid "<strong>Contact</strong>"
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "<span>\n"
+" , for an amount of </span>"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "<span>, for an amount of </span>"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
-msgid "<strong>Date Ordered:</strong>"
+msgid "<span>Disc.(%)</span>"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
-msgid "<strong>Date:</strong>"
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
+msgid "<span>Discount</span>"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "<span>I agree that by paying this proposal, I accept it on the behalf of </span>"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
-msgid "<strong>Discount</strong>"
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "<span>I agree that by signing this proposal, I accept it on the behalf of </span>"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
-msgid "<strong>Expiration Date:</strong>"
+msgid "<span>Pro-Forma Invoice # </span>"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
+msgid "<span>Taxes</span>"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "<span>with payment terms: </span>"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
-msgid "<strong>Fiscal Position Remark:</strong>"
+msgid "<strong>Date Ordered:</strong>"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
-msgid "<strong>Invoices</strong>"
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
+msgid "<strong>Date:</strong>"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
-msgid "<strong>Invoicing Address</strong>"
+#: model:ir.ui.view,arch_db:sale.report_saleorder_document
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
+msgid "<strong>Expiration Date:</strong>"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
-msgid "<strong>Payment Terms:</strong>"
+msgid "<strong>Fiscal Position Remark:</strong>"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
+msgid "<strong>Invoices</strong>"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
-msgid "<strong>Product</strong>"
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
+msgid "<strong>Invoicing Address</strong>"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
-msgid "<strong>Quantity</strong>"
+#: model:ir.ui.view,arch_db:sale.report_saleorder_document
+msgid "<strong>Payment Terms:</strong>"
msgstr ""
#. module: sale
@@ -222,7 +268,7 @@ msgid "<strong>Salesperson:</strong>"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
msgid "<strong>Shipping Address</strong>"
msgstr ""
@@ -233,26 +279,48 @@ msgid "<strong>Shipping address:</strong>"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.report_invoice_layouted
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
-msgid "<strong>Subtotal: </strong>"
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
+msgid "<strong>Signature</strong>"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
+msgid "<strong>Subtotal:</strong>"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.report_saleorder_document
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
msgid "<strong>Subtotal</strong>"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "<strong>This offer expired!</strong><br/>\n"
+" Contact us for new quotation."
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "<strong>This offer expires in</strong>"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "<strong>This quotation has been canceled.</strong> Contact us to get a new quotation."
+msgstr ""
+
+#. module: sale
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
msgid "<strong>Total</strong>"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
-msgid "<strong>Unit Price</strong>"
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "<strong>Your Contact:</strong>"
msgstr ""
#. module: sale
@@ -261,13 +329,37 @@ msgid "<strong>Your Reference:</strong>"
msgstr ""
#. module: sale
+#: code:addons/sale/models/sale.py:783
+#, python-format
+msgid "A journal must be specified of the acquirer %s."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/models/sale.py:776
+#, python-format
+msgid "A payment acquirer is required to create a transaction."
+msgstr ""
+
+#. module: sale
#: selection:res.config.settings,sale_pricelist_setting:0
msgid "A single sales price per product"
msgstr ""
#. module: sale
+#: code:addons/sale/models/sale.py:747
+#, python-format
+msgid "A transaction can't be linked to sales orders having different currencies."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/models/sale.py:752
+#, python-format
+msgid "A transaction can't be linked to sales orders having different partners."
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,help:sale.action_orders_upselling
-msgid "A typical example is the pre-paid hours of service, \n"
+msgid "A typical example is the pre-paid hours of service,\n"
" where you want to sell extra hours to the customer\n"
" because the initial hours have already been used."
msgstr ""
@@ -284,8 +376,13 @@ msgid "Ability to select a package type in sales orders and to force a quantity
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
-msgid "Accept &amp; Sign"
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "Accept &amp;"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__access_warning
+msgid "Access warning"
msgstr ""
#. module: sale
@@ -299,6 +396,11 @@ msgid "According to product configuration, the delivered quantity can be automat
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_payment_acquirer_onboarding_wizard__acc_number
+msgid "Account Number"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,help:sale.field_sale_advance_payment_inv__deposit_account_id
msgid "Account used for deposits"
msgstr ""
@@ -325,13 +427,18 @@ msgid "Activity Types"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_layout_category__pagebreak
-msgid "Add pagebreak"
+#: model:ir.ui.view,arch_db:sale.view_order_form
+msgid "Add a note"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.view_order_form
+msgid "Add a product"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_layout_category__subtotal
-msgid "Add subtotal"
+#: model:ir.ui.view,arch_db:sale.view_order_form
+msgid "Add a section"
msgstr ""
#. module: sale
@@ -353,7 +460,7 @@ msgstr ""
#. module: sale
#: model:ir.model,name:sale.model_report_all_channels_sales
-msgid "All sales orders grouped by sales channels"
+msgid "All sales orders grouped by Sales Teams"
msgstr ""
#. module: sale
@@ -372,19 +479,13 @@ msgid "Allows you to send pro-forma invoice."
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.report_invoice_layouted
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
msgid "Amount"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_report__amount_invoiced
-msgid "Amount Invoiced"
-msgstr ""
-
-#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_report__amount_to_invoice
-msgid "Amount To Invoice"
+#: model:ir.model.fields,field_description:sale.field_sale_order__amount_undiscounted
+msgid "Amount Before Discount"
msgstr ""
#. module: sale
@@ -420,6 +521,16 @@ msgid "Analytic lines"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_onboarding_quotation_layout_form
+msgid "Apply"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.view_order_form
+msgid "Are you sure you want to void the authorized transaction? This action can't be undone."
+msgstr ""
+
+#. module: sale
#: selection:product.template,expense_policy:0
msgid "At cost"
msgstr ""
@@ -436,6 +547,40 @@ msgid "Attributes"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__authorized_transaction_ids
+msgid "Authorized Transactions"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_config_settings__automatic_invoice
+msgid "Automatic Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
+msgid "Back to Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_payment_acquirer_onboarding_wizard__journal_name
+msgid "Bank Name"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/models/payment.py:14
+#: selection:payment.acquirer,so_reference_type:0
+#, python-format
+msgid "Based on Customer ID"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/models/payment.py:13
+#: selection:payment.acquirer,so_reference_type:0
+#, python-format
+msgid "Based on Document Reference"
+msgstr ""
+
+#. module: sale
#: selection:product.template,sale_line_warn:0
#: selection:res.partner,sale_warn:0
msgid "Blocking Message"
@@ -447,16 +592,12 @@ msgid "Boost your sales with two kinds of discount programs: promotions and coup
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.report_configuration_search_view
-msgid "Breaks Page"
-msgstr ""
-
-#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_line__product_updatable
msgid "Can Edit Product"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
#: model:ir.ui.view,arch_db:sale.view_order_form
#: model:ir.ui.view,arch_db:sale.view_sale_advance_payment_inv
msgid "Cancel"
@@ -469,13 +610,30 @@ msgid "Cancelled"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.view_order_form
+msgid "Capture Transaction"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,help:sale.field_crm_team__use_quotations
msgid "Check this box if you send quotations to your customers rather than confirming orders straight away. This will add specific action buttons to your dashboard."
msgstr ""
#. module: sale
#: model:ir.model.fields,help:sale.field_crm_team__use_invoices
-msgid "Check this box to set an invoicing target for this sales channel."
+msgid "Check this box to set an invoicing target for this Sales Team."
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_onboarding_order_confirmation_step
+msgid "Choose how to confirm quotations and get paid."
+msgstr ""
+
+#. module: sale
+#. openerp-web
+#: code:addons/sale/static/src/js/tour.js:35
+#, python-format
+msgid "Click here to add some products or services to your quotation."
msgstr ""
#. module: sale
@@ -484,11 +642,32 @@ msgid "Click to define a target"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "Close"
+msgstr ""
+
+#. module: sale
+#: selection:res.company,sale_quotation_onboarding_state:0
+msgid "Closed"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_report__commercial_partner_id
msgid "Commercial Entity"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__commitment_date
+msgid "Commitment Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_payment_acquirer__so_reference_type
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "Communication"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_res_company
msgid "Companies"
msgstr ""
@@ -543,13 +722,24 @@ msgid "Configuration"
msgstr ""
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_open_sale_onboarding_quotation_layout
+msgid "Configure your document layout"
+msgstr ""
+
+#. module: sale
#: model:ir.ui.view,arch_db:sale.view_order_form
-msgid "Confirm Sale"
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_onboarding_order_confirmation_step
+msgid "Confirmation &amp; Payment"
msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order__confirmation_date
#: model:ir.model.fields,field_description:sale.field_sale_report__confirmation_date
+#: model:ir.ui.view,arch_db:sale.sale_order_view_search_inherit_sale
#: model:ir.ui.view,arch_db:sale.view_order_product_search
#: model:ir.ui.view,arch_db:sale.view_order_tree
msgid "Confirmation Date"
@@ -557,6 +747,7 @@ msgstr ""
#. module: sale
#: model:ir.model,name:sale.model_res_partner
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
msgid "Contact"
msgstr ""
@@ -576,11 +767,17 @@ msgid "Create Invoices"
msgstr ""
#. module: sale
+#: model:ir.actions.act_window,help:sale.product_template_action
+msgid "Create a new product"
+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
#: model:ir.actions.act_window,help:sale.action_orders_salesteams
#: model:ir.actions.act_window,help:sale.action_quotations
#: model:ir.actions.act_window,help:sale.action_quotations_salesteams
+#: model:ir.actions.act_window,help:sale.action_quotations_with_onboarding
msgid "Create a new quotation, the first step of a new sale!"
msgstr ""
@@ -591,21 +788,22 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv__create_uid
-#: model:ir.model.fields,field_description:sale.field_sale_layout_category__create_uid
#: model:ir.model.fields,field_description:sale.field_sale_order__create_uid
#: model:ir.model.fields,field_description:sale.field_sale_order_line__create_uid
+#: model:ir.model.fields,field_description:sale.field_sale_payment_acquirer_onboarding_wizard__create_uid
msgid "Created by"
msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv__create_date
-#: model:ir.model.fields,field_description:sale.field_sale_layout_category__create_date
#: model:ir.model.fields,field_description:sale.field_sale_order_line__create_date
+#: model:ir.model.fields,field_description:sale.field_sale_payment_acquirer_onboarding_wizard__create_date
msgid "Created on"
msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order__create_date
+#: model:ir.ui.view,arch_db:sale.sale_order_view_search_inherit_quotation
msgid "Creation Date"
msgstr ""
@@ -616,8 +814,13 @@ msgid "Currency"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.report_all_channels_sales_view_search
-msgid "Current Year Sales"
+#: model:ir.model.fields,field_description:sale.field_sale_order__currency_rate
+msgid "Currency Rate"
+msgstr ""
+
+#. module: sale
+#: selection:sale.payment.acquirer.onboarding.wizard,payment_method:0
+msgid "Custom payment instructions"
msgstr ""
#. module: sale
@@ -646,7 +849,7 @@ msgid "Customer Country"
msgstr ""
#. module: sale
-#: model:ir.model.fields,help:sale.field_sale_order__portal_url
+#: model:ir.model.fields,help:sale.field_sale_order__access_url
msgid "Customer Portal URL"
msgstr ""
@@ -666,13 +869,28 @@ msgid "Customers"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.onboarding_quotation_layout_step
+msgid "Customize"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.onboarding_quotation_layout_step
+msgid "Customize the look of your quotations."
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_res_config_settings__module_delivery_dhl
msgid "DHL Connector"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.report_all_channels_sales_view_search
+#: model:ir.ui.view,arch_db:sale.view_order_product_search
+msgid "Date"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales__date_order
-#: model:ir.model.fields,field_description:sale.field_sale_report__date
msgid "Date Order"
msgstr ""
@@ -687,6 +905,22 @@ msgid "Date on which the sales order is confirmed."
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "Default Limit:"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_config_settings__use_quotation_validity_days
+msgid "Default Quotation Validity"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_company__quotation_validity_days
+#: model:ir.model.fields,field_description:sale.field_res_config_settings__quotation_validity_days
+msgid "Default Quotation Validity (Days)"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_res_config_settings__use_sale_note
msgid "Default Terms & Conditions"
msgstr ""
@@ -712,7 +946,7 @@ msgid "Delivered Manually"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:846
+#: code:addons/sale/models/sale.py:999
#: model:ir.ui.view,arch_db:sale.view_order_form
#, python-format
msgid "Delivered Quantity"
@@ -730,6 +964,11 @@ msgid "Delivery Address"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_config_settings__group_sale_order_dates
+msgid "Delivery Date"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_line__customer_lead
msgid "Delivery Lead Time"
msgstr ""
@@ -745,20 +984,25 @@ msgid "Delivery address for current sales order."
msgstr ""
#. module: sale
+#: model:ir.model.fields,help:sale.field_sale_order__expected_date
+msgid "Delivery date you can promise to the customer, computed from product lead times and from the shipping policy of the order."
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_res_config_settings__deposit_default_product_id
msgid "Deposit Product"
msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_line__name
-#: model:ir.ui.view,arch_db:sale.report_invoice_layouted
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
+#: model:ir.ui.view,arch_db:sale.view_order_form
msgid "Description"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
-msgid "Design standardized offers"
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
+msgid "Details"
msgstr ""
#. module: sale
@@ -767,9 +1011,8 @@ msgid "Digital Content"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.report_invoice_layouted
-#: model:ir.ui.view,arch_db:sale.report_saleorder_document
-msgid "Disc.(%)"
+#: model:ir.model.fields,field_description:sale.field_sale_report__discount
+msgid "Discount %"
msgstr ""
#. module: sale
@@ -778,6 +1021,11 @@ msgid "Discount (%)"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_report__discount_amount
+msgid "Discount Amount"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_product_pricelist__discount_policy
msgid "Discount Policy"
msgstr ""
@@ -802,14 +1050,26 @@ msgstr ""
#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales__display_name
#: model:ir.model.fields,field_description:sale.field_report_sale_report_saleproforma__display_name
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv__display_name
-#: model:ir.model.fields,field_description:sale.field_sale_layout_category__display_name
#: model:ir.model.fields,field_description:sale.field_sale_order__display_name
#: model:ir.model.fields,field_description:sale.field_sale_order_line__display_name
+#: model:ir.model.fields,field_description:sale.field_sale_payment_acquirer_onboarding_wizard__display_name
#: model:ir.model.fields,field_description:sale.field_sale_report__display_name
msgid "Display Name"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order_line__display_type
+msgid "Display Type"
+msgstr ""
+
+#. module: sale
+#: selection:res.company,sale_onboarding_order_confirmation_state:0
+#: selection:res.company,sale_onboarding_sample_quotation_state:0
+#: selection:res.company,sale_quotation_onboarding_state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:87
#, python-format
msgid "Down Payment"
@@ -826,11 +1086,6 @@ msgid "Down Payment Product"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
-msgid "Down Payments"
-msgstr ""
-
-#. module: sale
#: selection:sale.advance.payment.inv,advance_payment_method:0
msgid "Down payment (fixed amount)"
msgstr ""
@@ -852,11 +1107,6 @@ msgid "Down payments are made when creating invoices from a sales order. They ar
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
-msgid "Download"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,state:0
msgid "Draft Quotation"
msgstr ""
@@ -867,12 +1117,44 @@ msgid "Easypost Connector"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
+msgid "Edit Quotation"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_company__portal_confirmation_pay
+#: model:ir.model.fields,field_description:sale.field_res_config_settings__portal_confirmation_pay
+msgid "Electronic Payment"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_config_settings__template_id
+msgid "Email Template"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__expected_date
+msgid "Expected Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,help:sale.field_product_product__expense_policy
+#: model:ir.model.fields,help:sale.field_product_template__expense_policy
+msgid "Expenses registered in Expense app or in a vendor bill (with an analytic account set) can be automatically re-invoiced to the customer. This is useful for customer projects. With this option activated, the validated expense is added to the sales order linked to the analytic account, in order to be invoiced. With Project Management, such an analytic account can be automatically generated at the order confirmation, if set on the Service Tracking option of one product item."
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_view_search_inherit_quotation
+msgid "Expiration Date"
+msgstr ""
+
+#. module: sale
#: model:ir.ui.view,arch_db:sale.view_order_product_search
msgid "Extended Filters"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:829
+#: code:addons/sale/models/sale.py:973
#, python-format
msgid "Extra line with %s "
msgstr ""
@@ -903,8 +1185,8 @@ msgid "Followers (Partners)"
msgstr ""
#. module: sale
-#: selection:res.config.settings,auth_signup_uninvited:0
-msgid "Free sign up (B2C)"
+#: sql_constraint:sale.order.line:0
+msgid "Forbidden values on non-accountable sale order line"
msgstr ""
#. module: sale
@@ -925,6 +1207,11 @@ msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "Generate the invoice automatically when the electronic payment is confirmed"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
msgid "Get warnings in orders for products or customers"
msgstr ""
@@ -942,17 +1229,23 @@ msgid "Group By"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.report_configuration_search_view
-msgid "Group By Name"
+#: model:ir.model.fields,field_description:sale.field_product_product__hide_expense_policy
+#: model:ir.model.fields,field_description:sale.field_product_template__hide_expense_policy
+msgid "Hide Expense Policy"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_open_sale_onboarding_payment_acquirer_wizard
+msgid "How your customers can confirm an order"
msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales__id
#: model:ir.model.fields,field_description:sale.field_report_sale_report_saleproforma__id
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv__id
-#: model:ir.model.fields,field_description:sale.field_sale_layout_category__id
#: model:ir.model.fields,field_description:sale.field_sale_order__id
#: model:ir.model.fields,field_description:sale.field_sale_order_line__id
+#: model:ir.model.fields,field_description:sale.field_sale_payment_acquirer_onboarding_wizard__id
#: model:ir.model.fields,field_description:sale.field_sale_report__id
msgid "ID"
msgstr ""
@@ -983,6 +1276,23 @@ msgid "Image of the product variant (Big-sized image of product template if fals
msgstr ""
#. module: sale
+#: code:addons/sale/models/product_template.py:77
+#, python-format
+msgid "Import Template for Products"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/models/product_template.py:80
+#, python-format
+msgid "Import Template for Products (with several prices)"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "Incl. tax)"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv__deposit_account_id
msgid "Income Account"
msgstr ""
@@ -993,9 +1303,15 @@ msgid "Insert your terms & conditions here..."
msgstr ""
#. module: sale
-#: code:addons/sale/controllers/portal.py:216
+#: code:addons/sale/models/sale.py:766
#, python-format
-msgid "Invalid order"
+msgid "Invalid token found! Token acquirer %s != %s"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/models/sale.py:769
+#, python-format
+msgid "Invalid token found! Token partner %s != %s"
msgstr ""
#. module: sale
@@ -1004,7 +1320,7 @@ msgid "Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/models/account_invoice.py:55
+#: code:addons/sale/models/account_invoice.py:62
#, python-format
msgid "Invoice %s paid"
msgstr ""
@@ -1087,11 +1403,12 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_line__qty_invoiced
+#: selection:sale.report,state:0
msgid "Invoiced"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:847
+#: code:addons/sale/models/sale.py:1000
#: model:ir.ui.view,arch_db:sale.view_order_form
#, python-format
msgid "Invoiced Quantity"
@@ -1189,36 +1506,48 @@ msgid "Is true if the sales order line comes from an expense or a vendor bills"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:866
+#: code:addons/sale/models/sale.py:1022
#, python-format
msgid "It is forbidden to modify the following fields in a locked order:\n"
"%s"
msgstr ""
#. module: sale
+#: selection:res.company,sale_onboarding_order_confirmation_state:0
+#: selection:res.company,sale_onboarding_sample_quotation_state:0
+#: selection:res.company,sale_quotation_onboarding_state:0
+msgid "Just done"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.report_all_channels_sales_view_search
+msgid "Last 365 Days"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales____last_update
#: model:ir.model.fields,field_description:sale.field_report_sale_report_saleproforma____last_update
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv____last_update
-#: model:ir.model.fields,field_description:sale.field_sale_layout_category____last_update
#: model:ir.model.fields,field_description:sale.field_sale_order____last_update
#: model:ir.model.fields,field_description:sale.field_sale_order_line____last_update
+#: model:ir.model.fields,field_description:sale.field_sale_payment_acquirer_onboarding_wizard____last_update
#: model:ir.model.fields,field_description:sale.field_sale_report____last_update
msgid "Last Modified on"
msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv__write_uid
-#: model:ir.model.fields,field_description:sale.field_sale_layout_category__write_uid
#: model:ir.model.fields,field_description:sale.field_sale_order__write_uid
#: model:ir.model.fields,field_description:sale.field_sale_order_line__write_uid
+#: model:ir.model.fields,field_description:sale.field_sale_payment_acquirer_onboarding_wizard__write_uid
msgid "Last Updated by"
msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv__write_date
-#: model:ir.model.fields,field_description:sale.field_sale_layout_category__write_date
#: model:ir.model.fields,field_description:sale.field_sale_order__write_date
#: model:ir.model.fields,field_description:sale.field_sale_order_line__write_date
+#: model:ir.model.fields,field_description:sale.field_sale_payment_acquirer_onboarding_wizard__write_date
msgid "Last Updated on"
msgstr ""
@@ -1228,24 +1557,15 @@ msgid "Late Activities"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_account_invoice_line__layout_category_sequence
-#: model:ir.model.fields,field_description:sale.field_sale_order_line__layout_category_sequence
-msgid "Layout Sequence"
-msgstr ""
-
-#. module: sale
#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
msgid "Let your customers log in to see their documents"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
-msgid "Let your customers sign &amp; pay online"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
-msgid "Line subtotals in sales orders"
+#. openerp-web
+#: code:addons/sale/static/src/js/tour.js:18
+#, python-format
+msgid "Let's create a new quotation.<br/><i>Note that colored buttons usually point to the next logical actions.</i>"
msgstr ""
#. module: sale
@@ -1264,6 +1584,21 @@ msgid "Locked"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.onboarding_quotation_layout_step
+msgid "Looks great!"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "Manage delivery dates from sales orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_sale_order_dates
+msgid "Manage delivery dates from sales orders."
+msgstr ""
+
+#. module: sale
#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
msgid "Manage promotion &amp; coupon programs"
msgstr ""
@@ -1292,11 +1627,6 @@ msgid "Margins"
msgstr ""
#. module: sale
-#: model:sale.layout_category,name:sale.sale_layout_cat_2
-msgid "Material"
-msgstr ""
-
-#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order__message_has_error
msgid "Message Delivery error"
msgstr ""
@@ -1319,11 +1649,21 @@ msgid "Messages"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_payment_acquirer_onboarding_wizard__manual_name
+msgid "Method"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_line__qty_delivered_method
msgid "Method to update delivered qty"
msgstr ""
#. module: sale
+#: sql_constraint:sale.order.line:0
+msgid "Missing required fields on accountable sale order line."
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_res_config_settings__multi_sales_price
msgid "Multiple Sales Prices per Product"
msgstr ""
@@ -1350,16 +1690,16 @@ msgid "My Sales Order Lines"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_layout_category__name
-#: model:ir.ui.view,arch_db:sale.report_configuration_search_view
-msgid "Name"
+#: model:ir.model.fields,help:sale.field_sale_order__signed_by
+msgid "Name of the person that signed the SO."
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:116
-#: code:addons/sale/models/sale.py:276
-#: code:addons/sale/models/sale.py:278
-#: code:addons/sale/models/sale.py:280
+#: code:addons/sale/models/sale.py:118
+#: code:addons/sale/models/sale.py:342
+#: code:addons/sale/models/sale.py:344
+#: code:addons/sale/models/sale.py:346
+#: selection:sale.report,state:0
#, python-format
msgid "New"
msgstr ""
@@ -1411,6 +1751,19 @@ msgid "No orders to upsell found"
msgstr ""
#. module: sale
+#: selection:res.company,sale_onboarding_order_confirmation_state:0
+#: selection:res.company,sale_onboarding_sample_quotation_state:0
+#: selection:res.company,sale_quotation_onboarding_state:0
+msgid "Not done"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.view_order_form
+#: selection:sale.order.line,display_type:0
+msgid "Note"
+msgstr ""
+
+#. module: sale
#: selection:sale.order,invoice_status:0
#: selection:sale.order.line,invoice_status:0
msgid "Nothing to Invoice"
@@ -1457,8 +1810,8 @@ msgid "Number of unread messages"
msgstr ""
#. module: sale
-#: selection:res.config.settings,auth_signup_uninvited:0
-msgid "On invitation (B2B)"
+#: model:ir.ui.view,arch_db:sale.brand_promotion
+msgid "Odoo"
msgstr ""
#. module: sale
@@ -1466,6 +1819,7 @@ msgstr ""
#: model:ir.actions.act_window,help:sale.action_orders_salesteams
#: model:ir.actions.act_window,help:sale.action_quotations
#: model:ir.actions.act_window,help:sale.action_quotations_salesteams
+#: model:ir.actions.act_window,help:sale.action_quotations_with_onboarding
msgid "Once the quotation is confirmed by the customer, it becomes a sales order.<br> You will be able to create an invoice and collect the payment."
msgstr ""
@@ -1475,13 +1829,16 @@ msgid "Once the quotation is confirmed, it becomes a sales order.<br> You will b
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_res_config_settings__portal_confirmation
-msgid "Online Signature & Payment"
+#. openerp-web
+#: code:addons/sale/static/src/js/tour.js:59
+#, python-format
+msgid "Once your quotation is ready, you can save, print or send it by email."
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_res_config_settings__portal_confirmation_options
-msgid "Online Signature & Payment options"
+#: model:ir.model.fields,field_description:sale.field_res_company__portal_confirmation_sign
+#: model:ir.model.fields,field_description:sale.field_res_config_settings__portal_confirmation_sign
+msgid "Online Signature"
msgstr ""
#. module: sale
@@ -1492,14 +1849,12 @@ msgid "Only Integer Value should be valid."
msgstr ""
#. module: sale
-#: code:addons/sale/controllers/portal.py:209
-#, python-format
-msgid "Operation not allowed"
+#: model:ir.ui.view,arch_db:sale.brand_promotion
+msgid "Open Source CRM"
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.portal_my_home_menu_sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
#: model:ir.ui.view,arch_db:sale.view_sales_order_line_filter
msgid "Order"
msgstr ""
@@ -1515,9 +1870,10 @@ msgid "Order Count"
msgstr ""
#. module: sale
-#: code:addons/sale/controllers/portal.py:86
-#: code:addons/sale/controllers/portal.py:138
+#: code:addons/sale/controllers/portal.py:50
+#: code:addons/sale/controllers/portal.py:102
#: model:ir.model.fields,field_description:sale.field_sale_order__date_order
+#: model:ir.model.fields,field_description:sale.field_sale_report__date
#: model:ir.ui.view,arch_db:sale.portal_my_orders
#: model:ir.ui.view,arch_db:sale.portal_my_quotations
#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
@@ -1526,8 +1882,8 @@ msgid "Order Date"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
-msgid "Order Line Sections"
+#: model:ir.model.fields,field_description:sale.field_sale_report__order_id
+msgid "Order ID"
msgstr ""
#. module: sale
@@ -1560,18 +1916,6 @@ msgid "Order Upsell"
msgstr ""
#. module: sale
-#: code:addons/sale/controllers/portal.py:218
-#, python-format
-msgid "Order is not in a state requiring customer validation."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/controllers/portal.py:225
-#, python-format
-msgid "Order signed by %s"
-msgstr ""
-
-#. module: sale
#: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban
msgid "Order to Invoice"
msgstr ""
@@ -1582,7 +1926,7 @@ msgid "Ordered Qty"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:843
+#: code:addons/sale/models/sale.py:996
#: model:ir.model.fields,field_description:sale.field_sale_order_line__product_uom_qty
#: model:ir.ui.view,arch_db:sale.view_order_form
#, python-format
@@ -1626,6 +1970,13 @@ msgid "Orders to Upsell"
msgstr ""
#. module: sale
+#. openerp-web
+#: code:addons/sale/static/src/js/tour.js:13
+#, python-format
+msgid "Organize your sales activities with the <b>Sales Management app</b>."
+msgstr ""
+
+#. module: sale
#: model:ir.ui.view,arch_db:sale.view_order_form
msgid "Other Information"
msgstr ""
@@ -1641,6 +1992,11 @@ msgid "PRO-FORMA Invoice"
msgstr ""
#. module: sale
+#: selection:sale.report,state:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales__partner_id
msgid "Partner"
msgstr ""
@@ -1651,8 +2007,70 @@ msgid "Partner Country"
msgstr ""
#. module: sale
-#: selection:res.config.settings,portal_confirmation_options:0
-msgid "Payment"
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "Pay"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/models/payment.py:146
+#, python-format
+msgid "Pay Now"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "Pay with"
+msgstr ""
+
+#. module: sale
+#: selection:sale.payment.acquirer.onboarding.wizard,payment_method:0
+msgid "Pay with PayPal"
+msgstr ""
+
+#. module: sale
+#: selection:res.company,sale_onboarding_payment_method:0
+#: selection:sale.payment.acquirer.onboarding.wizard,payment_method:0
+msgid "Pay with another payment acquirer"
+msgstr ""
+
+#. module: sale
+#: selection:sale.payment.acquirer.onboarding.wizard,payment_method:0
+msgid "Pay with credit card (via Stripe)"
+msgstr ""
+
+#. module: sale
+#: selection:res.company,sale_onboarding_payment_method:0
+msgid "PayPal"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_payment_acquirer_onboarding_wizard__paypal_email_account
+msgid "PayPal Email ID"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_payment_acquirer
+msgid "Payment Acquirer"
+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_payment_acquirer_onboarding_wizard__manual_post_msg
+msgid "Payment Instructions"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_payment_acquirer_onboarding_wizard__payment_method
+msgid "Payment Method"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__reference
+msgid "Payment Ref."
msgstr ""
#. module: sale
@@ -1661,9 +2079,18 @@ msgid "Payment Terms"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_res_users__has_group_sale_layout
-#: model:res.groups,name:sale.group_sale_layout
-msgid "Personalize sales order and invoice report"
+#: model:ir.model,name:sale.model_payment_transaction
+msgid "Payment Transaction"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_payment_acquirer_onboarding_wizard__paypal_seller_account
+msgid "Paypal Merchant ID"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_payment_acquirer_onboarding_wizard__paypal_pdt_token
+msgid "Paypal PDT Token"
msgstr ""
#. module: sale
@@ -1677,23 +2104,33 @@ msgid "Planned"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:380
+#: code:addons/sale/models/sale.py:425
#, python-format
msgid "Please define an accounting sales journal for this company."
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:1046
+#: code:addons/sale/models/sale.py:1253
#, python-format
msgid "Please define income account for this product: \"%s\" (id:%d) - or for its category: \"%s\"."
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_order__portal_url
+#: model:ir.model.fields,field_description:sale.field_sale_order__access_url
msgid "Portal Access URL"
msgstr ""
#. module: sale
+#: selection:sale.report,state:0
+msgid "Posted"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.brand_promotion
+msgid "Powered by"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_line__price_reduce
msgid "Price Reduce"
msgstr ""
@@ -1754,6 +2191,7 @@ msgid "Pricing"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
#: model:ir.ui.view,arch_db:sale.view_order_form
msgid "Print"
msgstr ""
@@ -1772,10 +2210,10 @@ msgstr ""
#. module: sale
#: model:ir.model,name:sale.model_product_product
#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales__product_id
-#: model:ir.model.fields,field_description:sale.field_sale_order__product_id
#: model:ir.model.fields,field_description:sale.field_sale_order_line__product_id
#: model:ir.model.fields,field_description:sale.field_sale_report__product_id
#: model:ir.ui.view,arch_db:sale.view_order_product_search
+#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
#: model:ir.ui.view,arch_db:sale.view_sales_order_line_filter
msgid "Product"
msgstr ""
@@ -1786,6 +2224,11 @@ msgid "Product Catalog"
msgstr ""
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_product_category_config_sale
+msgid "Product Categories"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales__categ_id
#: model:ir.model.fields,field_description:sale.field_sale_report__categ_id
#: model:ir.ui.view,arch_db:sale.view_order_product_search
@@ -1821,9 +2264,11 @@ msgid "Product used for down payments"
msgstr ""
#. module: sale
+#: model:ir.actions.act_window,name:sale.product_template_action
#: model:ir.ui.menu,name:sale.menu_product_template_action
#: model:ir.ui.menu,name:sale.prod_config_main
#: model:ir.ui.menu,name:sale.product_menu_catalog
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
msgid "Products"
msgstr ""
@@ -1858,8 +2303,8 @@ msgid "Quantities to invoice from sales orders"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.report_invoice_layouted
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
msgid "Quantity"
msgstr ""
@@ -1872,7 +2317,7 @@ msgstr ""
#: model:ir.model,name:sale.model_sale_order
#: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban
#: model:ir.ui.view,arch_db:sale.portal_my_home_menu_sale
-#: model:ir.ui.view,arch_db:sale.portal_order_page
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
#: model:ir.ui.view,arch_db:sale.view_quotation_tree
#: selection:sale.order,state:0
msgid "Quotation"
@@ -1895,17 +2340,28 @@ msgid "Quotation Date"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.onboarding_quotation_layout_step
+msgid "Quotation Layout"
+msgstr ""
+
+#. module: sale
#: model:ir.ui.view,arch_db:sale.view_quotation_tree
msgid "Quotation Number"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.view_order_product_search
#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Quotation Sent"
msgstr ""
#. module: sale
+#: sql_constraint:res.company:0
+msgid "Quotation Validity is required and must be greater than 0."
+msgstr ""
+
+#. module: sale
#: model:mail.message.subtype,description:sale.mt_order_confirmed
msgid "Quotation confirmed"
msgstr ""
@@ -1918,9 +2374,16 @@ msgid "Quotation sent"
msgstr ""
#. module: sale
+#: code:addons/sale/controllers/portal.py:160
+#, python-format
+msgid "Quotation viewed by customer"
+msgstr ""
+
+#. module: sale
#: code:addons/sale/models/sales_team.py:101
#: model:ir.actions.act_window,name:sale.action_quotations
#: model:ir.actions.act_window,name:sale.action_quotations_salesteams
+#: model:ir.actions.act_window,name:sale.action_quotations_with_onboarding
#: model:ir.model.fields,field_description:sale.field_crm_team__use_quotations
#: model:ir.ui.menu,name:sale.menu_sale_quotations
#: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban
@@ -1949,29 +2412,19 @@ msgid "Quotations Sent"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_res_config_settings__module_website_quote
-msgid "Quotations Templates"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
msgid "Quotations and Sales"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_order__validity_date
-msgid "Quote Validity"
-msgstr ""
-
-#. module: sale
#: model:ir.model.fields,field_description:sale.field_product_product__expense_policy
#: model:ir.model.fields,field_description:sale.field_product_template__expense_policy
msgid "Re-Invoice Policy"
msgstr ""
#. module: sale
-#: code:addons/sale/controllers/portal.py:87
-#: code:addons/sale/controllers/portal.py:139
+#: code:addons/sale/controllers/portal.py:51
+#: code:addons/sale/controllers/portal.py:103
#, python-format
msgid "Reference"
msgstr ""
@@ -1982,15 +2435,18 @@ msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.report_configuration_action
-#: model:ir.ui.view,arch_db:sale.report_configuration_form_view
-#: model:ir.ui.view,arch_db:sale.report_configuration_tree_view
-msgid "Report Configuration"
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "Reject"
msgstr ""
#. module: sale
-#: model:ir.ui.menu,name:sale.Report_configuration
-msgid "Report Layout Categories"
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "Reject This Quotation"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__remaining_validity_days
+msgid "Remaining Validity Days"
msgstr ""
#. module: sale
@@ -2000,6 +2456,22 @@ msgid "Reporting"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "Request an electronic payment to confirm orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "Request an online signature to confirm orders"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/models/sale.py:335
+#, python-format
+msgid "Requested date is too soon."
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order__activity_user_id
msgid "Responsible User"
msgstr ""
@@ -2011,13 +2483,13 @@ msgid "Sale Order Count"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_res_config_settings__group_warning_sale
-msgid "Sale Order Warnings"
+#: model:ir.model.fields,field_description:sale.field_res_users__has_group_sale_order_dates
+msgid "Sale Order Dates"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_res_config_settings__module_sale_payment
-msgid "Sale Payment"
+#: model:ir.model.fields,field_description:sale.field_res_config_settings__group_warning_sale
+msgid "Sale Order Warnings"
msgstr ""
#. module: sale
@@ -2026,16 +2498,18 @@ msgid "Sale Warnings"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_company__sale_onboarding_payment_method
+msgid "Sale onboarding selected payment method"
+msgstr ""
+
+#. module: sale
#: selection:crm.team,dashboard_graph_model:0
#: model:ir.ui.menu,name:sale.menu_report_product_all
#: model:ir.ui.menu,name:sale.sale_menu_root
#: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban
-#: model:ir.ui.view,arch_db:sale.product_form_view_sale_order_button
-#: model:ir.ui.view,arch_db:sale.product_template_form_view_sale_order_button
#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
#: model:ir.ui.view,arch_db:sale.res_partner_view_buttons
#: model:ir.ui.view,arch_db:sale.sale_order_view_search_inherit_quotation
-#: model:ir.ui.view,arch_db:sale.view_order_product_search
msgid "Sales"
msgstr ""
@@ -2054,31 +2528,6 @@ msgid "Sales Analysis"
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_crm_team
-#: model:ir.model.fields,field_description:sale.field_account_invoice__team_id
-#: model:ir.model.fields,field_description:sale.field_account_invoice_report__team_id
-#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales__team_id
-#: model:ir.model.fields,field_description:sale.field_sale_order__team_id
-#: model:ir.model.fields,field_description:sale.field_sale_report__team_id
-#: model:ir.ui.view,arch_db:sale.account_invoice_groupby_inherit
-#: model:ir.ui.view,arch_db:sale.report_all_channels_sales_view_search
-#: model:ir.ui.view,arch_db:sale.view_account_invoice_report_search_inherit
-#: model:ir.ui.view,arch_db:sale.view_order_product_search
-#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
-msgid "Sales Channel"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.report_sales_team
-msgid "Sales Channel Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.sales_team_config
-msgid "Sales Channels"
-msgstr ""
-
-#. module: sale
#: selection:sale.report,state:0
msgid "Sales Done"
msgstr ""
@@ -2091,6 +2540,7 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_res_partner__sale_order_ids
#: model:ir.model.fields,field_description:sale.field_res_users__sale_order_ids
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
#: model:ir.ui.view,arch_db:sale.view_order_form
#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
#: selection:sale.order,state:0
@@ -2113,7 +2563,6 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_product_sale_list
#: model:ir.model.fields,field_description:sale.field_account_invoice_line__sale_line_ids
#: model:ir.ui.view,arch_db:sale.view_order_form
#: model:ir.ui.view,arch_db:sale.view_order_line_tree
@@ -2131,15 +2580,24 @@ msgid "Sales Order Lines related to a Sales Order of mine"
msgstr ""
#. module: sale
+#: code:addons/sale/models/payment.py:118
+#: model:ir.ui.view,arch_db:sale.transaction_form_inherit_sale
+#, python-format
+msgid "Sales Order(s)"
+msgstr ""
+
+#. module: sale
#: code:addons/sale/models/sales_team.py:102
#: model:ir.actions.act_window,name:sale.action_orders
#: model:ir.actions.act_window,name:sale.action_orders_salesteams
#: model:ir.actions.act_window,name:sale.action_orders_to_invoice_salesteams
+#: model:ir.model.fields,field_description:sale.field_payment_transaction__sale_order_ids
#: model:ir.ui.menu,name:sale.menu_sales_config
#: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban
#: model:ir.ui.view,arch_db:sale.portal_my_home_menu_sale
#: model:ir.ui.view,arch_db:sale.portal_my_home_sale
#: model:ir.ui.view,arch_db:sale.portal_my_orders
+#: model:ir.ui.view,arch_db:sale.view_order_product_search
#: model:ir.ui.view,arch_db:sale.view_order_tree
#: model:ir.ui.view,arch_db:sale.view_sale_order_calendar
#: model:ir.ui.view,arch_db:sale.view_sale_order_graph
@@ -2154,6 +2612,27 @@ msgid "Sales Orders Statistics"
msgstr ""
#. module: sale
+#: model:ir.model,name:sale.model_crm_team
+#: model:ir.model.fields,field_description:sale.field_account_invoice__team_id
+#: model:ir.model.fields,field_description:sale.field_account_invoice_report__team_id
+#: model:ir.model.fields,field_description:sale.field_report_all_channels_sales__team_id
+#: model:ir.model.fields,field_description:sale.field_sale_order__team_id
+#: model:ir.model.fields,field_description:sale.field_sale_report__team_id
+#: model:ir.ui.view,arch_db:sale.account_invoice_groupby_inherit
+#: model:ir.ui.view,arch_db:sale.report_all_channels_sales_view_search
+#: model:ir.ui.view,arch_db:sale.view_account_invoice_report_search_inherit
+#: model:ir.ui.view,arch_db:sale.view_order_product_search
+#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
+msgid "Sales Team"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.report_sales_team
+#: model:ir.ui.menu,name:sale.sales_team_config
+msgid "Sales Teams"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_res_partner__sale_warn
#: model:ir.model.fields,field_description:sale.field_res_users__sale_warn
msgid "Sales Warnings"
@@ -2161,7 +2640,6 @@ msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.report_all_channels_sales_action
-#: model:ir.ui.menu,name:sale.report_all_channels_sales
msgid "Sales by Channel"
msgstr ""
@@ -2194,8 +2672,20 @@ msgid "Salesperson"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.report_configuration_search_view
-msgid "Search Name"
+#: code:addons/sale/models/res_company.py:60
+#, python-format
+msgid "Sample Order Line"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/models/res_company.py:57
+#, python-format
+msgid "Sample Product"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_onboarding_sample_quotation_step
+msgid "Sample Quotation"
msgstr ""
#. module: sale
@@ -2205,14 +2695,13 @@ msgid "Search Sales Order"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_account_invoice_line__layout_category_id
-#: model:ir.model.fields,field_description:sale.field_sale_order_line__layout_category_id
+#: selection:sale.order.line,display_type:0
msgid "Section"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_res_config_settings__group_sale_layout
-msgid "Sections on Sales Orders"
+#: model:ir.ui.view,arch_db:sale.view_order_form
+msgid "Section Name (eg. Products, Services)"
msgstr ""
#. module: sale
@@ -2221,6 +2710,13 @@ msgid "Security Token"
msgstr ""
#. module: sale
+#. openerp-web
+#: code:addons/sale/static/src/js/tour.js:40
+#, python-format
+msgid "Select a product, or create a new one on the fly."
+msgstr ""
+
+#. module: sale
#: 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
@@ -2249,29 +2745,43 @@ msgid "Send a product-specific email once the invoice is paid"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_onboarding_sample_quotation_step
+msgid "Send a quotation to test the customer portal."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_open_sale_onboarding_sample_quotation
+msgid "Send a sample quotation."
+msgstr ""
+
+#. module: sale
#: model:ir.ui.view,arch_db:sale.view_order_form
msgid "Send by Email"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_onboarding_sample_quotation_step
+msgid "Send sample"
+msgstr ""
+
+#. module: sale
#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
msgid "Sending an email is useful if you need to share specific information or content about a product (instructions, rules, links, media, etc.). Create and set the email template from the product detail form (in Sales tab)."
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_layout_category__sequence
#: model:ir.model.fields,field_description:sale.field_sale_order_line__sequence
msgid "Sequence"
msgstr ""
#. module: sale
-#: model:sale.layout_category,name:sale.sale_layout_cat_1
-msgid "Services"
+#: model:ir.model.fields,field_description:sale.field_crm_team__use_invoices
+msgid "Set Invoicing Target"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_crm_team__use_invoices
-msgid "Set Invoicing Target"
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "Set a default validity on your quotations"
msgstr ""
#. module: sale
@@ -2287,6 +2797,11 @@ msgid "Set multiple prices per product, automated discounts, etc."
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_onboarding_order_confirmation_step
+msgid "Set payments"
+msgstr ""
+
+#. module: sale
#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
msgid "Set product attributes (e.g. color, size) to sell variants"
msgstr ""
@@ -2308,6 +2823,11 @@ msgid "Settings"
msgstr ""
#. module: sale
+#: model:ir.actions.server,name:sale.model_sale_order_action_share
+msgid "Share"
+msgstr ""
+
+#. module: sale
#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
msgid "Shipping"
msgstr ""
@@ -2318,20 +2838,13 @@ msgid "Shipping Costs"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
-msgid "Show all records which has next action date is before today"
-msgstr ""
-
-#. module: sale
-#: model:ir.model.fields,field_description:sale.field_res_users__has_group_show_price_total
-#: model:res.groups,comment:sale.group_show_price_total
-msgid "Show line subtotals with taxes included (B2C)"
+#: model:ir.ui.view,arch_db:sale.view_order_form
+msgid "Shipping Information"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_res_users__has_group_show_price_subtotal
-#: model:res.groups,comment:sale.group_show_price_subtotal
-msgid "Show line subtotals without taxes (B2B)"
+#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
+msgid "Show all records which has next action date is before today"
msgstr ""
#. module: sale
@@ -2350,29 +2863,36 @@ msgid "Show standard terms &amp; conditions on orders"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_res_config_settings__group_show_price_subtotal
-msgid "Show subtotal"
+#: selection:res.company,sale_onboarding_payment_method:0
+#: selection:sale.payment.acquirer.onboarding.wizard,payment_method:0
+msgid "Sign online"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_res_config_settings__group_show_price_total
-msgid "Show total"
+#: model:ir.model.fields,field_description:sale.field_sale_order__signature
+msgid "Signature"
msgstr ""
#. module: sale
-#: selection:res.config.settings,portal_confirmation_options:0
-msgid "Signature"
+#: model:ir.model.fields,help:sale.field_sale_order__signature
+msgid "Signature received through the portal."
msgstr ""
#. module: sale
-#: code:addons/sale/controllers/portal.py:211
-#, python-format
-msgid "Signature is missing."
+#: model:ir.model.fields,field_description:sale.field_sale_order__signed_by
+msgid "Signed by"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
-msgid "Sort products in sections with subtotals and page-breaks"
+#: model:ir.model.fields,field_description:sale.field_product_product__sales_count
+#: model:ir.model.fields,field_description:sale.field_product_template__sales_count
+msgid "Sold"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.product_form_view_sale_order_button
+#: model:ir.ui.view,arch_db:sale.product_template_form_view_sale_order_button
+msgid "Sold in the last 365 days"
msgstr ""
#. module: sale
@@ -2386,13 +2906,28 @@ msgid "Specific Email"
msgstr ""
#. module: sale
-#: code:addons/sale/controllers/portal.py:88
-#: code:addons/sale/controllers/portal.py:140
+#: code:addons/sale/controllers/portal.py:52
+#: code:addons/sale/controllers/portal.py:104
#, python-format
msgid "Stage"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_company__sale_onboarding_order_confirmation_state
+msgid "State of the onboarding confirmation order step"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_company__sale_onboarding_sample_quotation_state
+msgid "State of the onboarding sample quotation step"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_company__sale_quotation_onboarding_state
+msgid "State of the sale onboarding panel"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order__state
#: model:ir.model.fields,field_description:sale.field_sale_report__state
#: model:ir.ui.view,arch_db:sale.view_order_product_search
@@ -2413,50 +2948,38 @@ msgid "Stock Moves"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_order_line__price_subtotal
-#: model:ir.ui.view,arch_db:sale.invoice_form_inherit_sale
-msgid "Subtotal"
-msgstr ""
-
-#. module: sale
-#: model:ir.model.fields,help:sale.field_crm_team__invoiced_target
-msgid "Target of invoice revenue for the current month. This is the amount the sales channel estimates to be able to invoice this month."
+#: selection:res.company,sale_onboarding_payment_method:0
+msgid "Stripe"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.report_saleorder_document
-msgid "Tax Amount"
+#: model:ir.model.fields,field_description:sale.field_sale_payment_acquirer_onboarding_wizard__stripe_publishable_key
+msgid "Stripe Publishable Key"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_res_config_settings__sale_show_tax
-msgid "Tax Display"
+#: model:ir.model.fields,field_description:sale.field_sale_payment_acquirer_onboarding_wizard__stripe_secret_key
+msgid "Stripe Secret Key"
msgstr ""
#. module: sale
-#: model:res.groups,name:sale.group_show_price_subtotal
-msgid "Tax display B2B"
-msgstr ""
-
-#. module: sale
-#: model:res.groups,name:sale.group_show_price_total
-msgid "Tax display B2C"
+#: model:ir.model.fields,field_description:sale.field_sale_order_line__price_subtotal
+msgid "Subtotal"
msgstr ""
#. module: sale
-#: selection:res.config.settings,sale_show_tax:0
-msgid "Tax-Excluded Prices"
+#: model:ir.model.fields,help:sale.field_crm_team__invoiced_target
+msgid "Target of invoice revenue for the current month. This is the amount the sales channel estimates to be able to invoice this month."
msgstr ""
#. module: sale
-#: selection:res.config.settings,sale_show_tax:0
-msgid "Tax-Included Prices"
+#: model:ir.model.fields,field_description:sale.field_sale_order__amount_by_group
+msgid "Taxe amount by group"
msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order__amount_tax
#: model:ir.model.fields,field_description:sale.field_sale_order_line__tax_id
-#: model:ir.ui.view,arch_db:sale.report_invoice_layouted
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
msgid "Taxes"
msgstr ""
@@ -2467,8 +2990,13 @@ msgid "Taxes used for deposits"
msgstr ""
#. module: sale
-#: model:ir.model.fields,help:sale.field_res_config_settings__module_sale_payment
-msgid "Technical field implied by user choice of online_confirmation"
+#: model:ir.model.fields,help:sale.field_sale_order_line__display_type
+msgid "Technical field for UX purpose."
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "Tell us why you are refusing this quotation, this will help us improve our services."
msgstr ""
#. module: sale
@@ -2477,6 +3005,11 @@ msgid "Terms & Conditions"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
+msgid "Terms &amp; Conditions"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order__note
msgid "Terms and conditions"
msgstr ""
@@ -2503,17 +3036,35 @@ msgid "The analytic account related to a sales order."
msgstr ""
#. module: sale
+#: code:addons/sale/models/sale.py:336
+#, python-format
+msgid "The date requested by the customer is sooner than the commitment date. You may be unable to honor the customer's request."
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,help:sale.field_crm_team__dashboard_graph_model
msgid "The graph this channel will display in the Dashboard.\n"
""
msgstr ""
#. module: sale
+#: model:ir.model.fields,help:sale.field_res_config_settings__automatic_invoice
+msgid "The invoice is generated automatically and available in the customer portal when the transaction is confirmed by the payment acquirer.\n"
+"The invoice is marked as paid and the payment is registered in the payment journal defined in the configuration of the payment acquirer.\n"
+"This mode is advised if you issue the final invoice at the order and not after the delivery."
+msgstr ""
+
+#. module: sale
#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
msgid "The margin is computed as the sum of product sales prices minus the cost set in their detail form."
msgstr ""
#. module: sale
+#: model:ir.model.fields,help:sale.field_sale_order__reference
+msgid "The payment communication of this sale order."
+msgstr ""
+
+#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:154
#, python-format
msgid "The product used to invoice a down payment should be of type 'Service'. Please use another product or update this product."
@@ -2526,6 +3077,11 @@ msgid "The product used to invoice a down payment should have an invoice policy
msgstr ""
#. module: sale
+#: model:ir.model.fields,help:sale.field_sale_order__currency_rate
+msgid "The rate of the currency to the currency of rate 1 applicable at the date of the order"
+msgstr ""
+
+#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:80
#, python-format
msgid "The value of the down payment amount must be positive."
@@ -2553,31 +3109,43 @@ msgid "There is no income account defined for this product: \"%s\". You may have
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:465
-#: code:addons/sale/models/sale.py:469
+#: code:addons/sale/models/sale.py:524
+#: code:addons/sale/models/sale.py:528
#, python-format
msgid "There is no invoiceable line. If a product has a Delivered quantities invoicing policy, please make sure that a quantity has been delivered."
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_error
-msgid "There was an error processing this page."
+#: model:ir.actions.act_window,help:sale.action_orders_upselling
+msgid "These are orders with products invoiced based on ordered quantities,\n"
+" in the case you have delivered more than what was ordered."
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders_upselling
-msgid "These are orders with products invoiced based on ordered quantities, \n"
-" in the case you have delivered more than what was ordered."
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "This default value is applied to any new product created. This can be changed in the product detail form."
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.view_order_product_search
-msgid "This Year"
+#: model:ir.model.fields,help:sale.field_sale_order__commitment_date
+msgid "This is the delivery date promised to the customer. If set, the delivery order will be scheduled based on this date rather than product lead times."
msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
-msgid "This default value is applied to any new product created. This can be changed in the product detail form."
+#: model:res.groups,comment:sale.group_sale_order_dates
+msgid "This option introduces extra fields in the sales order to easily schedule product deliveries on your own: expected date, commitment date, effective date."
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "This order"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "This order has been validated. Thanks for your trust\n"
+" and do not hesitate to"
msgstr ""
#. module: sale
@@ -2630,10 +3198,8 @@ msgstr ""
#: model:ir.model.fields,field_description:sale.field_sale_order__amount_total
#: model:ir.model.fields,field_description:sale.field_sale_order_line__price_total
#: model:ir.model.fields,field_description:sale.field_sale_report__price_total
-#: model:ir.ui.view,arch_db:sale.invoice_form_inherit_sale
#: model:ir.ui.view,arch_db:sale.portal_my_orders
#: model:ir.ui.view,arch_db:sale.portal_my_quotations
-#: model:ir.ui.view,arch_db:sale.report_configuration_search_view
#: model:ir.ui.view,arch_db:sale.view_order_line_tree
msgid "Total"
msgstr ""
@@ -2662,6 +3228,11 @@ msgid "Track Service"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__transaction_ids
+msgid "Transactions"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_res_config_settings__module_delivery_ups
msgid "UPS Connector"
msgstr ""
@@ -2672,15 +3243,15 @@ msgid "USPS Connector"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:612
+#: code:addons/sale/models/sale.py:699
#, 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
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_content
msgid "Unit Price"
msgstr ""
@@ -2730,12 +3301,28 @@ msgid "Untaxed Amount"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_report__untaxed_amount_invoiced
+msgid "Untaxed Amount Invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order_line__untaxed_amount_to_invoice
+#: model:ir.model.fields,field_description:sale.field_sale_report__untaxed_amount_to_invoice
+msgid "Untaxed Amount To Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order_line__untaxed_amount_invoiced
+msgid "Untaxed Invoiced Amount"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_report__price_subtotal
msgid "Untaxed Total"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:311
+#: code:addons/sale/models/sale.py:377
#, python-format
msgid "Upsell <a href='#' data-oe-model='%s' data-oe-id='%d'>%s</a> for customer <a href='#' data-oe-model='%s' data-oe-id='%s'>%s</a>"
msgstr ""
@@ -2752,6 +3339,20 @@ msgid "Upselling Opportunity"
msgstr ""
#. module: sale
+#. openerp-web
+#: code:addons/sale/static/src/js/tour.js:69
+#, python-format
+msgid "Use the breadcrumbs to <b>go back to preceeding screens</b>."
+msgstr ""
+
+#. module: sale
+#. openerp-web
+#: code:addons/sale/static/src/js/tour.js:73
+#, python-format
+msgid "Use this menu to access quotations, sales orders and customers."
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_res_users
msgid "Users"
msgstr ""
@@ -2762,11 +3363,26 @@ msgid "Valid Until"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "Validate Order"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__validity_date
+msgid "Validity"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,help:sale.field_sale_order__validity_date
msgid "Validity date of the quotation, after this date, the customer won't be able to validate the quotation online."
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.view_order_form
+msgid "Void Transaction"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_report__volume
msgid "Volume"
msgstr ""
@@ -2778,7 +3394,7 @@ msgid "Warning"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:1136
+#: code:addons/sale/models/sale.py:1343
#, python-format
msgid "Warning for %s"
msgstr ""
@@ -2795,6 +3411,11 @@ msgid "Warning when Selling this Product"
msgstr ""
#. module: sale
+#: model:ir.actions.report,name:sale.report_web_quote
+msgid "Web Quotation"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order__website_message_ids
msgid "Website Messages"
msgstr ""
@@ -2810,6 +3431,18 @@ msgid "What do you want to invoice?"
msgstr ""
#. module: sale
+#: selection:res.company,sale_onboarding_payment_method:0
+msgid "Wire Transfer"
+msgstr ""
+
+#. module: sale
+#. openerp-web
+#: code:addons/sale/static/src/js/tour.js:23
+#, python-format
+msgid "Write the name of your customer to create one on the fly, or select an existing one."
+msgstr ""
+
+#. module: sale
#. openerp-web
#: code:addons/sale/static/src/js/sale.js:32
#, python-format
@@ -2817,13 +3450,18 @@ msgid "Wrong value entered!"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:189
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "You can"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/models/sale.py:244
#, python-format
msgid "You can not delete a sent quotation or a confirmed sales order. You must first cancel it."
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:1197
+#: code:addons/sale/models/sale.py:1401
#, python-format
msgid "You can not remove an order line once the sales order is confirmed.\n"
"You should rather set the quantity to 0."
@@ -2836,9 +3474,34 @@ msgid "You can select all orders and invoice them in batch,<br>\n"
msgstr ""
#. module: sale
-#: code:addons/sale/controllers/portal.py:229
-#, python-format
-msgid "Your Order has been confirmed."
+#: model:ir.model.fields,help:sale.field_payment_acquirer__so_reference_type
+msgid "You can set here the communication type that will appear on sales orders.The communication will be given to the customer when they choose the payment method."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.product_template_action
+msgid "You must define a product for everything you purchase,\n"
+" whether it's a physical product, a consumable or services."
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "Your advantage:"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "Your feedback....."
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "Your message has been successfully sent!"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_quotation_onboarding_panel
+msgid "action_close_sale_quotation_onboarding"
msgstr ""
#. module: sale
@@ -2847,34 +3510,87 @@ msgid "bpost Connector"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_order_error
-#: model:ir.ui.view,arch_db:sale.portal_order_success
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
msgid "close"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "contact us"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "day"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
#: model:ir.ui.view,arch_db:sale.view_order_form
msgid "days"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "for\n"
+" any question."
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "for\n"
+" any questions."
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "has already been cancelled!"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "has already been validated!"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_portal_template
+msgid "has not yet been sent!"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_quotation_onboarding_panel
+msgid "o_onboarding_violet"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_report_sale_report_saleproforma
msgid "report.sale.report_saleproforma"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_quotation_onboarding_panel
+msgid "res.company"
+msgstr ""
+
+#. module: sale
#: model:ir.model,name:sale.model_res_config_settings
msgid "res.config.settings"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:93
+#: code:addons/sale/models/sale.py:98
#, python-format
msgid "sale order"
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_layout_category
-msgid "sale.layout_category"
+#: model:ir.model,name:sale.model_sale_payment_acquirer_onboarding_wizard
+msgid "sale.payment.acquirer.onboarding.wizard"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,help:sale.field_sale_order__amount_by_group
+msgid "type: [(name, amount, base, formated amount, formated base)]"
msgstr ""
diff --git a/addons/sale_crm/i18n/sale_crm.pot b/addons/sale_crm/i18n/sale_crm.pot
index 44d03a63dc2..4d92241f4b7 100644
--- a/addons/sale_crm/i18n/sale_crm.pot
+++ b/addons/sale_crm/i18n/sale_crm.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -107,7 +107,7 @@ msgstr ""
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_crm_team
-msgid "Sales Channel"
+msgid "Sales Team"
msgstr ""
#. module: sale_crm
diff --git a/addons/sale_expense/i18n/sale_expense.pot b/addons/sale_expense/i18n/sale_expense.pot
index 790d015a620..75ac3e048ed 100644
--- a/addons/sale_expense/i18n/sale_expense.pot
+++ b/addons/sale_expense/i18n/sale_expense.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:10+0000\n"
-"PO-Revision-Date: 2018-03-22 14:10+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,16 @@ msgid "# of Expenses"
msgstr ""
#. module: sale_expense
+#: model:digest.tip,tip_description:sale_expense.digest_tip_sale_expense_0
+msgid "<strong style=\"font-size: 16px;\">Submit expenses by email</strong>"
+msgstr ""
+
+#. module: sale_expense
+#: model:digest.tip,tip_description:sale_expense.digest_tip_sale_expense_0
+msgid "Activate Expense Emails"
+msgstr ""
+
+#. module: sale_expense
#: model:ir.model,name:sale_expense.model_account_analytic_line
msgid "Analytic Line"
msgstr ""
@@ -52,3 +62,8 @@ msgstr ""
msgid "Sale Order"
msgstr ""
+#. module: sale_expense
+#: model:digest.tip,tip_description:sale_expense.digest_tip_sale_expense_0
+msgid "Take a snapshot of your expenses and submit your expenses by email.<br>"
+msgstr ""
+
diff --git a/addons/sale_management/i18n/sale_management.pot b/addons/sale_management/i18n/sale_management.pot
index bc55242ffa9..0669f37ffc1 100644
--- a/addons/sale_management/i18n/sale_management.pot
+++ b/addons/sale_management/i18n/sale_management.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:09+0000\n"
-"PO-Revision-Date: 2018-03-22 14:09+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,17 +16,87 @@ msgstr ""
"Plural-Forms: \n"
#. module: sale_management
-#. openerp-web
-#: code:addons/sale_management/static/src/js/tour.js:64
-#, python-format
-msgid "<p><b>Print this quotation.</b> If not yet done, you will be requested to set your company data and to select a document layout.</p>"
+#: model:ir.ui.view,arch_db:sale_management.report_saleorder_validity_date
+#: model:ir.ui.view,arch_db:sale_management.sale_order_portal_content_inherit_sale_management
+msgid "% discount"
msgstr ""
#. module: sale_management
-#. openerp-web
-#: code:addons/sale_management/static/src/js/tour.js:35
-#, python-format
-msgid "Click here to add some products or services to your quotation."
+#: model:ir.ui.view,arch_db:sale_management.res_config_settings_view_form
+msgid "<em attrs=\"{'invisible': [('module_sale_quotation_builder','=',False)]}\">Warning: this option will install the Website app.</em>"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.report_saleorder_validity_date
+msgid "<span>Optional Products</span>"
+msgstr ""
+
+#. module: sale_management
+#: model:sale.order.template,website_description:sale_management.sale_order_template_default
+msgid "About us"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template__active
+msgid "Active"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_template_view_form
+msgid "Add a note"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_form_quote
+#: model:ir.ui.view,arch_db:sale_management.sale_order_template_view_form
+msgid "Add a product"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_template_view_form
+msgid "Add a section"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_portal_content_inherit_sale_management
+msgid "Add one"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_portal_content_inherit_sale_management
+msgid "Add to cart"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_form_quote
+msgid "Add to order lines"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_digest_digest__kpi_all_sale_total
+msgid "All Sales"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_template_view_search
+msgid "Archived"
+msgstr ""
+
+#. module: sale_management
+#: model:sale.order.template,website_description:sale_management.sale_order_template_default
+msgid "As a leading professional services firm,\n"
+" we know that success is all about the\n"
+" commitment we put on strong services."
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_template_view_form
+msgid "Confirmation"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template__mail_template_id
+msgid "Confirmation Mail"
msgstr ""
#. module: sale_management
@@ -35,51 +105,523 @@ msgid "Create Invoice"
msgstr ""
#. module: sale_management
-#. openerp-web
-#: code:addons/sale_management/static/src/js/tour.js:18
+#: model:ir.ui.view,arch_db:sale_management.res_config_settings_view_form
+msgid "Create standardized offers with default products"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.actions.act_window,help:sale_management.sale_order_template_action
+msgid "Create your quotation template"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_option__create_uid
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template__create_uid
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_line__create_uid
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_option__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_option__create_date
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template__create_date
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_line__create_date
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_option__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_res_config_settings__default_sale_order_template_id
+msgid "Default Template"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_option__name
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_line__name
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_option__name
+#: model:ir.ui.view,arch_db:sale_management.report_saleorder_validity_date
+#: model:ir.ui.view,arch_db:sale_management.sale_order_template_view_form
+msgid "Description"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.res_config_settings_view_form
+msgid "Design your quotation templates using building blocks<br/>"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model,name:sale_management.model_digest_digest
+msgid "Digest"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_option__discount
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_line__discount
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_option__discount
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_option__display_name
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template__display_name
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_line__display_name
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_option__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_line__display_type
+msgid "Display Type"
+msgstr ""
+
+#. module: sale_management
+#: code:addons/sale_management/models/digest.py:16
#, python-format
-msgid "Let's create a new quotation.<br/><i>Note that colored buttons usually point to the next logical actions.</i>"
+msgid "Do not have access, skip this data for user's digest email"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order__require_payment
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template__require_payment
+msgid "Electronic Payment"
+msgstr ""
+
+#. module: sale_management
+#: sql_constraint:sale.order.template.line:0
+msgid "Forbidden product, unit price, quantity, and UoM on non-accountable sale quote line"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,help:sale_management.field_sale_order_option__sequence
+msgid "Gives the sequence order when displaying a list of optional products."
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,help:sale_management.field_sale_order_template_line__sequence
+msgid "Gives the sequence order when displaying a list of sale quote lines."
+msgstr ""
+
+#. module: sale_management
+#: model:sale.order.template,website_description:sale_management.sale_order_template_default
+msgid "Great quotation templates will significantly\n"
+" <strong>boost your success rate</strong>. The\n"
+" first section is usually about your company,\n"
+" your references, your methodology or\n"
+" guarantees, your team, SLA, terms and conditions, etc."
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_option__id
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template__id
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_line__id
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_option__id
+msgid "ID"
+msgstr ""
+
+#. module: sale_management
+#: model:sale.order.template,website_description:sale_management.sale_order_template_default
+msgid "If edit a quotation from the 'Preview' of a quotation, you will\n"
+" update the quotation for this customer only. If you edit the quotation\n"
+" template (from the Configuration menu), all future quotations will\n"
+" use this modified template."
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,help:sale_management.field_sale_order_template__active
+msgid "If unchecked, it will allow you to hide the quotation template without removing it."
msgstr ""
#. module: sale_management
-#. openerp-web
-#: code:addons/sale_management/static/src/js/tour.js:59
+#: code:addons/sale_management/controllers/portal.py:138
#, python-format
-msgid "Once your quotation is ready, you can save, print or send it by email."
+msgid "If we store your payment information on our server, subscription payments will be made automatically."
msgstr ""
#. module: sale_management
-#. openerp-web
-#: code:addons/sale_management/static/src/js/tour.js:13
+#: code:addons/sale_management/controllers/portal.py:18
#, python-format
-msgid "Organize your sales activities with the <b>Sales Management app</b>."
+msgid "Invalid order"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_digest_digest__kpi_all_sale_total_value
+msgid "Kpi All Sale Total Value"
msgstr ""
#. module: sale_management
-#. openerp-web
-#: code:addons/sale_management/static/src/js/tour.js:40
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_option____last_update
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template____last_update
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_line____last_update
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_option____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_option__write_uid
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template__write_uid
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_line__write_uid
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_option__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_option__write_date
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template__write_date
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_line__write_date
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_option__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_option__line_id
+msgid "Line"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template__sale_order_template_line_ids
+#: model:ir.ui.view,arch_db:sale_management.sale_order_template_view_form
+msgid "Lines"
+msgstr ""
+
+#. module: sale_management
+#: sql_constraint:sale.order.template.line:0
+msgid "Missing required product and UoM on accountable sale quote line."
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_template_view_form
+#: selection:sale.order.template.line,display_type:0
+msgid "Note"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,help:sale_management.field_sale_order_template__number_of_days
+msgid "Number of days for the validity date computation of the quotation"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order__require_signature
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template__require_signature
+msgid "Online Signature"
+msgstr ""
+
+#. module: sale_management
+#: code:addons/sale_management/controllers/portal.py:23
#, python-format
-msgid "Select a product, or create a new one on the fly."
+msgid "Operation not allowed"
msgstr ""
#. module: sale_management
-#. openerp-web
-#: code:addons/sale_management/static/src/js/tour.js:69
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template__sale_order_template_option_ids
+#: model:ir.ui.view,arch_db:sale_management.sale_order_form_quote
+#: model:ir.ui.view,arch_db:sale_management.sale_order_portal_content_inherit_sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_template_view_form
+msgid "Optional Products"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order__sale_order_option_ids
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_line__sale_order_option_ids
+msgid "Optional Products Lines"
+msgstr ""
+
+#. module: sale_management
+#: code:addons/sale_management/controllers/portal.py:20
#, python-format
-msgid "Use the breadcrumbs to <b>go back to preceeding screens</b>."
+msgid "Order is not in a state requiring customer validation."
msgstr ""
#. module: sale_management
-#. openerp-web
-#: code:addons/sale_management/static/src/js/tour.js:73
+#: code:addons/sale_management/controllers/portal.py:40
#, python-format
-msgid "Use this menu to access quotations, sales orders and customers."
+msgid "Order signed by %s"
+msgstr ""
+
+#. module: sale_management
+#: model:sale.order.template,website_description:sale_management.sale_order_template_default
+msgid "Our Offer"
+msgstr ""
+
+#. module: sale_management
+#: model:sale.order.template,website_description:sale_management.sale_order_template_default
+msgid "Our Quality"
msgstr ""
#. module: sale_management
-#. openerp-web
-#: code:addons/sale_management/static/src/js/tour.js:23
+#: model:sale.order.template,website_description:sale_management.sale_order_template_default
+msgid "Our Service"
+msgstr ""
+
+#. module: sale_management
+#: code:addons/sale_management/controllers/portal.py:135
+#, python-format
+msgid "Pay & Confirm"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_form_quote
+msgid "Preview"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_portal_content_inherit_sale_management
+#: model:sale.order.template,website_description:sale_management.sale_order_template_default
+msgid "Price"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_option__product_id
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_line__product_id
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_option__product_id
+#: model:ir.ui.view,arch_db:sale_management.report_saleorder_validity_date
+#: model:ir.ui.view,arch_db:sale_management.sale_order_portal_content_inherit_sale_management
+msgid "Product"
+msgstr ""
+
+#. module: sale_management
+#: model:sale.order.template,website_description:sale_management.sale_order_template_default
+msgid "Product quality is the foundation we\n"
+" stand on; we build it with a relentless\n"
+" focus on fabric, performance and craftsmanship."
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_option__quantity
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_line__product_uom_qty
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_option__quantity
+msgid "Quantity"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model,name:sale_management.model_sale_order
+msgid "Quotation"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_res_config_settings__module_sale_quotation_builder
+msgid "Quotation Builder"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template__number_of_days
+msgid "Quotation Duration"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model,name:sale_management.model_sale_order_template
+#: model:ir.model.fields,field_description:sale_management.field_sale_order__sale_order_template_id
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template__name
+#: model:ir.ui.view,arch_db:sale_management.sale_order_template_view_form
+#: model:ir.ui.view,arch_db:sale_management.sale_order_template_view_tree
+msgid "Quotation Template"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model,name:sale_management.model_sale_order_template_line
+msgid "Quotation Template Line"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_template_view_form
+msgid "Quotation Template Lines"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model,name:sale_management.model_sale_order_template_option
+msgid "Quotation Template Option"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_line__sale_order_template_id
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_option__sale_order_template_id
+msgid "Quotation Template Reference"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.actions.act_window,name:sale_management.sale_order_template_action
+#: model:ir.model.fields,field_description:sale_management.field_res_config_settings__group_sale_order_template
+#: model:ir.model.fields,field_description:sale_management.field_res_users__has_group_sale_order_template
+#: model:ir.ui.menu,name:sale_management.sale_order_template_menu
+#: model:ir.ui.view,arch_db:sale_management.res_config_settings_view_form
+#: model:res.groups,name:sale_management.group_sale_order_template
+msgid "Quotation Templates"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_template_view_form
+msgid "Quotation expires after"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_portal_content_inherit_sale_management
+msgid "Remove"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_portal_content_inherit_sale_management
+msgid "Remove one"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,help:sale_management.field_sale_order__require_signature
+#: model:ir.model.fields,help:sale_management.field_sale_order_template__require_signature
+msgid "Request a online signature to the customer in order to confirm orders automatically."
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,help:sale_management.field_sale_order__require_payment
+#: model:ir.model.fields,help:sale_management.field_sale_order_template__require_payment
+msgid "Request an electronic payment to the customer in order to confirm orders automatically."
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model,name:sale_management.model_sale_order_option
+msgid "Sale Options"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.digest_digest_view_form
+msgid "Sales"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model,name:sale_management.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_option__order_id
+msgid "Sales Order Reference"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_form_quote
+msgid "Sales Quotation Template Lines"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_template_view_search
+msgid "Search Quotation Template"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_template_view_form
+#: selection:sale.order.template.line,display_type:0
+msgid "Section"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_option__sequence
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_line__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: sale_management
+#: code:addons/sale_management/controllers/portal.py:25
#, python-format
-msgid "Write the name of your customer to create one on the fly, or select an existing one."
+msgid "Signature is missing."
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,help:sale_management.field_sale_order_template_line__display_type
+msgid "Technical field for UX purpose."
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template__note
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_template_view_form
+msgid "The Administrator can set default Terms & Conditions in Sales Settings. Terms set here will show up instead if you select this quotation template."
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,help:sale_management.field_sale_order_template__mail_template_id
+msgid "This e-mail template will be sent on confirmation. Leave empty to send nothing."
+msgstr ""
+
+#. module: sale_management
+#: model:sale.order.template,website_description:sale_management.sale_order_template_default
+msgid "This is a <strong>sample quotation template</strong>. You should\n"
+" customize it to fit your own needs from the <i>Sale</i>\n"
+" application, using the menu: Configuration /\n"
+" Quotation Templates."
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_option__price_unit
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_line__price_unit
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_option__price_unit
+#: model:ir.ui.view,arch_db:sale_management.report_saleorder_validity_date
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_line__product_uom_id
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_option__uom_id
+#: model:ir.model.fields,field_description:sale_management.field_sale_order_template_option__uom_id
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale_management
+#: model:ir.actions.act_window,help:sale_management.sale_order_template_action
+msgid "Use templates to create polished, professional quotes in minutes.\n"
+" Send these quotes by email and let your customers sign online.\n"
+" Use cross-selling and discounts to push and boost your sales."
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model,name:sale_management.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: sale_management
+#: model:sale.order.template,website_description:sale_management.sale_order_template_default
+msgid "We always ensure that our products are\n"
+" set at a fair price so that you will be\n"
+" happy to buy them."
+msgstr ""
+
+#. module: sale_management
+#: model:sale.order.template,website_description:sale_management.sale_order_template_default
+msgid "You can <strong>set a description per product</strong>. Odoo will\n"
+" automatically create a quotation using the descriptions\n"
+" of all products in the proposal. The table of content\n"
+" on the left is generated automatically using the styles you\n"
+" used in your description (heading 1, heading 2, ...)"
+msgstr ""
+
+#. module: sale_management
+#: code:addons/sale_management/models/sale_order.py:262
+#, python-format
+msgid "You cannot add options to a confirmed order."
+msgstr ""
+
+#. module: sale_management
+#: code:addons/sale_management/controllers/portal.py:31
+#, python-format
+msgid "Your order has been confirmed."
+msgstr ""
+
+#. module: sale_management
+#: code:addons/sale_management/controllers/portal.py:27
+#, python-format
+msgid "Your order has been signed but still needs to be paid to be confirmed."
+msgstr ""
+
+#. module: sale_management
+#: model:ir.ui.view,arch_db:sale_management.sale_order_template_view_form
+msgid "days"
+msgstr ""
+
+#. module: sale_management
+#: model:ir.model,name:sale_management.model_res_config_settings
+msgid "res.config.settings"
msgstr ""
diff --git a/addons/sale_purchase/i18n/sale_purchase.pot b/addons/sale_purchase/i18n/sale_purchase.pot
new file mode 100644
index 00000000000..baa6abf991c
--- /dev/null
+++ b/addons/sale_purchase/i18n/sale_purchase.pot
@@ -0,0 +1,165 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * sale_purchase
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~11.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_purchase
+#: model:ir.ui.view,arch_db:sale_purchase.exception_purchase_on_sale_cancellation
+#: model:ir.ui.view,arch_db:sale_purchase.exception_sale_on_purchase_cancellation
+msgid ".\n"
+" Manual actions may be needed."
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.ui.view,arch_db:sale_purchase.exception_sale_on_purchase_cancellation
+msgid "Exception(s) occurred on the purchase order(s):"
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.ui.view,arch_db:sale_purchase.exception_purchase_on_sale_cancellation
+#: model:ir.ui.view,arch_db:sale_purchase.exception_purchase_on_sale_quantity_decreased
+msgid "Exception(s) occurred on the sale order(s):"
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.ui.view,arch_db:sale_purchase.exception_purchase_on_sale_cancellation
+#: model:ir.ui.view,arch_db:sale_purchase.exception_purchase_on_sale_quantity_decreased
+#: model:ir.ui.view,arch_db:sale_purchase.exception_sale_on_purchase_cancellation
+msgid "Exception(s):"
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.model.fields,field_description:sale_purchase.field_sale_order_line__purchase_line_ids
+msgid "Generated Purchase Lines"
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.model.fields,help:sale_purchase.field_product_product__service_to_purchase
+#: model:ir.model.fields,help:sale_purchase.field_product_template__service_to_purchase
+msgid "If ticked, each time you sell this product through a SO, a RfQ is automatically created to buy the product. Tip: don't forget to set a vendor on the product."
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.ui.view,arch_db:sale_purchase.exception_purchase_on_sale_quantity_decreased
+msgid "Manual actions may be needed."
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.model.fields,field_description:sale_purchase.field_sale_order__purchase_order_count
+msgid "Number of Purchase Order"
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.model.fields,field_description:sale_purchase.field_sale_order_line__purchase_line_count
+msgid "Number of generated purchase items"
+msgstr ""
+
+#. module: sale_purchase
+#: code:addons/sale_purchase/models/sale_order.py:91
+#, python-format
+msgid "Ordered quantity decreased!"
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.model.fields,field_description:sale_purchase.field_purchase_order_line__sale_line_id
+msgid "Origin Sale Item"
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.model,name:sale_purchase.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: sale_purchase
+#: sql_constraint:product.template:0
+msgid "Product that is not a service can not create RFQ."
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.model.fields,field_description:sale_purchase.field_product_product__service_to_purchase
+#: model:ir.model.fields,field_description:sale_purchase.field_product_template__service_to_purchase
+msgid "Purchase Automatically"
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.model,name:sale_purchase.model_purchase_order
+msgid "Purchase Order"
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.model,name:sale_purchase.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.ui.view,arch_db:sale_purchase.sale_order_form_view_inherit
+msgid "Purchase Orders"
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.model.fields,help:sale_purchase.field_sale_order_line__purchase_line_ids
+msgid "Purchase line generated by this Sales item on order confirmation, or when the quantity was increased."
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.model,name:sale_purchase.model_sale_order
+msgid "Quotation"
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.ui.view,arch_db:sale_purchase.product_template_form_view_inherit
+msgid "Reordering"
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.model.fields,field_description:sale_purchase.field_purchase_order_line__sale_order_id
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.model,name:sale_purchase.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_purchase
+#: code:addons/sale_purchase/models/sale_order.py:273
+#, python-format
+msgid "There is no vendor associated to the product %s. Please define a vendor for this product."
+msgstr ""
+
+#. module: sale_purchase
+#: code:addons/sale_purchase/models/sale_order.py:92
+#, python-format
+msgid "You are decreasing the ordered quantity! Do not forget to manually update the purchase order if needed."
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.ui.view,arch_db:sale_purchase.exception_purchase_on_sale_cancellation
+#: model:ir.ui.view,arch_db:sale_purchase.exception_sale_on_purchase_cancellation
+msgid "cancelled"
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.ui.view,arch_db:sale_purchase.exception_purchase_on_sale_cancellation
+#: model:ir.ui.view,arch_db:sale_purchase.exception_purchase_on_sale_quantity_decreased
+#: model:ir.ui.view,arch_db:sale_purchase.exception_sale_on_purchase_cancellation
+msgid "of"
+msgstr ""
+
+#. module: sale_purchase
+#: model:ir.ui.view,arch_db:sale_purchase.exception_purchase_on_sale_quantity_decreased
+msgid "ordered instead of"
+msgstr ""
+
diff --git a/addons/sale_quotation_builder/i18n/sale_quotation_builder.pot b/addons/sale_quotation_builder/i18n/sale_quotation_builder.pot
new file mode 100644
index 00000000000..f1bd99d9ae5
--- /dev/null
+++ b/addons/sale_quotation_builder/i18n/sale_quotation_builder.pot
@@ -0,0 +1,151 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * sale_quotation_builder
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~11.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_quotation_builder
+#: model:ir.ui.view,arch_db:sale_quotation_builder.so_template
+msgid "&amp;times;"
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.ui.view,arch_db:sale_quotation_builder.so_template
+msgid ":\n"
+" this content will appear on the quotation only if this\n"
+" product is put on the quote."
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.ui.view,arch_db:sale_quotation_builder.so_template
+msgid ":\n"
+" this content will appear on the quotation only if this\n"
+" product is used in the quote."
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.ui.view,arch_db:sale_quotation_builder.so_template
+msgid "<strong>Template Header:</strong> this content\n"
+" will appear on all quotations using this\n"
+" template."
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.ui.view,arch_db:sale_quotation_builder.so_template
+msgid "Back"
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.ui.view,arch_db:sale_quotation_builder.so_template
+msgid "Close"
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.ui.view,arch_db:sale_quotation_builder.sale_order_template_view_form_inherit_sale_quotation_builder
+msgid "Edit Template"
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.ui.view,arch_db:sale_quotation_builder.so_template
+msgid "Optional Product:"
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.model,name:sale_quotation_builder.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.ui.view,arch_db:sale_quotation_builder.so_template
+msgid "Product:"
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.model,name:sale_quotation_builder.model_sale_order
+msgid "Quotation"
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.model.fields,field_description:sale_quotation_builder.field_product_product__quotation_description
+#: model:ir.model.fields,field_description:sale_quotation_builder.field_product_template__quotation_description
+msgid "Quotation Description"
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.model.fields,field_description:sale_quotation_builder.field_product_product__quotation_only_description
+#: model:ir.model.fields,field_description:sale_quotation_builder.field_product_template__quotation_only_description
+msgid "Quotation Only Description"
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.model,name:sale_quotation_builder.model_sale_order_template
+msgid "Quotation Template"
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.model,name:sale_quotation_builder.model_sale_order_template_line
+msgid "Quotation Template Line"
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.model,name:sale_quotation_builder.model_sale_order_template_option
+msgid "Quotation Template Option"
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.model,name:sale_quotation_builder.model_sale_order_option
+msgid "Sale Options"
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.model,name:sale_quotation_builder.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.ui.view,arch_db:sale_quotation_builder.so_template
+msgid "Terms &amp; Conditions"
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.model.fields,help:sale_quotation_builder.field_product_product__quotation_only_description
+#: model:ir.model.fields,help:sale_quotation_builder.field_product_template__quotation_only_description
+#: model:ir.model.fields,help:sale_quotation_builder.field_sale_order_template_line__website_description
+msgid "The quotation description (not used on eCommerce)"
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.model.fields,help:sale_quotation_builder.field_product_product__quotation_description
+#: model:ir.model.fields,help:sale_quotation_builder.field_product_template__quotation_description
+msgid "This field uses the Quotation Only Description if it is defined, otherwise it will try to read the eCommerce Description."
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.ui.view,arch_db:sale_quotation_builder.so_template
+msgid "Titles with style <i>Heading 1</i> and\n"
+" <i>Heading 2</i> will be used to generate the\n"
+" table of content automatically."
+msgstr ""
+
+#. module: sale_quotation_builder
+#: model:ir.model.fields,field_description:sale_quotation_builder.field_sale_order__website_description
+#: model:ir.model.fields,field_description:sale_quotation_builder.field_sale_order_line__website_description
+#: model:ir.model.fields,field_description:sale_quotation_builder.field_sale_order_option__website_description
+#: model:ir.model.fields,field_description:sale_quotation_builder.field_sale_order_template__website_description
+#: model:ir.model.fields,field_description:sale_quotation_builder.field_sale_order_template_line__website_description
+#: model:ir.model.fields,field_description:sale_quotation_builder.field_sale_order_template_option__website_description
+#: model:ir.ui.view,arch_db:sale_quotation_builder.sale_order_template_view_form_inherit_sale_quotation_builder
+msgid "Website Description"
+msgstr ""
+
diff --git a/addons/sale_stock/i18n/sale_stock.pot b/addons/sale_stock/i18n/sale_stock.pot
index ee51f39c6d4..099bbbd843d 100644
--- a/addons/sale_stock/i18n/sale_stock.pot
+++ b/addons/sale_stock/i18n/sale_stock.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
"Plural-Forms: \n"
#. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:249
+#: code:addons/sale_stock/models/sale_order.py:269
#, python-format
msgid "\n"
"There are %s %s available across all warehouses.\n"
@@ -31,23 +31,33 @@ msgid ".\n"
msgstr ""
#. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.portal_order_page_shipping
-msgid "<span class=\"label label-danger label-text-align\"><i class=\"fa fa-fw fa-times\"/> Cancelled</span>"
+#: model:ir.ui.view,arch_db:sale_stock.sale_order_portal_content_inherit_sale_stock
+msgid "<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw fa-times\"/> Cancelled</span>"
msgstr ""
#. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.portal_order_page_shipping
-msgid "<span class=\"label label-info label-text-align\"><i class=\"fa fa-fw fa-clock-o\"/> Preparation</span>"
+#: model:ir.ui.view,arch_db:sale_stock.sale_order_portal_content_inherit_sale_stock
+msgid "<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-clock-o\"/> Preparation</span>"
msgstr ""
#. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.portal_order_page_shipping
-msgid "<span class=\"label label-success label-text-align\"><i class=\"fa fa-fw fa-truck\"/> Shipped</span>"
+#: model:ir.ui.view,arch_db:sale_stock.sale_order_portal_content_inherit_sale_stock
+msgid "<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw fa-truck\"/> Shipped</span>"
msgstr ""
#. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.portal_order_page_shipping
-msgid "<span class=\"label label-warning label-text-align\"><i class=\"fa fa-fw fa-clock-o\"/> Partially Available</span>"
+#: model:ir.ui.view,arch_db:sale_stock.sale_order_portal_content_inherit_sale_stock
+msgid "<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw fa-clock-o\"/> Partially Available</span>"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.view,arch_db:sale_stock.stock_production_lot_view_form
+msgid "<span class=\"o_stat_text\">Sale Orders</span>"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.view,arch_db:sale_stock.product_template_view_form_inherit_stock
+msgid "<span class=\"o_stat_text\">Sold</span>"
msgstr ""
#. module: sale_stock
@@ -56,7 +66,7 @@ msgid "<strong>Customer Reference:</strong>"
msgstr ""
#. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.portal_order_page_shipping
+#: model:ir.ui.view,arch_db:sale_stock.sale_order_portal_content_inherit_sale_stock
msgid "<strong>Delivery Orders</strong>"
msgstr ""
@@ -92,11 +102,26 @@ msgid "Apply special routes from orders (e.g. dropshipping, MTO)"
msgstr ""
#. module: sale_stock
+#: model:ir.model.fields,field_description:sale_stock.field_stock_rules_report__so_route_ids
+msgid "Apply specific rotues"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model.fields,help:sale_stock.field_stock_rules_report__so_route_ids
+msgid "Choose to apply SO lines specific routes."
+msgstr ""
+
+#. module: sale_stock
#: model:ir.model,name:sale_stock.model_res_company
msgid "Companies"
msgstr ""
#. module: sale_stock
+#: model:ir.model.fields,help:sale_stock.field_sale_order__effective_date
+msgid "Completion date of the first delivery order."
+msgstr ""
+
+#. module: sale_stock
#: selection:sale.order,picking_policy:0
msgid "Deliver all products at once"
msgstr ""
@@ -112,11 +137,6 @@ msgid "Delivery"
msgstr ""
#. module: sale_stock
-#: model:ir.model.fields,field_description:sale_stock.field_res_config_settings__module_sale_order_dates
-msgid "Delivery Date"
-msgstr ""
-
-#. module: sale_stock
#: model:ir.model.fields,field_description:sale_stock.field_sale_order__delivery_count
msgid "Delivery Orders"
msgstr ""
@@ -133,6 +153,11 @@ msgid "Display incoterms on orders &amp; invoices"
msgstr ""
#. module: sale_stock
+#: model:ir.model.fields,field_description:sale_stock.field_sale_order__effective_date
+msgid "Effective Date"
+msgstr ""
+
+#. module: sale_stock
#: model:ir.model.fields,field_description:sale_stock.field_res_users__has_group_route_so_lines
#: model:res.groups,name:sale_stock.group_route_so_lines
msgid "Enable Route on Sales Order Line"
@@ -203,8 +228,8 @@ msgid "Invoicing"
msgstr ""
#. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_sale
-msgid "Manage delivery dates from sales orders"
+#: model:ir.model,name:sale_stock.model_stock_production_lot
+msgid "Lot/Serial"
msgstr ""
#. module: sale_stock
@@ -240,7 +265,7 @@ msgid "Move forward expected delivery dates by"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:256
+#: code:addons/sale_stock/models/sale_order.py:276
#, python-format
msgid "Not enough inventory!"
msgstr ""
@@ -251,7 +276,7 @@ msgid "Order-Specific Routes"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:270
+#: code:addons/sale_stock/models/sale_order.py:290
#, python-format
msgid "Ordered quantity decreased!"
msgstr ""
@@ -282,11 +307,6 @@ msgid "Procurement Requisition"
msgstr ""
#. module: sale_stock
-#: model:ir.model,name:sale_stock.model_procurement_rule
-msgid "Procurement Rule"
-msgstr ""
-
-#. module: sale_stock
#: model:ir.model,name:sale_stock.model_product_template
msgid "Product Template"
msgstr ""
@@ -322,8 +342,13 @@ msgid "Sale Order"
msgstr ""
#. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.product_template_view_form_inherit_stock
-msgid "Sales"
+#: model:ir.ui.view,arch_db:sale_stock.stock_production_lot_view_form
+msgid "Sale Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model.fields,field_description:sale_stock.field_stock_production_lot__sale_order_count
+msgid "Sale order count"
msgstr ""
#. module: sale_stock
@@ -342,6 +367,11 @@ msgid "Sales Order Lines"
msgstr ""
#. module: sale_stock
+#: model:ir.model.fields,field_description:sale_stock.field_stock_production_lot__sale_order_ids
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale_stock
#: model:ir.model,name:sale_stock.model_sale_report
msgid "Sales Orders Statistics"
msgstr ""
@@ -382,13 +412,13 @@ msgid "Ship products as soon as available, with back orders"
msgstr ""
#. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.view_order_form_inherit_sale_stock
-msgid "Shipping Information"
+#: model:ir.model.fields,field_description:sale_stock.field_sale_order__picking_policy
+msgid "Shipping Policy"
msgstr ""
#. module: sale_stock
-#: model:ir.model.fields,field_description:sale_stock.field_sale_order__picking_policy
-msgid "Shipping Policy"
+#: model:ir.ui.view,arch_db:sale_stock.product_template_view_form_inherit_stock
+msgid "Sold in the last 365 days"
msgstr ""
#. module: sale_stock
@@ -403,17 +433,17 @@ msgid "Stock Moves"
msgstr ""
#. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_sale
-msgid "This allows to apply a special route on sales order lines (e.g. dropshipping, make-to-order) in case of unusual order scenario. To be available in sales orders, routes must have 'Sales Order Line' option checked in their setup form."
+#: model:ir.model,name:sale_stock.model_stock_rule
+msgid "Stock Rule"
msgstr ""
#. module: sale_stock
#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_sale
-msgid "This option introduces extra fields in the sales order to easily schedule product deliveries on your own: expected date, commitment date, effective date."
+msgid "This allows to apply a special route on sales order lines (e.g. dropshipping, make-to-order) in case of unusual order scenario. To be available in sales orders, routes must have 'Sales Order Line' option checked in their setup form."
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:363
+#: code:addons/sale_stock/models/sale_order.py:388
#, python-format
msgid "This product is packaged by %.2f %s. You should sell %.2f %s."
msgstr ""
@@ -440,7 +470,7 @@ msgid "Warehouse"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:362
+#: code:addons/sale_stock/models/sale_order.py:387
#, python-format
msgid "Warning"
msgstr ""
@@ -456,20 +486,20 @@ msgid "When to start shipping"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:271
+#: code:addons/sale_stock/models/sale_order.py:291
#, python-format
msgid "You are decreasing the ordered quantity! Do not forget to manually update the delivery order if needed."
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:403
+#: code:addons/sale_stock/models/sale_order.py:428
#, python-format
msgid "You cannot decrease the ordered quantity below the delivered quantity.\n"
"Create a return first."
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:245
+#: code:addons/sale_stock/models/sale_order.py:265
#, python-format
msgid "You plan to sell %s %s but you only have %s %s available in %s warehouse."
msgstr ""
@@ -501,7 +531,17 @@ msgid "processed instead of"
msgstr ""
#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_report_stock_report_stock_rule
+msgid "report.stock.report_stock_rule"
+msgstr ""
+
+#. module: sale_stock
#: model:ir.model,name:sale_stock.model_res_config_settings
msgid "res.config.settings"
msgstr ""
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_rules_report
+msgid "stock.rules.report"
+msgstr ""
+
diff --git a/addons/sale_timesheet/i18n/sale_timesheet.pot b/addons/sale_timesheet/i18n/sale_timesheet.pot
index 9d1ecb369bb..f5ea0a4d2e0 100644
--- a/addons/sale_timesheet/i18n/sale_timesheet.pot
+++ b/addons/sale_timesheet/i18n/sale_timesheet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
#. module: sale_timesheet
#: code:addons/sale_timesheet/models/account_invoice.py:32
-#: code:addons/sale_timesheet/models/project.py:26
+#: code:addons/sale_timesheet/models/project.py:70
#, python-format
msgid "\n"
" <p class=\"o_view_nocontent_smiling_face\">\n"
@@ -36,11 +36,28 @@ msgid "<b>Total</b>"
msgstr ""
#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.res_config_settings_view_form
+msgid "<span class=\"o_form_label\">Time Billing</span>"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.project_project_view_kanban_inherit_sale_timesheet
msgid "<span class=\"o_label\">Overview</span>"
msgstr ""
#. module: sale_timesheet
+#: code:addons/sale_timesheet/models/project.py:53
+#, python-format
+msgid "A billable project should be linked to a Sales Order Item having a Service product."
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/models/project.py:55
+#, python-format
+msgid "A billable project should be linked to a Sales Order Item that does not come from an expense or a vendor bill."
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.model.fields,help:sale_timesheet.field_sale_order_line__qty_delivered_method
msgid "According to product configuration, the delivered quantity can be automatically computed by mechanism :\n"
" - Manual: the quantity is set manually on the line\n"
@@ -96,7 +113,25 @@ msgid "Assign sale line to Tasks"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/controllers/main.py:235
+#: selection:project.project,billable_type:0
+#: selection:project.task,billable_type:0
+msgid "At Employee Rate"
+msgstr ""
+
+#. module: sale_timesheet
+#: selection:project.project,billable_type:0
+#: selection:project.task,billable_type:0
+msgid "At Task Rate"
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/wizard/project_create_sale_order.py:41
+#, python-format
+msgid "At least one Sale Order Items should be filled."
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/controllers/main.py:249
#, python-format
msgid "Before"
msgstr ""
@@ -118,6 +153,8 @@ msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_account_analytic_line__timesheet_invoice_type
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_project__billable_type
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_task__billable_type
msgid "Billable Type"
msgstr ""
@@ -132,6 +169,14 @@ msgid "Billable time"
msgstr ""
#. module: sale_timesheet
+#: model:ir.model.fields,help:sale_timesheet.field_project_project__billable_type
+msgid "Billable type implies:\n"
+" - At task rate: each time spend on a task is billed at task rate.\n"
+" - At employee rate: each employee log time billed at his rate.\n"
+" - No Billable: track time without invoicing it"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.res_config_settings_view_form
msgid "Billing"
msgstr ""
@@ -170,8 +215,8 @@ msgid "Costs and Revenues"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/controllers/main.py:331
-#: code:addons/sale_timesheet/controllers/main.py:338
+#: code:addons/sale_timesheet/controllers/main.py:355
+#: code:addons/sale_timesheet/controllers/main.py:362
#: model:ir.actions.act_window,name:sale_timesheet.project_project_action_multi_create_invoice
#: model:ir.ui.view,arch_db:sale_timesheet.project_create_invoice_view_form
#, python-format
@@ -180,12 +225,16 @@ msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.project_create_sale_order_view_form
+msgid "Create Order"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.project_project_view_form
msgid "Create Sales Order"
msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.project_create_invoice_view_form
-#: model:ir.ui.view,arch_db:sale_timesheet.project_create_sale_order_view_form
msgid "Create Sales Order from Project"
msgstr ""
@@ -200,7 +249,7 @@ msgid "Create a SO from project"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/controllers/main.py:321
+#: code:addons/sale_timesheet/controllers/main.py:344
#: model:ir.actions.act_window,name:sale_timesheet.project_project_action_multi_create_sale_order
#, python-format
msgid "Create a Sales Order"
@@ -224,6 +273,8 @@ msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_invoice__create_uid
#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order__create_uid
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order_line__create_uid
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_sale_line_employee_map__create_uid
#: model:ir.model.fields,field_description:sale_timesheet.field_project_task_assign_sale__create_uid
msgid "Created by"
msgstr ""
@@ -231,13 +282,15 @@ msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_invoice__create_date
#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order__create_date
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order_line__create_date
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_sale_line_employee_map__create_date
#: model:ir.model.fields,field_description:sale_timesheet.field_project_task_assign_sale__create_date
msgid "Created on"
msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_invoice__currency_id
-#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order__currency_id
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order_line__currency_id
msgid "Currency"
msgstr ""
@@ -252,7 +305,9 @@ msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_invoice__display_name
#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order__display_name
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order_line__display_name
#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__display_name
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_sale_line_employee_map__display_name
#: model:ir.model.fields,field_description:sale_timesheet.field_project_task_assign_sale__display_name
msgid "Display Name"
msgstr ""
@@ -263,12 +318,17 @@ msgid "Don't create task"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/controllers/main.py:235
+#: code:addons/sale_timesheet/controllers/main.py:249
#, python-format
msgid "Done"
msgstr ""
#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_sale_line_employee_map__employee_id
+msgid "Employee"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.project_project_view_search
msgid "Exact name"
msgstr ""
@@ -284,11 +344,6 @@ msgid "Fixed Price Projects"
msgstr ""
#. module: sale_timesheet
-#: model:ir.ui.view,arch_db:sale_timesheet.product_template_search_view_sale_timesheet
-msgid "Fixed price services"
-msgstr ""
-
-#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_line__project_id
msgid "Generated Project"
msgstr ""
@@ -311,7 +366,9 @@ msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_invoice__id
#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order__id
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order_line__id
#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__id
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_sale_line_employee_map__id
#: model:ir.model.fields,field_description:sale_timesheet.field_project_task_assign_sale__id
msgid "ID"
msgstr ""
@@ -323,9 +380,8 @@ msgid "Invoice"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model.fields,field_description:sale_timesheet.field_product_product__service_policy
-#: model:ir.model.fields,field_description:sale_timesheet.field_product_template__service_policy
-msgid "Invoice based on"
+#: model:ir.model,name:sale_timesheet.model_account_invoice_line
+msgid "Invoice Line"
msgstr ""
#. module: sale_timesheet
@@ -339,12 +395,22 @@ msgid "Invoiced"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/controllers/main.py:373
+#: code:addons/sale_timesheet/controllers/main.py:404
#, python-format
msgid "Invoices"
msgstr ""
#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.project_project_view_form
+msgid "Invoicing"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_task__is_project_map_empty
+msgid "Is Project map empty"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_line__is_service
msgid "Is a Service"
msgstr ""
@@ -352,7 +418,9 @@ msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_invoice____last_update
#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order____last_update
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order_line____last_update
#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report____last_update
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_sale_line_employee_map____last_update
#: model:ir.model.fields,field_description:sale_timesheet.field_project_task_assign_sale____last_update
msgid "Last Modified on"
msgstr ""
@@ -360,6 +428,8 @@ msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_invoice__write_uid
#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order__write_uid
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order_line__write_uid
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_sale_line_employee_map__write_uid
#: model:ir.model.fields,field_description:sale_timesheet.field_project_task_assign_sale__write_uid
msgid "Last Updated by"
msgstr ""
@@ -367,11 +437,23 @@ msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_invoice__write_date
#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order__write_date
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order_line__write_date
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_sale_line_employee_map__write_date
#: model:ir.model.fields,field_description:sale_timesheet.field_project_task_assign_sale__write_date
msgid "Last Updated on"
msgstr ""
#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order__line_ids
+msgid "Lines"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.project_create_sale_order_view_form
+msgid "Make Project Billable"
+msgstr ""
+
+#. module: sale_timesheet
#: selection:sale.order.line,qty_delivered_method:0
msgid "Manual"
msgstr ""
@@ -394,11 +476,6 @@ msgid "Method to update delivered qty"
msgstr ""
#. module: sale_timesheet
-#: model:ir.ui.view,arch_db:sale_timesheet.product_template_search_view_sale_timesheet
-msgid "Milestone services"
-msgstr ""
-
-#. module: sale_timesheet
#: selection:product.template,service_policy:0
msgid "Milestones (manually set quantities on order)"
msgstr ""
@@ -409,21 +486,27 @@ msgid "My Project"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/controllers/main.py:235
+#: code:addons/sale_timesheet/controllers/main.py:249
#, python-format
msgid "Name"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/controllers/main.py:193
+#: selection:project.project,billable_type:0
+#: selection:project.task,billable_type:0
+msgid "No Billable"
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/controllers/main.py:208
#, python-format
msgid "No Sales Order"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/controllers/main.py:155
-#: code:addons/sale_timesheet/controllers/main.py:163
-#: code:addons/sale_timesheet/controllers/main.py:175
+#: code:addons/sale_timesheet/controllers/main.py:170
+#: code:addons/sale_timesheet/controllers/main.py:178
+#: code:addons/sale_timesheet/controllers/main.py:190
#, python-format
msgid "No Sales Order Line"
msgstr ""
@@ -446,7 +529,7 @@ msgstr ""
#. module: sale_timesheet
#. openerp-web
-#: code:addons/sale_timesheet/static/src/js/timesheet_plan.js:262
+#: code:addons/sale_timesheet/static/src/js/timesheet_plan.js:266
#, python-format
msgid "Non Billable Tasks"
msgstr ""
@@ -491,16 +574,11 @@ msgid "Overview"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order__price_unit
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order_line__price_unit
msgid "Price"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model.fields,help:sale_timesheet.field_project_create_sale_order__price_unit
-msgid "Price unit of the selected product for the generated Sales Order."
-msgstr ""
-
-#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__product_id
msgid "Product"
msgstr ""
@@ -535,13 +613,17 @@ msgid "Profitability Analysis"
msgstr ""
#. module: sale_timesheet
+#: code:addons/sale_timesheet/controllers/main.py:373
+#: code:addons/sale_timesheet/controllers/main.py:424
#: model:ir.model,name:sale_timesheet.model_project_project
#: model:ir.model.fields,field_description:sale_timesheet.field_product_product__project_id
#: model:ir.model.fields,field_description:sale_timesheet.field_product_template__project_id
#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_invoice__project_id
#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order__project_id
#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__project_id
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_sale_line_employee_map__project_id
#: model:ir.ui.view,arch_db:sale_timesheet.project_profitability_report_view_search
+#, python-format
msgid "Project"
msgstr ""
@@ -607,6 +689,11 @@ msgid "Projects used in this sales order."
msgstr ""
#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order_line__quantity
+msgid "Quantity"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_sale_order
msgid "Quotation"
msgstr ""
@@ -622,19 +709,19 @@ msgid "Re-invoiced costs"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/controllers/main.py:235
+#: code:addons/sale_timesheet/controllers/main.py:249
#, python-format
msgid "Remaining"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model.fields,field_description:sale_timesheet.field_account_analytic_line__timesheet_revenue
-msgid "Revenue"
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__sale_order_id
+msgid "Sale Order"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__sale_order_id
-msgid "Sale Order"
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_sale_line_employee_map__sale_line_id
+msgid "Sale Order Item"
msgstr ""
#. module: sale_timesheet
@@ -643,6 +730,11 @@ msgid "Sale Order Line"
msgstr ""
#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_project__sale_line_employee_ids
+msgid "Sale line/Employee map"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.model.fields,help:sale_timesheet.field_project_project__sale_line_id
msgid "Sale order line from which the project has been created. Used for tracability."
msgstr ""
@@ -653,6 +745,7 @@ msgid "Sale order line to link to selected tasks"
msgstr ""
#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_project__sale_order_id
#: model:ir.model.fields,field_description:sale_timesheet.field_project_task__sale_order_id
#: model:ir.ui.view,arch_db:sale_timesheet.view_sale_service_inherit_form2
msgid "Sales Order"
@@ -664,6 +757,7 @@ msgid "Sales Order Confirmation Date"
msgstr ""
#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_project__sale_line_id
#: model:ir.model.fields,field_description:sale_timesheet.field_project_task__sale_line_id
#: model:ir.model.fields,field_description:sale_timesheet.field_project_task_assign_sale__sale_line_id
#: model:ir.ui.view,arch_db:sale_timesheet.view_sale_service_inherit_form2
@@ -672,7 +766,6 @@ msgstr ""
#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_sale_order_line
-#: model:ir.model.fields,field_description:sale_timesheet.field_project_project__sale_line_id
msgid "Sales Order Line"
msgstr ""
@@ -682,7 +775,7 @@ msgid "Sales Order item should generate a task and/or a project, depending on th
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/controllers/main.py:364
+#: code:addons/sale_timesheet/controllers/main.py:395
#, python-format
msgid "Sales Orders"
msgstr ""
@@ -715,11 +808,17 @@ msgid "Sell services and invoice time spent"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order__product_id
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order_line__product_id
msgid "Service"
msgstr ""
#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_product_product__service_policy
+#: model:ir.model.fields,field_description:sale_timesheet.field_product_template__service_policy
+msgid "Service Invoicing Policy"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_product_product__service_tracking
#: model:ir.model.fields,field_description:sale_timesheet.field_product_template__service_tracking
msgid "Service Tracking"
@@ -741,12 +840,17 @@ msgid "Setup your time-based services"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/controllers/main.py:235
+#: code:addons/sale_timesheet/controllers/main.py:249
#, python-format
msgid "Sold"
msgstr ""
#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "Statistics"
+msgstr ""
+
+#. module: sale_timesheet
#: selection:sale.order.line,qty_delivered_method:0
msgid "Stock Moves"
msgstr ""
@@ -757,7 +861,7 @@ msgid "Task"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/models/sale_order.py:176
+#: code:addons/sale_timesheet/models/sale_order.py:177
#, python-format
msgid "Task Created (%s): <a href=# data-oe-model=project.task data-oe-id=%d>%s</a>"
msgstr ""
@@ -768,8 +872,8 @@ msgid "Task generated by the sales order item"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/controllers/main.py:354
-#: code:addons/sale_timesheet/controllers/main.py:405
+#: code:addons/sale_timesheet/controllers/main.py:385
+#: code:addons/sale_timesheet/controllers/main.py:447
#: model:ir.model.fields,field_description:sale_timesheet.field_project_task_assign_sale__task_ids
#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order__tasks_count
#: model:ir.ui.view,arch_db:sale_timesheet.view_order_form_inherit_sale_timesheet
@@ -783,6 +887,11 @@ msgid "Tasks associated to this sale"
msgstr ""
#. module: sale_timesheet
+#: sql_constraint:project.project:0
+msgid "The Project should be linked to a Sale Order to select an Sale Order Items."
+msgstr ""
+
+#. module: sale_timesheet
#: code:addons/sale_timesheet/models/product.py:68
#, python-format
msgid "The product %s should not have a global project since it will generate a project."
@@ -801,7 +910,13 @@ msgid "The product %s should not have a project template since it will generate
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/wizard/project_create_sale_order.py:41
+#: code:addons/sale_timesheet/wizard/project_create_sale_order.py:25
+#, python-format
+msgid "The project is already billable."
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/wizard/project_create_sale_order.py:38
#, python-format
msgid "The project is already linked to a sales order item."
msgstr ""
@@ -823,14 +938,15 @@ msgid "This report allows you to analyse the profitability of your projects: com
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/models/sale_order.py:267
+#: code:addons/sale_timesheet/models/sale_order.py:269
#, python-format
msgid "This task has been created from: <a href=# data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)"
msgstr ""
#. module: sale_timesheet
-#: model:ir.ui.view,arch_db:sale_timesheet.res_config_settings_view_form
-msgid "Time Billing"
+#: code:addons/sale_timesheet/models/account.py:55
+#, python-format
+msgid "This timesheet line cannot be billed: there is no Sale Order Item defined on the task, nor on the project. Please define one to save your timesheet line."
msgstr ""
#. module: sale_timesheet
@@ -839,11 +955,6 @@ msgid "Time by people"
msgstr ""
#. module: sale_timesheet
-#: model:ir.ui.view,arch_db:sale_timesheet.product_template_search_view_sale_timesheet
-msgid "Time-based services"
-msgstr ""
-
-#. module: sale_timesheet
#. openerp-web
#: code:addons/sale_timesheet/static/src/js/timesheet_plan.js:171
#: model:ir.actions.act_window,name:sale_timesheet.action_timesheet_from_invoice
@@ -880,8 +991,8 @@ msgid "Timesheet costs"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/controllers/main.py:348
-#: code:addons/sale_timesheet/controllers/main.py:394
+#: code:addons/sale_timesheet/controllers/main.py:379
+#: code:addons/sale_timesheet/controllers/main.py:436
#: code:addons/sale_timesheet/models/account_invoice.py:26
#: model:ir.model.fields,field_description:sale_timesheet.field_account_invoice__timesheet_ids
#: model:ir.ui.view,arch_db:sale_timesheet.account_invoice_view_form_inherit_sale_timesheet
@@ -893,7 +1004,7 @@ msgid "Timesheets"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/models/project.py:20
+#: code:addons/sale_timesheet/models/project.py:64
#, python-format
msgid "Timesheets of %s"
msgstr ""
@@ -915,7 +1026,7 @@ msgstr ""
#. module: sale_timesheet
#: model:ir.model.fields,help:sale_timesheet.field_project_create_invoice__amount_to_invoice
-msgid "Total amount to invoice on the sales order, including all items (services, stockables, expenses, ...)"
+msgid "Total amount to invoice on the sales order, including all items (services, storables, expenses, ...)"
msgstr ""
#. module: sale_timesheet
@@ -924,6 +1035,11 @@ msgid "Track Service"
msgstr ""
#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_sale_line_employee_map__price_unit
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__amount_untaxed_invoiced
msgid "Untaxed Amount Invoiced"
msgstr ""
@@ -944,27 +1060,53 @@ msgid "Untaxed Re-invoiced Amount"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/models/account.py:29
+#: code:addons/sale_timesheet/controllers/main.py:258
+#, python-format
+msgid "What is still to deliver based on sold hours and hours already done. Equals to sold hours - done hours."
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order_line__wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/models/account.py:62
#, python-format
msgid "You can not modify already invoiced timesheets (linked to a Sales order items invoiced on Time and material)."
msgstr ""
#. module: sale_timesheet
#: code:addons/sale_timesheet/wizard/project_create_invoice.py:18
-#: code:addons/sale_timesheet/wizard/project_create_sale_order.py:18
+#: code:addons/sale_timesheet/wizard/project_create_sale_order.py:19
#, python-format
msgid "You can only apply this action from a project."
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/models/project.py:124
-#, python-format
-msgid "You cannot delete a task related to a sales order. You can only archive it."
+#: sql_constraint:project.sale.line.employee.map:0
+msgid "You can only map one employee with sale order item per project."
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/models/project.py:93
+#: code:addons/sale_timesheet/models/project.py:201
#, python-format
msgid "You cannot link the order item %s - %s to this task because it is a re-invoiced expense."
msgstr ""
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/models/project.py:214
+#, python-format
+msgid "You have to unlink the task from the sale order item in order to delete it."
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model,name:sale_timesheet.model_project_create_sale_order_line
+msgid "project.create.sale.order.line"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model,name:sale_timesheet.model_project_sale_line_employee_map
+msgid "project.sale.line.employee.map"
+msgstr ""
+
diff --git a/addons/sales_team/i18n/sales_team.pot b/addons/sales_team/i18n/sales_team.pot
index 6d420a34b5c..cd4db3c1059 100644
--- a/addons/sales_team/i18n/sales_team.pot
+++ b/addons/sales_team/i18n/sales_team.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -51,32 +51,27 @@ msgid "Archived"
msgstr ""
#. module: sales_team
+#: model:ir.ui.view,arch_db:sales_team.crm_team_view_form
+msgid "Avatar"
+msgstr ""
+
+#. module: sales_team
#: selection:crm.team,dashboard_graph_type:0
msgid "Bar"
msgstr ""
#. module: sales_team
-#: code:addons/sales_team/models/crm_team.py:269
+#: code:addons/sales_team/models/crm_team.py:274
#, python-format
msgid "Big Pretty Button :)"
msgstr ""
#. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_crm_team__user_id
-msgid "Channel Leader"
-msgstr ""
-
-#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team__member_ids
msgid "Channel Members"
msgstr ""
#. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_crm_team__team_type
-msgid "Channel Type"
-msgstr ""
-
-#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team__color
msgid "Color Index"
msgstr ""
@@ -139,7 +134,7 @@ msgstr ""
#. module: sales_team
#: model:ir.actions.act_window,help:sales_team.crm_team_salesteams_act
#: model:ir.actions.act_window,help:sales_team.sales_team_config_action
-msgid "Define a new sales channel"
+msgid "Define a new Sales Team"
msgstr ""
#. module: sales_team
@@ -220,12 +215,12 @@ msgstr ""
#. module: sales_team
#: model:ir.model.fields,help:sales_team.field_res_partner__team_id
#: model:ir.model.fields,help:sales_team.field_res_users__team_id
-msgid "If set, this sales channel will be used for sales and assignations related to this partner"
+msgid "If set, this Sales Team will be used for sales and assignations related to this partner"
msgstr ""
#. module: sales_team
#: model:ir.model.fields,help:sales_team.field_crm_team__active
-msgid "If the active field is set to false, it will allow you to hide the sales channel without removing it."
+msgid "If the active field is set to false, it will allow you to hide the Sales Team without removing it."
msgstr ""
#. module: sales_team
@@ -299,7 +294,7 @@ msgid "My Favorites"
msgstr ""
#. module: sales_team
-#: code:addons/sales_team/models/crm_team.py:255
+#: code:addons/sales_team/models/crm_team.py:260
#, python-format
msgid "Not Defined"
msgstr ""
@@ -353,33 +348,28 @@ msgid "Sales"
msgstr ""
#. module: sales_team
+#: model:ir.actions.act_window,name:sales_team.crm_team_salesteams_act
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sales_team
#: model:ir.model,name:sales_team.model_crm_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team__name
#: model:ir.model.fields,field_description:sales_team.field_res_partner__team_id
#: model:ir.model.fields,field_description:sales_team.field_res_users__team_id
#: model:ir.ui.view,arch_db:sales_team.crm_team_view_form
#: model:ir.ui.view,arch_db:sales_team.crm_team_view_tree
-msgid "Sales Channel"
-msgstr ""
-
-#. module: sales_team
-#: model:ir.actions.act_window,name:sales_team.crm_team_salesteams_act
-msgid "Sales Channel Dashboard"
+msgid "Sales Team"
msgstr ""
#. module: sales_team
#: model:ir.model.fields,help:sales_team.field_res_users__sale_team_id
-msgid "Sales Channel the user is member of. Used to compute the members of a sales channel through the inverse one2many"
+msgid "Sales Team the user is member of. Used to compute the members of a Sales Team through the inverse one2many"
msgstr ""
#. module: sales_team
#: model:ir.actions.act_window,name:sales_team.sales_team_config_action
-msgid "Sales Channels"
-msgstr ""
-
-#. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_res_users__sale_team_id
-msgid "Sales Team"
+msgid "Sales Teams"
msgstr ""
#. module: sales_team
@@ -413,6 +403,7 @@ msgid "Show on dashboard"
msgstr ""
#. module: sales_team
+#: model:ir.model.fields,field_description:sales_team.field_crm_team__user_id
#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_search
msgid "Team Leader"
msgstr ""
@@ -423,13 +414,18 @@ msgid "Team Members"
msgstr ""
#. module: sales_team
+#: model:ir.model.fields,field_description:sales_team.field_crm_team__team_type
+msgid "Team Type"
+msgstr ""
+
+#. module: sales_team
#: model:ir.model.fields,help:sales_team.field_crm_team__color
msgid "The color of the channel"
msgstr ""
#. module: sales_team
#: model:ir.model.fields,help:sales_team.field_crm_team__reply_to
-msgid "The email address put in the 'Reply-To' of all emails sent by Odoo about cases in this sales channel"
+msgid "The email address put in the 'Reply-To' of all emails sent by Odoo about cases in this Sales Team"
msgstr ""
#. module: sales_team
@@ -459,10 +455,10 @@ msgid "Type"
msgstr ""
#. module: sales_team
-#: code:addons/sales_team/models/crm_team.py:146
-#: code:addons/sales_team/models/crm_team.py:173
+#: code:addons/sales_team/models/crm_team.py:151
+#: code:addons/sales_team/models/crm_team.py:178
#, python-format
-msgid "Undefined graph model for Sales Channel: %s"
+msgid "Undefined graph model for Sales Team: %s"
msgstr ""
#. module: sales_team
@@ -478,11 +474,16 @@ msgstr ""
#. module: sales_team
#: model:ir.actions.act_window,help:sales_team.crm_team_salesteams_act
#: model:ir.actions.act_window,help:sales_team.sales_team_config_action
-msgid "Use sales channels to organize your sales departments. \n"
+msgid "Use Sales Teams to organize your sales departments.\n"
" Each channel will work with a separate pipeline."
msgstr ""
#. module: sales_team
+#: model:ir.model.fields,field_description:sales_team.field_res_users__sale_team_id
+msgid "User's Sales Team"
+msgstr ""
+
+#. module: sales_team
#: model:res.groups,name:sales_team.group_sale_salesman_all_leads
msgid "User: All Documents"
msgstr ""
diff --git a/addons/sms/i18n/sms.pot b/addons/sms/i18n/sms.pot
index 1c5e71b216e..fa60882128c 100644
--- a/addons/sms/i18n/sms.pot
+++ b/addons/sms/i18n/sms.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:10+0000\n"
-"PO-Revision-Date: 2018-03-22 14:10+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: sms
+#. openerp-web
+#: code:addons/sms/static/src/js/sms_widget.js:93
+#, python-format
+msgid "%s chars, fits in %s SMS (%s) "
+msgstr ""
+
+#. module: sms
#: model:ir.ui.view,arch_db:sms.send_sms_view_form
msgid "Cancel"
msgstr ""
@@ -97,6 +104,13 @@ msgid "Recipients"
msgstr ""
#. module: sms
+#. openerp-web
+#: code:addons/sms/static/src/xml/sms_widget.xml:4
+#, python-format
+msgid "SMS Pricing"
+msgstr ""
+
+#. module: sms
#: code:addons/sms/models/mail_thread.py:48
#, python-format
msgid "SMS message sent: %s"
@@ -110,6 +124,7 @@ msgstr ""
#. module: sms
#: model:ir.actions.act_window,name:sms.send_sms_action
#: model:ir.actions.act_window,name:sms.send_sms_form_action
+#: model:ir.ui.view,arch_db:sms.partner_form_send_sms_form_view
msgid "Send SMS"
msgstr ""
diff --git a/addons/snailmail/i18n/snailmail.pot b/addons/snailmail/i18n/snailmail.pot
new file mode 100644
index 00000000000..30f59711a48
--- /dev/null
+++ b/addons/snailmail/i18n/snailmail.pot
@@ -0,0 +1,256 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * snailmail
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~11.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: snailmail
+#: code:addons/snailmail/models/snailmail_letter.py:229
+#, python-format
+msgid "An error occured when sending the document by post.<br>Error: %s"
+msgstr ""
+
+#. module: snailmail
+#: code:addons/snailmail/models/snailmail_letter.py:197
+#, python-format
+msgid "An unknown error happened. Please contact the support."
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_snailmail_letter__attachment_id
+msgid "Attachment"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_snailmail_letter__duplex
+msgid "Both side"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_res_company__snailmail_duplex
+msgid "Both sides"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.ui.view,arch_db:snailmail.snailmail_letter_form
+msgid "Cancel"
+msgstr ""
+
+#. module: snailmail
+#: selection:snailmail.letter,state:0
+msgid "Canceled"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.ui.view,arch_db:snailmail.res_config_settings_view_form
+msgid "Choose the ink used to print documents"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.ui.view,arch_db:snailmail.res_config_settings_view_form
+msgid "Choose the layout to print documents"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_res_company__snailmail_color
+#: model:ir.model.fields,field_description:snailmail.field_snailmail_letter__color
+msgid "Color"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model,name:snailmail.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_snailmail_letter__company_id
+msgid "Company"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_snailmail_letter__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_snailmail_letter__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_snailmail_letter__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_snailmail_letter__res_id
+msgid "Document ID"
+msgstr ""
+
+#. module: snailmail
+#: selection:snailmail.letter,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: snailmail
+#: selection:snailmail.letter,state:0
+msgid "Error"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_snailmail_letter__id
+msgid "ID"
+msgstr ""
+
+#. module: snailmail
+#: selection:snailmail.letter,state:0
+msgid "In Queue"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_snailmail_letter__info_msg
+msgid "Information"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_snailmail_letter____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_snailmail_letter__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_snailmail_letter__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.actions.act_window,name:snailmail.action_mail_letters
+#: model:ir.ui.menu,name:snailmail.menu_snailmail_letters
+#: model:ir.ui.view,arch_db:snailmail.snailmail_letter_list
+msgid "Letters"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_snailmail_letter__model
+msgid "Model"
+msgstr ""
+
+#. module: snailmail
+#: code:addons/snailmail/models/snailmail_letter.py:195
+#, python-format
+msgid "One or more required fields are empty."
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_snailmail_letter__report_template
+msgid "Optional report to print and attach"
+msgstr ""
+
+#. module: snailmail
+#: code:addons/snailmail/models/snailmail_letter.py:234
+#, python-format
+msgid "Post letter: an error occured."
+msgstr ""
+
+#. module: snailmail
+#: model:ir.ui.view,arch_db:snailmail.res_config_settings_view_form
+msgid "Postal Printings"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_res_config_settings__snailmail_duplex
+msgid "Print Both sides"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_res_config_settings__snailmail_color
+msgid "Print In Color"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_snailmail_letter__partner_id
+msgid "Recipient"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.ui.view,arch_db:snailmail.snailmail_letter_form
+msgid "Send Now"
+msgstr ""
+
+#. module: snailmail
+#: selection:snailmail.letter,state:0
+msgid "Sent"
+msgstr ""
+
+#. module: snailmail
+#: model:mail.activity.type,name:snailmail.mail_activity_data_snailmail
+msgid "Snailmail"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.actions.server,name:snailmail.snailmail_print_ir_actions_server
+#: model:ir.cron,cron_name:snailmail.snailmail_print
+#: model:ir.cron,name:snailmail.snailmail_print
+msgid "Snaimail: process letters queue"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_snailmail_letter__state
+msgid "Status"
+msgstr ""
+
+#. module: snailmail
+#: code:addons/snailmail/models/snailmail_letter.py:193
+#, python-format
+msgid "The country of the partner is not covered by Snailmail."
+msgstr ""
+
+#. module: snailmail
+#: code:addons/snailmail/models/snailmail_letter.py:224
+#, python-format
+msgid "The document was correctly sent by post.<br>The tracking id is %ssend_id"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,field_description:snailmail.field_snailmail_letter__user_id
+msgid "User sending the letter"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model.fields,help:snailmail.field_snailmail_letter__state
+msgid "When a letter is created, the status is 'Draft'.\n"
+"If the letter is correctly sent, the status goes in 'Sent',\n"
+"If not, it will got in state 'Error' and the error message will be displayed in the field 'Error Message'."
+msgstr ""
+
+#. module: snailmail
+#: code:addons/snailmail/models/snailmail_letter.py:191
+#, python-format
+msgid "You don't have enough credits to perform this operation.<br>Please go to your <a href=%s target=\"new\">iap account</a>."
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model,name:snailmail.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#. module: snailmail
+#: model:ir.model,name:snailmail.model_snailmail_letter
+msgid "snailmail.letter"
+msgstr ""
+
diff --git a/addons/snailmail_account/i18n/snailmail_account.pot b/addons/snailmail_account/i18n/snailmail_account.pot
new file mode 100644
index 00000000000..970b242e8e9
--- /dev/null
+++ b/addons/snailmail_account/i18n/snailmail_account.pot
@@ -0,0 +1,83 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * snailmail_account
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~11.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: snailmail_account
+#: model:ir.ui.view,arch_db:snailmail_account.account_invoice_send_inherit_account_wizard_form
+msgid "<span> to: </span>"
+msgstr ""
+
+#. module: snailmail_account
+#: model:ir.model.fields,help:snailmail_account.field_account_invoice_send__snailmail_is_letter
+msgid "Allows to send the document by snail mail (coventional posting delivery service)"
+msgstr ""
+
+#. module: snailmail_account
+#: model:ir.model,name:snailmail_account.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: snailmail_account
+#: model:ir.model.fields,field_description:snailmail_account.field_account_invoice_send__snailmail_cost
+msgid "Credits"
+msgstr ""
+
+#. module: snailmail_account
+#: model:ir.model.fields,field_description:snailmail_account.field_account_invoice_send__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: snailmail_account
+#: model:ir.model.fields,field_description:snailmail_account.field_account_invoice_send__letter_ids
+msgid "Letter"
+msgstr ""
+
+#. module: snailmail_account
+#: model:ir.model.fields,field_description:snailmail_account.field_account_invoice_send__partner_id
+msgid "Partner"
+msgstr ""
+
+#. module: snailmail_account
+#: model:ir.ui.view,arch_db:snailmail_account.res_config_settings_view_form
+msgid "Print In Color"
+msgstr ""
+
+#. module: snailmail_account
+#: model:ir.ui.view,arch_db:snailmail_account.res_config_settings_view_form
+msgid "Print on Both Sides"
+msgstr ""
+
+#. module: snailmail_account
+#: model:ir.model.fields,field_description:snailmail_account.field_res_company__invoice_is_snailmail
+msgid "Send by Letter by default"
+msgstr ""
+
+#. module: snailmail_account
+#: model:ir.model.fields,field_description:snailmail_account.field_account_invoice_send__snailmail_is_letter
+#: model:ir.model.fields,field_description:snailmail_account.field_res_config_settings__invoice_is_snailmail
+msgid "Send by Post"
+msgstr ""
+
+#. module: snailmail_account
+#: model:ir.model,name:snailmail_account.model_account_invoice_send
+msgid "account.invoice.send"
+msgstr ""
+
+#. module: snailmail_account
+#: model:ir.model,name:snailmail_account.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index 10e96f8efda..a6f5ff72783 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:11+0000\n"
-"PO-Revision-Date: 2018-08-02 09:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:03+0000\n"
+"PO-Revision-Date: 2018-08-24 09:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
"Plural-Forms: \n"
#. module: stock
-#: code:addons/stock/models/stock_move.py:343
+#: code:addons/stock/models/stock_move.py:341
#, python-format
msgid "\n"
"\n"
@@ -24,7 +24,7 @@ msgid "\n"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:344
+#: code:addons/stock/models/stock_move.py:342
#, python-format
msgid "\n"
"\n"
@@ -32,13 +32,13 @@ msgid "\n"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:331
+#: code:addons/stock/models/stock_move.py:329
#, python-format
msgid " (%s reserved)"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:334
+#: code:addons/stock/models/stock_move.py:332
#, python-format
msgid " (reserved)"
msgstr ""
@@ -59,7 +59,12 @@ msgid "#Products"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:486
+#: model:ir.ui.view,arch_db:stock.report_stock_rule
+msgid "#{rule[0].route_id.display_name}"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_warehouse.py:559
#, python-format
msgid "%s: Supply Product from %s"
msgstr ""
@@ -93,6 +98,11 @@ msgid "* Vendor Location: Virtual location representing the source location for
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.report_stock_rule
+msgid ", max:"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.exception_on_picking
msgid ".\n"
" Manual actions may be needed."
@@ -105,6 +115,12 @@ msgid "<br/>\n"
msgstr ""
#. module: stock
+#: code:addons/stock/models/stock_rule.py:111
+#, python-format
+msgid "<br>A need is created in <b>%s</b> and a rule will be triggered to fulfill it."
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.view_inventory_form
msgid "<span class=\"o_stat_text\">Details</span>"
msgstr ""
@@ -128,7 +144,12 @@ msgid "<span class=\"o_stat_text\">Min:</span>\n"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.report_delivery_document
+#: model:ir.ui.view,arch_db:stock.product_form_view_procurement_button
+#: model:ir.ui.view,arch_db:stock.product_template_form_view_procurement_button
+msgid "<span class=\"o_stat_text\">On Hand</span>"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.report_picking
msgid "<span><strong>Customer Address:</strong></span>"
msgstr ""
@@ -219,6 +240,11 @@ msgid "<strong>Package</strong>"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_stock_track_confirmation
+msgid "<strong>Product(s) tracked: </strong>"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.report_delivery_document
#: model:ir.ui.view,arch_db:stock.report_inventory
#: model:ir.ui.view,arch_db:stock.report_picking
@@ -268,13 +294,13 @@ msgid "<strong>Total Quantity</strong>"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:122
+#: code:addons/stock/models/stock_inventory.py:123
#, python-format
msgid "A Pack"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move_line.py:87
+#: code:addons/stock/models/stock_move_line.py:82
#, python-format
msgid "A done move line should never have a reserved quantity."
msgstr ""
@@ -288,7 +314,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_product_template__type
#: model:ir.model.fields,help:stock.field_stock_move__product_type
-msgid "A stockable product is a product for which you manage stock. The \"Inventory\" app has to be installed.\n"
+msgid "A storable product is a product for which you manage stock. The \"Inventory\" app has to be installed.\n"
"A consumable product, on the other hand, is a product for which stock is not managed.\n"
"A service is a non-material product you provide.\n"
"A digital content is a non-material product you sell online. The files attached to the products are the one that are sold on the e-commerce such as e-books, music, pictures,... The \"Digital Product\" module has to be installed."
@@ -301,7 +327,7 @@ msgid "A warning can be set on a partner (Stock)"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__action
+#: model:ir.model.fields,field_description:stock.field_stock_rule__action
msgid "Action"
msgstr ""
@@ -312,12 +338,10 @@ msgid "Action Needed"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__active
-#: model:ir.model.fields,field_description:stock.field_stock_incoterms__active
#: model:ir.model.fields,field_description:stock.field_stock_location__active
-#: model:ir.model.fields,field_description:stock.field_stock_location_path__active
#: model:ir.model.fields,field_description:stock.field_stock_location_route__active
#: model:ir.model.fields,field_description:stock.field_stock_picking_type__active
+#: model:ir.model.fields,field_description:stock.field_stock_rule__active
#: model:ir.model.fields,field_description:stock.field_stock_warehouse__active
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint__active
msgid "Active"
@@ -325,11 +349,13 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__activity_ids
+#: model:ir.model.fields,field_description:stock.field_stock_production_lot__activity_ids
msgid "Activities"
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__activity_state
+#: model:ir.model.fields,field_description:stock.field_stock_production_lot__activity_state
msgid "Activity State"
msgstr ""
@@ -376,6 +402,11 @@ msgid "Address"
msgstr ""
#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_rule__partner_address_id
+msgid "Address where goods should be delivered. Optional."
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
msgid "Advanced Scheduling"
msgstr ""
@@ -416,7 +447,7 @@ msgid "All items couldn't be shipped, the remaining ones will be shipped as soon
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:112
+#: code:addons/stock/models/stock_inventory.py:113
#, python-format
msgid "All products"
msgstr ""
@@ -437,6 +468,11 @@ msgid "Allows to suggest the exact location (shelf) where to store the product."
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_stock_rule_form
+msgid "Applicability"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_location_route_form_view
msgid "Applicable On"
msgstr ""
@@ -457,23 +493,16 @@ msgid "Applicable on Warehouse"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_procurement_rule_form
-msgid "Applied On"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,help:stock.field_product_replenish__route_ids
msgid "Apply specific route(s) for the replenishment instead of product's default routes."
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.stock_incoterms_view_search
-#: model:ir.ui.view,arch_db:stock.stock_location_path_filter
#: model:ir.ui.view,arch_db:stock.stock_location_route_view_search
#: model:ir.ui.view,arch_db:stock.stock_warehouse_view_search
#: model:ir.ui.view,arch_db:stock.view_location_search
#: model:ir.ui.view,arch_db:stock.view_pickingtype_filter
-#: model:ir.ui.view,arch_db:stock.view_procurement_rule_filter
+#: model:ir.ui.view,arch_db:stock.view_stock_rule_filter
#: model:ir.ui.view,arch_db:stock.warehouse_orderpoint_search
msgid "Archived"
msgstr ""
@@ -520,12 +549,12 @@ msgid "Attributes"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_location_path__auto
+#: model:ir.model.fields,field_description:stock.field_stock_rule__auto
msgid "Automatic Move"
msgstr ""
#. module: stock
-#: selection:stock.location.path,auto:0
+#: selection:stock.rule,auto:0
msgid "Automatic No Step Added"
msgstr ""
@@ -541,6 +570,7 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.product_template_search_form_view_stock
+#: model:ir.ui.view,arch_db:stock.stock_product_search_form_view
msgid "Available Products"
msgstr ""
@@ -586,6 +616,9 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_location__barcode
+#: model:ir.ui.view,arch_db:stock.report_location_barcode
+#: model:ir.ui.view,arch_db:stock.report_package_barcode
+#: model:ir.ui.view,arch_db:stock.report_package_barcode_small
#: model:ir.ui.view,arch_db:stock.report_picking
msgid "Barcode"
msgstr ""
@@ -616,17 +649,12 @@ msgid "Blocking Message"
msgstr ""
#. module: stock
-#: selection:stock.warehouse,delivery_steps:0
-msgid "Bring goods to output location before shipping (Pick + Ship)"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_quant_package__quant_ids
msgid "Bulk Content"
msgstr ""
#. module: stock
-#: selection:procurement.rule,action:0
+#: selection:stock.rule,action:0
msgid "Buy"
msgstr ""
@@ -641,7 +669,7 @@ msgid "By Unique Serial Number"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:655
+#: code:addons/stock/models/stock_move.py:644
#, python-format
msgid "By changing this quantity here, you accept the new quantity as complete: Odoo will not automatically generate a back order."
msgstr ""
@@ -657,45 +685,20 @@ msgid "By unchecking the active field, you may hide a location without deleting
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_incoterms__active
-msgid "By unchecking the active field, you may hide an INCOTERM you will not use."
-msgstr ""
-
-#. module: stock
-#: model:stock.incoterms,name:stock.incoterm_CIP
-msgid "CARRIAGE AND INSURANCE PAID TO"
-msgstr ""
-
-#. module: stock
-#: model:stock.incoterms,name:stock.incoterm_CPT
-msgid "CARRIAGE PAID TO"
-msgstr ""
-
-#. module: stock
-#: model:stock.incoterms,name:stock.incoterm_CFR
-msgid "COST AND FREIGHT"
-msgstr ""
-
-#. module: stock
-#: model:stock.incoterms,name:stock.incoterm_CIF
-msgid "COST, INSURANCE AND FREIGHT"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_picking_calendar
msgid "Calendar View"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:432
+#: code:addons/stock/models/stock_warehouse.py:520
#, python-format
msgid "Can't find any customer or supplier location."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:481
+#: code:addons/stock/models/stock_warehouse.py:256
#, python-format
-msgid "Can't find any generic Make To Order route."
+msgid "Can't find any generic route %s."
msgstr ""
#. module: stock
@@ -706,6 +709,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:stock.view_procurement_compute_wizard
#: model:ir.ui.view,arch_db:stock.view_stock_quantity_history
#: model:ir.ui.view,arch_db:stock.view_stock_return_picking_form
+#: model:ir.ui.view,arch_db:stock.view_stock_rules_report
msgid "Cancel"
msgstr ""
@@ -729,7 +733,7 @@ msgid "Cancelled Moves"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:279
+#: code:addons/stock/models/stock_move.py:277
#, python-format
msgid "Cannot set the done quantity from this stock move, work directly with the move lines."
msgstr ""
@@ -822,11 +826,6 @@ msgid "Client"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_incoterms__code
-msgid "Code"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking_type__color
msgid "Color"
msgstr ""
@@ -837,17 +836,16 @@ msgid "Companies"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__company_id
#: model:ir.model.fields,field_description:stock.field_report_stock_forecast__company_id
#: model:ir.model.fields,field_description:stock.field_stock_inventory__company_id
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line__company_id
#: model:ir.model.fields,field_description:stock.field_stock_location__company_id
-#: model:ir.model.fields,field_description:stock.field_stock_location_path__company_id
#: model:ir.model.fields,field_description:stock.field_stock_location_route__company_id
#: model:ir.model.fields,field_description:stock.field_stock_move__company_id
#: model:ir.model.fields,field_description:stock.field_stock_picking__company_id
#: model:ir.model.fields,field_description:stock.field_stock_quant__company_id
#: model:ir.model.fields,field_description:stock.field_stock_quant_package__company_id
+#: model:ir.model.fields,field_description:stock.field_stock_rule__company_id
#: model:ir.model.fields,field_description:stock.field_stock_warehouse__company_id
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint__company_id
#: model:ir.ui.view,arch_db:stock.quant_package_search_view
@@ -910,6 +908,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:stock.view_overprocessed_transfer
#: model:ir.ui.view,arch_db:stock.view_product_replenish
#: model:ir.ui.view,arch_db:stock.view_stock_move_operations
+#: model:ir.ui.view,arch_db:stock.view_stock_track_confirmation
msgid "Confirm"
msgstr ""
@@ -1005,7 +1004,7 @@ msgid "Create Backorder"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:757
+#: code:addons/stock/models/stock_picking.py:756
#, python-format
msgid "Create Backorder?"
msgstr ""
@@ -1016,25 +1015,22 @@ msgid "Create Date"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move_line__picking_type_use_create_lots
#: model:ir.model.fields,field_description:stock.field_stock_picking_type__use_create_lots
msgid "Create New Lots/Serial Numbers"
msgstr ""
#. module: stock
-#: selection:procurement.rule,procure_method:0
-msgid "Create Procurement"
+#: model:ir.model.fields,help:stock.field_stock_rule__procure_method
+msgid "Create Procurement: A procurement will be created in the source location and the system will try to find a rule to resolve it. The available stock will be ignored.\n"
+" Take from Stock: The products will be taken from the available stock."
msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_backorder_confirmation
-msgid "Create a backorder, if you expect to process the remaining\n"
-" products later. Do not create a backorder if you will not\n"
-" supply the remaining products."
-msgstr ""
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_incoterms_tree
-msgid "Create a new incoterm"
+msgid "Create a backorder if you expect to process the remaining\n"
+" products later. Do not create a backorder if you will not\n"
+" process the remaining products."
msgstr ""
#. module: stock
@@ -1079,7 +1075,6 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_procurement_group__create_uid
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__create_uid
#: model:ir.model.fields,field_description:stock.field_product_putaway__create_uid
#: model:ir.model.fields,field_description:stock.field_product_removal__create_uid
#: model:ir.model.fields,field_description:stock.field_product_replenish__create_uid
@@ -1087,11 +1082,9 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty__create_uid
#: model:ir.model.fields,field_description:stock.field_stock_fixed_putaway_strat__create_uid
#: model:ir.model.fields,field_description:stock.field_stock_immediate_transfer__create_uid
-#: model:ir.model.fields,field_description:stock.field_stock_incoterms__create_uid
#: model:ir.model.fields,field_description:stock.field_stock_inventory__create_uid
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line__create_uid
#: model:ir.model.fields,field_description:stock.field_stock_location__create_uid
-#: model:ir.model.fields,field_description:stock.field_stock_location_path__create_uid
#: model:ir.model.fields,field_description:stock.field_stock_location_route__create_uid
#: model:ir.model.fields,field_description:stock.field_stock_move__create_uid
#: model:ir.model.fields,field_description:stock.field_stock_move_line__create_uid
@@ -1105,9 +1098,13 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_quantity_history__create_uid
#: model:ir.model.fields,field_description:stock.field_stock_return_picking__create_uid
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line__create_uid
+#: model:ir.model.fields,field_description:stock.field_stock_rule__create_uid
+#: model:ir.model.fields,field_description:stock.field_stock_rules_report__create_uid
#: model:ir.model.fields,field_description:stock.field_stock_scheduler_compute__create_uid
#: model:ir.model.fields,field_description:stock.field_stock_scrap__create_uid
#: model:ir.model.fields,field_description:stock.field_stock_traceability_report__create_uid
+#: model:ir.model.fields,field_description:stock.field_stock_track_confirmation__create_uid
+#: model:ir.model.fields,field_description:stock.field_stock_track_line__create_uid
#: model:ir.model.fields,field_description:stock.field_stock_warehouse__create_uid
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint__create_uid
#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty_scrap__create_uid
@@ -1116,7 +1113,6 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_procurement_group__create_date
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__create_date
#: model:ir.model.fields,field_description:stock.field_product_putaway__create_date
#: model:ir.model.fields,field_description:stock.field_product_removal__create_date
#: model:ir.model.fields,field_description:stock.field_product_replenish__create_date
@@ -1124,11 +1120,9 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty__create_date
#: model:ir.model.fields,field_description:stock.field_stock_fixed_putaway_strat__create_date
#: model:ir.model.fields,field_description:stock.field_stock_immediate_transfer__create_date
-#: model:ir.model.fields,field_description:stock.field_stock_incoterms__create_date
#: model:ir.model.fields,field_description:stock.field_stock_inventory__create_date
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line__create_date
#: model:ir.model.fields,field_description:stock.field_stock_location__create_date
-#: model:ir.model.fields,field_description:stock.field_stock_location_path__create_date
#: model:ir.model.fields,field_description:stock.field_stock_location_route__create_date
#: model:ir.model.fields,field_description:stock.field_stock_move_line__create_date
#: model:ir.model.fields,field_description:stock.field_stock_overprocessed_transfer__create_date
@@ -1140,9 +1134,13 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_quantity_history__create_date
#: model:ir.model.fields,field_description:stock.field_stock_return_picking__create_date
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line__create_date
+#: model:ir.model.fields,field_description:stock.field_stock_rule__create_date
+#: model:ir.model.fields,field_description:stock.field_stock_rules_report__create_date
#: model:ir.model.fields,field_description:stock.field_stock_scheduler_compute__create_date
#: model:ir.model.fields,field_description:stock.field_stock_scrap__create_date
#: model:ir.model.fields,field_description:stock.field_stock_traceability_report__create_date
+#: model:ir.model.fields,field_description:stock.field_stock_track_confirmation__create_date
+#: model:ir.model.fields,field_description:stock.field_stock_track_line__create_date
#: model:ir.model.fields,field_description:stock.field_stock_warehouse__create_date
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint__create_date
#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty_scrap__create_date
@@ -1150,11 +1148,6 @@ msgid "Created on"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_procurement_rule_form
-msgid "Creates"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.view_move_search
msgid "Creation"
msgstr ""
@@ -1177,7 +1170,7 @@ msgid "Credit Card"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:437
+#: code:addons/stock/models/stock_warehouse.py:525
#, python-format
msgid "Cross-Dock"
msgstr ""
@@ -1238,47 +1231,11 @@ msgid "Customer Locations"
msgstr ""
#. module: stock
-#: model:stock.location,name:stock.stock_location_customers
#: selection:stock.picking.type,code:0
msgid "Customers"
msgstr ""
#. module: stock
-#: model:stock.incoterms,name:stock.incoterm_DAF
-msgid "DELIVERED AT FRONTIER"
-msgstr ""
-
-#. module: stock
-#: model:stock.incoterms,name:stock.incoterm_DAP
-msgid "DELIVERED AT PLACE"
-msgstr ""
-
-#. module: stock
-#: model:stock.incoterms,name:stock.incoterm_DAT
-msgid "DELIVERED AT TERMINAL"
-msgstr ""
-
-#. module: stock
-#: model:stock.incoterms,name:stock.incoterm_DDP
-msgid "DELIVERED DUTY PAID"
-msgstr ""
-
-#. module: stock
-#: model:stock.incoterms,name:stock.incoterm_DDU
-msgid "DELIVERED DUTY UNPAID"
-msgstr ""
-
-#. module: stock
-#: model:stock.incoterms,name:stock.incoterm_DEQ
-msgid "DELIVERED EX QUAY"
-msgstr ""
-
-#. module: stock
-#: model:stock.incoterms,name:stock.incoterm_DES
-msgid "DELIVERED EX SHIP"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_res_config_settings__module_delivery_dhl
msgid "DHL Connector"
msgstr ""
@@ -1295,6 +1252,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:stock.report_stock_body_print
#: model:ir.ui.view,arch_db:stock.report_stock_inventory
#: model:ir.ui.view,arch_db:stock.stock_move_tree
+#: model:ir.ui.view,arch_db:stock.view_move_search
msgid "Date"
msgstr ""
@@ -1339,11 +1297,6 @@ msgid "Default Owner"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_warehouse__default_resupply_wh_id
-msgid "Default Resupply Warehouse"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking_type__default_location_src_id
msgid "Default Source Location"
msgstr ""
@@ -1415,18 +1368,35 @@ msgid "Defines the default method used for suggesting the exact location (shelf)
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.stock_location_path_form
-#: model:ir.ui.view,arch_db:stock.view_procurement_rule_form
+#: model:ir.model.fields,field_description:stock.field_stock_rule__delay
msgid "Delay"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_location_path__delay
-msgid "Delay (days)"
+#: selection:stock.warehouse,delivery_steps:0
+msgid "Deliver goods directly (1 step)"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:331
+#: code:addons/stock/models/stock_warehouse.py:526
+#, python-format
+msgid "Deliver in 1 step (ship)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_warehouse.py:526
+#, python-format
+msgid "Deliver in 2 steps (pick + ship)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_warehouse.py:527
+#, python-format
+msgid "Deliver in 3 steps (pick + pack + ship)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/product.py:333
#, python-format
msgid "Delivered Qty"
msgstr ""
@@ -1437,7 +1407,7 @@ msgid "Deliveries"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:213
+#: code:addons/stock/models/stock_warehouse.py:733
#: model:stock.picking.type,name:stock.picking_type_out
#, python-format
msgid "Delivery Orders"
@@ -1525,9 +1495,11 @@ msgid "Destination Address "
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_location_path__location_dest_id
+#: code:addons/stock/models/stock_rule.py:96
#: model:ir.model.fields,field_description:stock.field_stock_move__location_dest_id
#: model:ir.model.fields,field_description:stock.field_stock_picking__location_dest_id
+#: model:ir.model.fields,field_description:stock.field_stock_rule__location_id
+#, python-format
msgid "Destination Location"
msgstr ""
@@ -1559,31 +1531,22 @@ msgid "Destination route"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:471
+#: code:addons/stock/models/stock_move.py:470
#: model:ir.ui.view,arch_db:stock.view_picking_form
#, python-format
msgid "Detailed Operations"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.stock_location_path_form
-msgid "Details"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__show_details_visible
msgid "Details Visible"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_procurement_rule__procure_method
-msgid "Determines the procurement method of the stock move that will be generated: whether it will need to 'take from the available stock' in its source location or needs to ignore its stock and create a procurement over there."
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_warn_insufficient_qty_form_view
#: model:ir.ui.view,arch_db:stock.view_product_replenish
#: model:ir.ui.view,arch_db:stock.view_stock_move_operations
+#: model:ir.ui.view,arch_db:stock.view_stock_track_confirmation
msgid "Discard"
msgstr ""
@@ -1593,21 +1556,29 @@ msgid "Discounted Product"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_res_config_settings__group_lot_on_delivery_slip
+msgid "Display Lots & Serial Numbers"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_res_users__has_group_lot_on_delivery_slip
+msgid "Display Lots & Serial Numbers on Delivery Slip"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_procurement_group__display_name
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__display_name
#: model:ir.model.fields,field_description:stock.field_product_putaway__display_name
#: model:ir.model.fields,field_description:stock.field_product_removal__display_name
#: model:ir.model.fields,field_description:stock.field_product_replenish__display_name
#: model:ir.model.fields,field_description:stock.field_report_stock_forecast__display_name
+#: model:ir.model.fields,field_description:stock.field_report_stock_report_stock_rule__display_name
#: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation__display_name
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty__display_name
#: model:ir.model.fields,field_description:stock.field_stock_fixed_putaway_strat__display_name
#: model:ir.model.fields,field_description:stock.field_stock_immediate_transfer__display_name
-#: model:ir.model.fields,field_description:stock.field_stock_incoterms__display_name
#: model:ir.model.fields,field_description:stock.field_stock_inventory__display_name
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line__display_name
#: model:ir.model.fields,field_description:stock.field_stock_location__display_name
-#: model:ir.model.fields,field_description:stock.field_stock_location_path__display_name
#: model:ir.model.fields,field_description:stock.field_stock_location_route__display_name
#: model:ir.model.fields,field_description:stock.field_stock_move__display_name
#: model:ir.model.fields,field_description:stock.field_stock_move_line__display_name
@@ -1621,9 +1592,13 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_quantity_history__display_name
#: model:ir.model.fields,field_description:stock.field_stock_return_picking__display_name
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line__display_name
+#: model:ir.model.fields,field_description:stock.field_stock_rule__display_name
+#: model:ir.model.fields,field_description:stock.field_stock_rules_report__display_name
#: model:ir.model.fields,field_description:stock.field_stock_scheduler_compute__display_name
#: model:ir.model.fields,field_description:stock.field_stock_scrap__display_name
#: model:ir.model.fields,field_description:stock.field_stock_traceability_report__display_name
+#: model:ir.model.fields,field_description:stock.field_stock_track_confirmation__display_name
+#: model:ir.model.fields,field_description:stock.field_stock_track_line__display_name
#: model:ir.model.fields,field_description:stock.field_stock_warehouse__display_name
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint__display_name
#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty__display_name
@@ -1632,6 +1607,11 @@ msgid "Display Name"
msgstr ""
#. module: stock
+#: model:res.groups,name:stock.group_lot_on_delivery_slip
+msgid "Display Serial & Lot Number in Delivery Slips"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move_line__qty_done
#: model:ir.model.fields,field_description:stock.field_stock_package_level__is_done
#: model:ir.ui.view,arch_db:stock.stock_move_line_view_search
@@ -1676,11 +1656,6 @@ msgid "Draft Moves"
msgstr ""
#. module: stock
-#: model:stock.incoterms,name:stock.incoterm_EXW
-msgid "EX WORKS"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_res_config_settings__module_delivery_easypost
msgid "Easypost Connector"
msgstr ""
@@ -1692,7 +1667,7 @@ msgstr ""
#. module: stock
#. openerp-web
-#: code:addons/stock/static/src/xml/stock_traceability_report_backend.xml:14
+#: code:addons/stock/static/src/xml/stock_traceability_report_backend.xml:13
#, python-format
msgid "Error"
msgstr ""
@@ -1717,11 +1692,6 @@ msgid "Exception(s):"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.product_template_search_form_view_stock
-msgid "Exhausted Stock"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__date_expected
#: model:ir.model.fields,field_description:stock.field_stock_scrap__date_expected
#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
@@ -1744,21 +1714,6 @@ msgid "FIFO, LIFO..."
msgstr ""
#. module: stock
-#: model:stock.incoterms,name:stock.incoterm_FAS
-msgid "FREE ALONGSIDE SHIP"
-msgstr ""
-
-#. module: stock
-#: model:stock.incoterms,name:stock.incoterm_FCA
-msgid "FREE CARRIER"
-msgstr ""
-
-#. module: stock
-#: model:stock.incoterms,name:stock.incoterm_FOB
-msgid "FREE ON BOARD"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_res_config_settings__module_delivery_fedex
msgid "FedEx Connector"
msgstr ""
@@ -1769,7 +1724,7 @@ msgid "Filters"
msgstr ""
#. module: stock
-#: selection:procurement.rule,group_propagation_option:0
+#: selection:stock.rule,group_propagation_option:0
msgid "Fixed"
msgstr ""
@@ -1784,11 +1739,18 @@ msgid "Fixed Locations Per Product Category"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__group_id
+#: model:ir.model.fields,field_description:stock.field_stock_rule__group_id
msgid "Fixed Procurement Group"
msgstr ""
#. module: stock
+#. openerp-web
+#: code:addons/stock/static/src/xml/stock_traceability_report_line.xml:6
+#, python-format
+msgid "Fold"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__message_follower_ids
#: model:ir.model.fields,field_description:stock.field_stock_production_lot__message_follower_ids
msgid "Followers"
@@ -1825,7 +1787,7 @@ msgid "Forecast quantity (computed as Quantity On Hand - Outgoing + Incoming)\n"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:326
+#: code:addons/stock/models/product.py:328
#: model:ir.model.fields,field_description:stock.field_product_template__virtual_available
#: model:ir.model.fields,field_description:stock.field_stock_move__availability
#, python-format
@@ -1837,16 +1799,12 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_package_level__location_id
#: model:ir.ui.view,arch_db:stock.report_stock_body_print
#: model:ir.ui.view,arch_db:stock.report_stock_inventory
+#: model:ir.ui.view,arch_db:stock.view_inventory_form
#: model:ir.ui.view,arch_db:stock.view_move_tree
msgid "From"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_move_line__from_loc
-msgid "From Loc"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__show_reserved_availability
msgid "From Supplier"
msgstr ""
@@ -1862,31 +1820,31 @@ msgid "Future Activities"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:329
+#: code:addons/stock/models/product.py:331
#, python-format
msgid "Future Deliveries"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:334
+#: code:addons/stock/models/product.py:336
#, python-format
msgid "Future P&L"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:344
+#: code:addons/stock/models/product.py:346
#, python-format
msgid "Future Productions"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:339
+#: code:addons/stock/models/product.py:341
#, python-format
msgid "Future Qty"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:321
+#: code:addons/stock/models/product.py:323
#, python-format
msgid "Future Receipts"
msgstr ""
@@ -1907,17 +1865,6 @@ msgid "Give to the more specialized category, a higher priority to have them in
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.stock_location_path_filter
-#: model:ir.ui.view,arch_db:stock.view_procurement_rule_filter
-msgid "Global"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_warehouse__default_resupply_wh_id
-msgid "Goods will always be resupplied from this warehouse"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.view_stock_level_forecast_filter
msgid "Graph"
msgstr ""
@@ -1937,6 +1884,7 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.quant_package_search_view
#: model:ir.ui.view,arch_db:stock.quant_search_view
+#: model:ir.ui.view,arch_db:stock.view_stock_rule_filter
msgid "Group by..."
msgstr ""
@@ -1967,6 +1915,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_product_replenish__product_has_variants
+#: model:ir.model.fields,field_description:stock.field_stock_rules_report__product_has_variants
msgid "Has variants"
msgstr ""
@@ -1984,20 +1933,18 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_procurement_group__id
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__id
#: model:ir.model.fields,field_description:stock.field_product_putaway__id
#: model:ir.model.fields,field_description:stock.field_product_removal__id
#: model:ir.model.fields,field_description:stock.field_product_replenish__id
#: model:ir.model.fields,field_description:stock.field_report_stock_forecast__id
+#: model:ir.model.fields,field_description:stock.field_report_stock_report_stock_rule__id
#: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation__id
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty__id
#: model:ir.model.fields,field_description:stock.field_stock_fixed_putaway_strat__id
#: model:ir.model.fields,field_description:stock.field_stock_immediate_transfer__id
-#: model:ir.model.fields,field_description:stock.field_stock_incoterms__id
#: model:ir.model.fields,field_description:stock.field_stock_inventory__id
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line__id
#: model:ir.model.fields,field_description:stock.field_stock_location__id
-#: model:ir.model.fields,field_description:stock.field_stock_location_path__id
#: model:ir.model.fields,field_description:stock.field_stock_location_route__id
#: model:ir.model.fields,field_description:stock.field_stock_move__id
#: model:ir.model.fields,field_description:stock.field_stock_move_line__id
@@ -2011,9 +1958,13 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_quantity_history__id
#: model:ir.model.fields,field_description:stock.field_stock_return_picking__id
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line__id
+#: model:ir.model.fields,field_description:stock.field_stock_rule__id
+#: model:ir.model.fields,field_description:stock.field_stock_rules_report__id
#: model:ir.model.fields,field_description:stock.field_stock_scheduler_compute__id
#: model:ir.model.fields,field_description:stock.field_stock_scrap__id
#: model:ir.model.fields,field_description:stock.field_stock_traceability_report__id
+#: model:ir.model.fields,field_description:stock.field_stock_track_confirmation__id
+#: model:ir.model.fields,field_description:stock.field_stock_track_line__id
#: model:ir.model.fields,field_description:stock.field_stock_warehouse__id
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint__id
#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty__id
@@ -2022,13 +1973,13 @@ msgid "ID"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:402
+#: code:addons/stock/models/stock_inventory.py:431
#, python-format
msgid "INV:"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:97
+#: code:addons/stock/wizard/stock_change_product_qty.py:88
#, python-format
msgid "INV: %s"
msgstr ""
@@ -2057,16 +2008,6 @@ msgid "If checked, some messages have a delivery error."
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_location_path__propagate
-msgid "If checked, when the previous move is cancelled or split, the move generated by this move will too"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,help:stock.field_procurement_rule__propagate
-msgid "If checked, when the previous move of the move (which was generated by a next procurement) is cancelled or split, the move generated by this move will too"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,help:stock.field_stock_move__propagate
msgid "If checked, when this move is cancelled, cancel the linked move too"
msgstr ""
@@ -2087,14 +2028,14 @@ msgid "If the active field is set to False, it will allow you to hide the route
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_picking_form
-msgid "If the picking is unlocked you can edit initial demand (for a draft picking) or done quantities (for a done picking)."
+#: model:ir.model.fields,help:stock.field_stock_inventory__date
+msgid "If the inventory adjustment is not validated, date at which the theoritical quantities have been checked.\n"
+"If the inventory adjustment is validated, date at which the inventory adjustment has been validated."
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.stock_location_path_filter
-#: model:ir.ui.view,arch_db:stock.view_procurement_rule_filter
-msgid "If the route is global"
+#: model:ir.ui.view,arch_db:stock.view_picking_form
+msgid "If the picking is unlocked you can edit initial demand (for a draft picking) or done quantities (for a done picking)."
msgstr ""
#. module: stock
@@ -2109,11 +2050,13 @@ msgid "If this checkbox is ticked, the pickings lines will represent detailed st
msgstr ""
#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_move_line__picking_type_use_create_lots
#: model:ir.model.fields,help:stock.field_stock_picking_type__use_create_lots
msgid "If this is checked only, it will suppose you want to create new Lots/Serial Numbers, so you can provide them in a text field. "
msgstr ""
#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_move_line__picking_type_use_existing_lots
#: model:ir.model.fields,help:stock.field_stock_picking_type__use_existing_lots
msgid "If this is checked, you will be able to choose the Lots/Serial Numbers. You can also decide to not put lots in this operation type. This means it will create stock with no lot or not put a restriction on the lot taken. "
msgstr ""
@@ -2133,7 +2076,7 @@ msgid "If ticked, you will be able to select entire packages to move"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_procurement_rule__active
+#: model:ir.model.fields,help:stock.field_stock_rule__active
msgid "If unchecked, it will allow you to hide the rule without removing it."
msgstr ""
@@ -2150,7 +2093,7 @@ msgid "Immediate Transfer"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:720
+#: code:addons/stock/models/stock_picking.py:719
#, python-format
msgid "Immediate Transfer?"
msgstr ""
@@ -2203,39 +2146,14 @@ msgid "Incoming Shipments"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_incoterms__code
-msgid "Incoterm Standard Code"
-msgstr ""
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_incoterms_tree
-#: model:ir.model,name:stock.model_stock_incoterms
-#: model:ir.ui.menu,name:stock.menu_action_incoterm_open
-#: model:ir.ui.view,arch_db:stock.stock_incoterms_form
-#: model:ir.ui.view,arch_db:stock.stock_incoterms_view_search
-#: model:ir.ui.view,arch_db:stock.view_incoterms_tree
-msgid "Incoterms"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_incoterms__name
-msgid "Incoterms are series of sales terms. They are used to divide transaction costs and responsibilities between buyer and seller and reflect state-of-the-art transportation practices."
-msgstr ""
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_incoterms_tree
-msgid "Incoterms are used to divide transaction costs and responsibilities between buyer and seller."
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__product_uom_qty
+#: model:ir.ui.view,arch_db:stock.view_move_kandan
#: model:ir.ui.view,arch_db:stock.view_picking_form
msgid "Initial Demand"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:97
-#: model:stock.location,name:stock.stock_location_company
+#: code:addons/stock/models/stock_warehouse.py:444
#, python-format
msgid "Input"
msgstr ""
@@ -2246,17 +2164,12 @@ msgid "Input Location"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_scrap.py:135
+#: code:addons/stock/models/stock_scrap.py:137
#, python-format
msgid "Insufficient Quantity"
msgstr ""
#. module: stock
-#: model:stock.location,name:stock.stock_location_inter_wh
-msgid "Inter Company Transit"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_move_line_view_search
#: model:ir.ui.view,arch_db:stock.view_location_search
#: selection:stock.picking.type,code:0
@@ -2280,7 +2193,7 @@ msgid "Internal Reference"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:235
+#: code:addons/stock/models/stock_warehouse.py:755
#: model:stock.picking.type,name:stock.picking_type_internal
#, python-format
msgid "Internal Transfers"
@@ -2302,19 +2215,19 @@ msgid "Internal reference number in case it differs from the manufacturer's lot/
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:250
+#: code:addons/stock/models/product.py:252
#, python-format
msgid "Invalid domain left operand %s"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:252
+#: code:addons/stock/models/product.py:254
#, python-format
msgid "Invalid domain operator %s"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:254
+#: code:addons/stock/models/product.py:256
#, python-format
msgid "Invalid domain right operand %s"
msgstr ""
@@ -2362,6 +2275,7 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_res_users__group_stock_user
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line__inventory_id
#: model:ir.model.fields,field_description:stock.field_stock_move__inventory_id
+#: model:ir.model.fields,field_description:stock.field_stock_track_confirmation__inventory_id
#: model:ir.ui.menu,name:stock.menu_stock_root
#: model:ir.ui.menu,name:stock.menu_valuation
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
@@ -2447,11 +2361,6 @@ msgid "Inventory Valuation"
msgstr ""
#. module: stock
-#: model:stock.location,name:stock.location_inventory
-msgid "Inventory adjustment"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.view_inventory_form
msgid "Inventory adjustments will be made by comparing the theoretical and the checked quantities."
msgstr ""
@@ -2529,26 +2438,29 @@ msgid "It specifies goods to be deliver partially or all at once"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.report_lot_label
+msgid "LN/SN:"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking_type__last_done_picking
msgid "Last 10 Done Pickings"
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_procurement_group____last_update
-#: model:ir.model.fields,field_description:stock.field_procurement_rule____last_update
#: model:ir.model.fields,field_description:stock.field_product_putaway____last_update
#: model:ir.model.fields,field_description:stock.field_product_removal____last_update
#: model:ir.model.fields,field_description:stock.field_product_replenish____last_update
#: model:ir.model.fields,field_description:stock.field_report_stock_forecast____last_update
+#: model:ir.model.fields,field_description:stock.field_report_stock_report_stock_rule____last_update
#: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation____last_update
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty____last_update
#: model:ir.model.fields,field_description:stock.field_stock_fixed_putaway_strat____last_update
#: model:ir.model.fields,field_description:stock.field_stock_immediate_transfer____last_update
-#: model:ir.model.fields,field_description:stock.field_stock_incoterms____last_update
#: model:ir.model.fields,field_description:stock.field_stock_inventory____last_update
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line____last_update
#: model:ir.model.fields,field_description:stock.field_stock_location____last_update
-#: model:ir.model.fields,field_description:stock.field_stock_location_path____last_update
#: model:ir.model.fields,field_description:stock.field_stock_location_route____last_update
#: model:ir.model.fields,field_description:stock.field_stock_move____last_update
#: model:ir.model.fields,field_description:stock.field_stock_move_line____last_update
@@ -2562,9 +2474,13 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_quantity_history____last_update
#: model:ir.model.fields,field_description:stock.field_stock_return_picking____last_update
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line____last_update
+#: model:ir.model.fields,field_description:stock.field_stock_rule____last_update
+#: model:ir.model.fields,field_description:stock.field_stock_rules_report____last_update
#: model:ir.model.fields,field_description:stock.field_stock_scheduler_compute____last_update
#: model:ir.model.fields,field_description:stock.field_stock_scrap____last_update
#: model:ir.model.fields,field_description:stock.field_stock_traceability_report____last_update
+#: model:ir.model.fields,field_description:stock.field_stock_track_confirmation____last_update
+#: model:ir.model.fields,field_description:stock.field_stock_track_line____last_update
#: model:ir.model.fields,field_description:stock.field_stock_warehouse____last_update
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint____last_update
#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty____last_update
@@ -2574,7 +2490,6 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_procurement_group__write_uid
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__write_uid
#: model:ir.model.fields,field_description:stock.field_product_putaway__write_uid
#: model:ir.model.fields,field_description:stock.field_product_removal__write_uid
#: model:ir.model.fields,field_description:stock.field_product_replenish__write_uid
@@ -2582,11 +2497,9 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty__write_uid
#: model:ir.model.fields,field_description:stock.field_stock_fixed_putaway_strat__write_uid
#: model:ir.model.fields,field_description:stock.field_stock_immediate_transfer__write_uid
-#: model:ir.model.fields,field_description:stock.field_stock_incoterms__write_uid
#: model:ir.model.fields,field_description:stock.field_stock_inventory__write_uid
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line__write_uid
#: model:ir.model.fields,field_description:stock.field_stock_location__write_uid
-#: model:ir.model.fields,field_description:stock.field_stock_location_path__write_uid
#: model:ir.model.fields,field_description:stock.field_stock_location_route__write_uid
#: model:ir.model.fields,field_description:stock.field_stock_move__write_uid
#: model:ir.model.fields,field_description:stock.field_stock_move_line__write_uid
@@ -2600,9 +2513,13 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_quantity_history__write_uid
#: model:ir.model.fields,field_description:stock.field_stock_return_picking__write_uid
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line__write_uid
+#: model:ir.model.fields,field_description:stock.field_stock_rule__write_uid
+#: model:ir.model.fields,field_description:stock.field_stock_rules_report__write_uid
#: model:ir.model.fields,field_description:stock.field_stock_scheduler_compute__write_uid
#: model:ir.model.fields,field_description:stock.field_stock_scrap__write_uid
#: model:ir.model.fields,field_description:stock.field_stock_traceability_report__write_uid
+#: model:ir.model.fields,field_description:stock.field_stock_track_confirmation__write_uid
+#: model:ir.model.fields,field_description:stock.field_stock_track_line__write_uid
#: model:ir.model.fields,field_description:stock.field_stock_warehouse__write_uid
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint__write_uid
#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty_scrap__write_uid
@@ -2611,7 +2528,6 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_procurement_group__write_date
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__write_date
#: model:ir.model.fields,field_description:stock.field_product_putaway__write_date
#: model:ir.model.fields,field_description:stock.field_product_removal__write_date
#: model:ir.model.fields,field_description:stock.field_product_replenish__write_date
@@ -2619,11 +2535,9 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty__write_date
#: model:ir.model.fields,field_description:stock.field_stock_fixed_putaway_strat__write_date
#: model:ir.model.fields,field_description:stock.field_stock_immediate_transfer__write_date
-#: model:ir.model.fields,field_description:stock.field_stock_incoterms__write_date
#: model:ir.model.fields,field_description:stock.field_stock_inventory__write_date
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line__write_date
#: model:ir.model.fields,field_description:stock.field_stock_location__write_date
-#: model:ir.model.fields,field_description:stock.field_stock_location_path__write_date
#: model:ir.model.fields,field_description:stock.field_stock_location_route__write_date
#: model:ir.model.fields,field_description:stock.field_stock_move__write_date
#: model:ir.model.fields,field_description:stock.field_stock_move_line__write_date
@@ -2637,9 +2551,13 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_quantity_history__write_date
#: model:ir.model.fields,field_description:stock.field_stock_return_picking__write_date
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line__write_date
+#: model:ir.model.fields,field_description:stock.field_stock_rule__write_date
+#: model:ir.model.fields,field_description:stock.field_stock_rules_report__write_date
#: model:ir.model.fields,field_description:stock.field_stock_scheduler_compute__write_date
#: model:ir.model.fields,field_description:stock.field_stock_scrap__write_date
#: model:ir.model.fields,field_description:stock.field_stock_traceability_report__write_date
+#: model:ir.model.fields,field_description:stock.field_stock_track_confirmation__write_date
+#: model:ir.model.fields,field_description:stock.field_stock_track_line__write_date
#: model:ir.model.fields,field_description:stock.field_stock_warehouse__write_date
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint__write_date
#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty_scrap__write_date
@@ -2675,7 +2593,7 @@ msgid "Lead Type"
msgstr ""
#. module: stock
-#: selection:procurement.rule,group_propagation_option:0
+#: selection:stock.rule,group_propagation_option:0
msgid "Leave Empty"
msgstr ""
@@ -2685,6 +2603,11 @@ msgid "Leave this field empty if this route is shared between all companies"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.report_stock_rule
+msgid "Legend"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,help:stock.field_stock_location__company_id
#: model:ir.model.fields,help:stock.field_stock_quant__company_id
msgid "Let this field empty if this location is shared between companies"
@@ -2744,12 +2667,6 @@ msgid "Location Name"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.stock_location_path_form
-#: model:ir.ui.view,arch_db:stock.stock_location_path_tree
-msgid "Location Paths"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_warehouse__lot_stock_id
msgid "Location Stock"
msgstr ""
@@ -2768,7 +2685,6 @@ msgstr ""
#: model:ir.actions.act_window,name:stock.action_location_form
#: model:ir.ui.menu,name:stock.menu_action_location_form
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
-#: model:ir.ui.view,arch_db:stock.stock_location_path_form
#: model:ir.ui.view,arch_db:stock.view_move_picking_form
#: model:ir.ui.view,arch_db:stock.view_picking_type_form
#: model:ir.ui.view,arch_db:stock.view_warehouse
@@ -2789,18 +2705,12 @@ msgstr ""
#. module: stock
#: code:addons/stock/models/barcode.py:13
#: selection:barcode.rule,type:0
-#: model:ir.model.fields,field_description:stock.field_stock_move_line__lot_id
#: model:ir.model.fields,field_description:stock.field_stock_scrap__lot_id
#, python-format
msgid "Lot"
msgstr ""
#. module: stock
-#: model:ir.actions.report,name:stock.action_report_lot_barcode
-msgid "Lot Barcode"
-msgstr ""
-
-#. module: stock
#: model:ir.model,name:stock.model_stock_production_lot
msgid "Lot/Serial"
msgstr ""
@@ -2817,35 +2727,54 @@ msgid "Lot/Serial :"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty__lot_id
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line__prod_lot_id
-#: model:ir.model.fields,field_description:stock.field_stock_move_line__lot_name
+#: model:ir.model.fields,field_description:stock.field_stock_move_line__lot_id
#: model:ir.model.fields,field_description:stock.field_stock_production_lot__name
#: model:ir.model.fields,field_description:stock.field_stock_quant__lot_id
#: model:ir.ui.view,arch_db:stock.product_form_view_procurement_button
#: model:ir.ui.view,arch_db:stock.product_template_form_view_procurement_button
#: model:ir.ui.view,arch_db:stock.quant_search_view
-#: model:ir.ui.view,arch_db:stock.report_lot_barcode
+#: model:ir.ui.view,arch_db:stock.report_delivery_document
#: model:ir.ui.view,arch_db:stock.report_package_barcode
msgid "Lot/Serial Number"
msgstr ""
#. module: stock
+#: model:ir.actions.report,name:stock.action_report_lot_label
+msgid "Lot/Serial Number (PDF)"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.view_inventory_tree
msgid "Lot/Serial Number Inventory"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move_line__lot_name
+msgid "Lot/Serial Number Name"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_res_config_settings__group_stock_production_lot
msgid "Lots & Serial Numbers"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
+msgid "Lots &amp; Serial numbers will appear on the delivery slip"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move_line__lots_visible
msgid "Lots Visible"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_stock_track_confirmation
+msgid "Lots or serial numbers were not provided to tracked products"
+msgstr ""
+
+#. module: stock
#: model:ir.actions.act_window,name:stock.action_production_lot_form
#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
#: model:ir.ui.view,arch_db:stock.view_production_lot_form
@@ -2855,29 +2784,16 @@ msgid "Lots/Serial Numbers"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:547
-#, python-format
-msgid "MTO"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_warehouse__mto_pull_id
msgid "MTO rule"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:479
#: model:stock.location.route,name:stock.route_warehouse0_mto
-#, python-format
msgid "Make To Order"
msgstr ""
#. module: stock
-#: selection:stock.warehouse,delivery_steps:0
-msgid "Make packages into a dedicated location, then bring them to the output location for shipping (Pick + Pack + Ship)"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_res_users__has_group_tracking_owner
#: model:res.groups,name:stock.group_tracking_owner
msgid "Manage Different Stock Owners"
@@ -2929,7 +2845,7 @@ msgid "Manager"
msgstr ""
#. module: stock
-#: selection:stock.location.path,auto:0
+#: selection:stock.rule,auto:0
msgid "Manual Operation"
msgstr ""
@@ -2939,7 +2855,7 @@ msgid "Manually or based on automatic scheduler"
msgstr ""
#. module: stock
-#: selection:procurement.rule,action:0
+#: selection:stock.rule,action:0
msgid "Manufacture"
msgstr ""
@@ -3048,11 +2964,6 @@ msgid "Move Entire Packages"
msgstr ""
#. module: stock
-#: selection:procurement.rule,action:0
-msgid "Move From Another Location"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__move_line_ids
#: model:ir.model.fields,field_description:stock.field_stock_package_level__move_line_ids
msgid "Move Line"
@@ -3070,7 +2981,7 @@ msgid "Move Lines"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__procure_method
+#: model:ir.model.fields,field_description:stock.field_stock_rule__procure_method
msgid "Move Supply Method"
msgstr ""
@@ -3096,7 +3007,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_warehouse_orderpoint__group_id
-msgid "Moves created through this orderpoint will be put in this procurement group. If none is given, the moves generated by procurement rules will be grouped into one big picking."
+msgid "Moves created through this orderpoint will be put in this procurement group. If none is given, the moves generated by stock rules will be grouped into one big picking."
msgstr ""
#. module: stock
@@ -3115,16 +3026,20 @@ msgid "My Activities"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__name
#: model:ir.model.fields,field_description:stock.field_product_putaway__name
#: model:ir.model.fields,field_description:stock.field_product_removal__name
-#: model:ir.model.fields,field_description:stock.field_stock_incoterms__name
+#: model:ir.model.fields,field_description:stock.field_stock_rule__name
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint__name
msgid "Name"
msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.product_template_search_form_view_stock
+#: model:ir.ui.view,arch_db:stock.stock_product_search_form_view
+msgid "Negative Forecasted Quantity"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.quant_search_view
msgid "Negative Stock"
msgstr ""
@@ -3140,8 +3055,8 @@ msgid "New"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move_line.py:168
-#: code:addons/stock/models/stock_picking.py:612
+#: code:addons/stock/models/stock_move_line.py:163
+#: code:addons/stock/models/stock_picking.py:613
#, python-format
msgid "New Move:"
msgstr ""
@@ -3158,16 +3073,19 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__activity_date_deadline
+#: model:ir.model.fields,field_description:stock.field_stock_production_lot__activity_date_deadline
msgid "Next Activity Deadline"
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__activity_summary
+#: model:ir.model.fields,field_description:stock.field_stock_production_lot__activity_summary
msgid "Next Activity Summary"
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__activity_type_id
+#: model:ir.model.fields,field_description:stock.field_stock_production_lot__activity_type_id
msgid "Next Activity Type"
msgstr ""
@@ -3202,7 +3120,7 @@ msgid "No inventory found"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move_line.py:402
+#: code:addons/stock/models/stock_move_line.py:400
#, python-format
msgid "No negative quantities allowed"
msgstr ""
@@ -3213,9 +3131,10 @@ msgid "No operation made on this lot."
msgstr ""
#. module: stock
-#: code:addons/stock/models/procurement.py:184
+#: code:addons/stock/models/stock_rule.py:305
#, python-format
-msgid "No procurement rule found. Please verify the configuration of your routes"
+msgid "No procurement rule found in location \"%s\" for product \"%s\".\n"
+" Check routes configuration."
msgstr ""
#. module: stock
@@ -3225,9 +3144,9 @@ msgid "No products to return (only lines in Done state and not fully returned ye
msgstr ""
#. module: stock
-#: code:addons/stock/models/procurement.py:67
+#: code:addons/stock/models/stock_rule.py:172
#, python-format
-msgid "No source location defined on procurement rule: %s!"
+msgid "No source location defined on stock rule: %s!"
msgstr ""
#. module: stock
@@ -3262,21 +3181,11 @@ msgid "Number of Actions"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__delay
-msgid "Number of Days"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,help:stock.field_stock_warehouse_orderpoint__lead_days
msgid "Number of days after the orderpoint is triggered to receive the products or to order to the vendor"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_location_path__delay
-msgid "Number of days needed to transfer the goods"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__message_has_error_counter
#: model:ir.model.fields,field_description:stock.field_stock_production_lot__message_has_error_counter
msgid "Number of error"
@@ -3307,8 +3216,6 @@ msgid "OK"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.product_form_view_procurement_button
-#: model:ir.ui.view,arch_db:stock.product_template_form_view_procurement_button
#: model:ir.ui.view,arch_db:stock.view_stock_quant_tree
msgid "On Hand"
msgstr ""
@@ -3326,56 +3233,47 @@ msgid "Once you receive an order, you can filter based on the name of\n"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:120
+#: code:addons/stock/models/stock_inventory.py:121
#, python-format
msgid "One Lot/Serial Number"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:118
+#: code:addons/stock/models/stock_inventory.py:119
#, python-format
msgid "One owner only"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:113
+#: code:addons/stock/models/stock_inventory.py:114
#, python-format
msgid "One product category"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:118
+#: code:addons/stock/models/stock_inventory.py:119
#, python-format
msgid "One product for a specific owner"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:114
+#: code:addons/stock/models/stock_inventory.py:115
#, python-format
msgid "One product only"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_location_path__name
-msgid "Operation Name"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__picking_type_id
-#: model:ir.model.fields,field_description:stock.field_stock_location_path__picking_type_id
+#: code:addons/stock/models/stock_rule.py:97
#: model:ir.model.fields,field_description:stock.field_stock_move__picking_type_id
#: model:ir.model.fields,field_description:stock.field_stock_picking__picking_type_id
+#: model:ir.model.fields,field_description:stock.field_stock_rule__picking_type_id
#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
#: model:ir.ui.view,arch_db:stock.view_pickingtype_filter
+#, python-format
msgid "Operation Type"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_procurement_rule__picking_type_id
-msgid "Operation Type determines the way the picking should be shown in the view, reports, ..."
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking_type__return_picking_type_id
msgid "Operation Type for Returns"
msgstr ""
@@ -3440,19 +3338,13 @@ msgid "Optional: previous stock move when chaining them"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
-msgid "Order Date"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_move__ordered_qty
-#: model:ir.model.fields,field_description:stock.field_stock_move_line__ordered_qty
-msgid "Ordered Quantity"
+#: model:ir.ui.view,arch_db:stock.view_stock_rule_form
+msgid "Options"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_move_search
-msgid "Orders processed today or scheduled for today"
+#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
+msgid "Order Date"
msgstr ""
#. module: stock
@@ -3495,12 +3387,11 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_warehouse__delivery_steps
-msgid "Outgoing Shippings"
+msgid "Outgoing Shipments"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:99
-#: model:stock.location,name:stock.stock_location_output
+#: code:addons/stock/models/stock_warehouse.py:446
#, python-format
msgid "Output"
msgstr ""
@@ -3512,6 +3403,7 @@ msgstr ""
#. module: stock
#: selection:stock.picking,activity_state:0
+#: selection:stock.production.lot,activity_state:0
msgid "Overdue"
msgstr ""
@@ -3554,7 +3446,7 @@ msgid "Owner of the quants"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:336
+#: code:addons/stock/models/product.py:338
#, python-format
msgid "P&L Qty"
msgstr ""
@@ -3567,7 +3459,7 @@ msgid "PRINT"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:220
+#: code:addons/stock/models/stock_warehouse.py:740
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line__package_id
#, python-format
msgid "Pack"
@@ -3579,6 +3471,11 @@ msgid "Pack Type"
msgstr ""
#. module: stock
+#: selection:stock.warehouse,delivery_steps:0
+msgid "Pack goods, send goods in output and then deliver (3 steps)"
+msgstr ""
+
+#. module: stock
#: code:addons/stock/models/barcode.py:14
#: selection:barcode.rule,type:0
#: model:ir.model.fields,field_description:stock.field_stock_package_level__package_id
@@ -3595,12 +3492,12 @@ msgstr ""
#. module: stock
#: model:ir.actions.report,name:stock.action_report_quant_package_barcode_small
-msgid "Package Barcode"
+msgid "Package Barcode (PDF)"
msgstr ""
#. module: stock
#: model:ir.actions.report,name:stock.action_report_quant_package_barcode
-msgid "Package Barcode with Contents"
+msgid "Package Barcode with Content"
msgstr ""
#. module: stock
@@ -3656,12 +3553,8 @@ msgstr ""
#: model:ir.actions.act_window,name:stock.action_package_view
#: model:ir.ui.menu,name:stock.menu_package
#: model:ir.ui.view,arch_db:stock.view_picking_form
-msgid "Packages"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_type_form
-msgid "Packages & Traceability"
+msgid "Packages"
msgstr ""
#. module: stock
@@ -3685,8 +3578,7 @@ msgid "Packing Operation"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:100
-#: model:stock.location,name:stock.location_pack_zone
+#: code:addons/stock/models/stock_warehouse.py:447
#, python-format
msgid "Packing Zone"
msgstr ""
@@ -3726,32 +3618,22 @@ msgid "Partner"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__partner_address_id
+#: model:ir.model.fields,field_description:stock.field_stock_rule__partner_address_id
msgid "Partner Address"
msgstr ""
#. module: stock
-#: model:stock.location,name:stock.stock_location_locations_partner
-msgid "Partner Locations"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.view_inventory_filter
msgid "Physical Inventories by Date"
msgstr ""
#. module: stock
-#: model:stock.location,name:stock.stock_location_locations
-msgid "Physical Locations"
-msgstr ""
-
-#. module: stock
#: model:ir.model,name:stock.model_stock_quant_package
msgid "Physical Packages"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:228
+#: code:addons/stock/models/stock_warehouse.py:748
#: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation__pick_ids
#: model:ir.model.fields,field_description:stock.field_stock_immediate_transfer__pick_ids
#, python-format
@@ -3759,18 +3641,6 @@ msgid "Pick"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:439
-#, python-format
-msgid "Pick + Pack + Ship"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:438
-#, python-format
-msgid "Pick + Ship"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_warehouse__pick_type_id
msgid "Pick Type"
msgstr ""
@@ -3836,6 +3706,7 @@ msgstr ""
#. module: stock
#: selection:stock.picking,activity_state:0
+#: selection:stock.production.lot,activity_state:0
msgid "Planned"
msgstr ""
@@ -3845,7 +3716,7 @@ msgid "Planned Transfer"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:690
+#: code:addons/stock/models/stock_picking.py:691
#, python-format
msgid "Please add some items to move."
msgstr ""
@@ -3883,6 +3754,7 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_form
+#: model:ir.ui.view,arch_db:stock.view_stock_rules_report
msgid "Print"
msgstr ""
@@ -3932,30 +3804,11 @@ msgid "Procurement Group"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__location_id
-msgid "Procurement Location"
-msgstr ""
-
-#. module: stock
#: model:ir.model,name:stock.model_procurement_group
msgid "Procurement Requisition"
msgstr ""
#. module: stock
-#: model:ir.model,name:stock.model_procurement_rule
-#: model:ir.model.fields,field_description:stock.field_stock_move__rule_id
-#: model:ir.ui.view,arch_db:stock.view_procurement_rule_form
-msgid "Procurement Rule"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_location_route__pull_ids
-#: model:ir.ui.view,arch_db:stock.stock_location_route_form_view
-#: model:ir.ui.view,arch_db:stock.view_procurement_rule_tree
-msgid "Procurement Rules"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.procurement_group_form_view
msgid "Procurement group"
msgstr ""
@@ -3968,17 +3821,12 @@ msgid "Procurement: run scheduler"
msgstr ""
#. module: stock
-#: model:stock.location,name:stock.location_procurement
-msgid "Procurements"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move_line__produce_line_ids
msgid "Produce Line"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:346
+#: code:addons/stock/models/product.py:348
#, python-format
msgid "Produced Qty"
msgstr ""
@@ -3996,12 +3844,13 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_production_lot__product_id
#: model:ir.model.fields,field_description:stock.field_stock_quant__product_id
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line__product_id
+#: model:ir.model.fields,field_description:stock.field_stock_rules_report__product_id
#: model:ir.model.fields,field_description:stock.field_stock_scrap__product_id
+#: model:ir.model.fields,field_description:stock.field_stock_track_line__product_id
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint__product_id
#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty__product_id
#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty_scrap__product_id
#: model:ir.ui.view,arch_db:stock.quant_search_view
-#: model:ir.ui.view,arch_db:stock.report_lot_barcode
#: model:ir.ui.view,arch_db:stock.report_package_barcode
#: model:ir.ui.view,arch_db:stock.report_stock_body_print
#: model:ir.ui.view,arch_db:stock.report_stock_inventory
@@ -4012,7 +3861,7 @@ msgid "Product"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_location.py:190
+#: code:addons/stock/models/stock_location.py:187
#: model:ir.model.fields,field_description:stock.field_stock_location_route__categ_ids
#: model:ir.ui.menu,name:stock.menu_product_category_config_stock
#: model:ir.ui.view,arch_db:stock.stock_location_route_form_view
@@ -4057,6 +3906,12 @@ msgid "Product Packagings"
msgstr ""
#. module: stock
+#: model:ir.actions.report,name:stock.action_report_stock_rule
+#: model:ir.ui.view,arch_db:stock.view_stock_rules_report
+msgid "Product Routes Report"
+msgstr ""
+
+#. module: stock
#: model:ir.model,name:stock.model_product_template
#: model:ir.model.fields,field_description:stock.field_report_stock_forecast__product_tmpl_id
#: model:ir.model.fields,field_description:stock.field_stock_move__product_tmpl_id
@@ -4066,6 +3921,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_product_replenish__product_tmpl_id
+#: model:ir.model.fields,field_description:stock.field_stock_rules_report__product_tmpl_id
msgid "Product Tmpl"
msgstr ""
@@ -4083,6 +3939,7 @@ msgid "Product Unit of Measure"
msgstr ""
#. module: stock
+#: model:ir.actions.act_window,name:stock.stock_product_normal_action
#: model:ir.ui.menu,name:stock.product_product_menu
msgid "Product Variants"
msgstr ""
@@ -4099,7 +3956,6 @@ msgid "Product with Tracking"
msgstr ""
#. module: stock
-#: model:stock.location,name:stock.location_production
#: selection:stock.location,usage:0
msgid "Production"
msgstr ""
@@ -4111,7 +3967,7 @@ msgid "Production Location"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_location.py:180
+#: code:addons/stock/models/stock_location.py:177
#: code:addons/stock/wizard/stock_quantity_history.py:29
#: model:ir.actions.act_window,name:stock.act_product_location_open
#: model:ir.actions.act_window,name:stock.product_template_action_product
@@ -4126,48 +3982,55 @@ msgid "Products"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:309
+#: code:addons/stock/models/product.py:311
#, python-format
msgid "Products: "
msgstr ""
#. module: stock
-#: selection:procurement.rule,group_propagation_option:0
+#: selection:stock.rule,group_propagation_option:0
msgid "Propagate"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__propagate
-#: model:ir.model.fields,field_description:stock.field_stock_location_path__propagate
#: model:ir.model.fields,field_description:stock.field_stock_move__propagate
+#: model:ir.model.fields,field_description:stock.field_stock_rule__propagate
msgid "Propagate cancel and split"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_procurement_rule_form
-msgid "Propagation Options"
+#: model:ir.ui.view,arch_db:stock.view_stock_rule_form
+msgid "Propagation"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__group_propagation_option
+#: model:ir.model.fields,field_description:stock.field_stock_rule__group_propagation_option
msgid "Propagation of Procurement Group"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_move__push_rule_id
-msgid "Push Rule"
+#: selection:stock.rule,action:0
+msgid "Pull & Push"
msgstr ""
#. module: stock
-#: model:ir.actions.act_window,name:stock.stolocpath
-#: model:ir.model.fields,field_description:stock.field_stock_location_route__push_ids
-#: model:ir.ui.view,arch_db:stock.stock_location_route_form_view
-msgid "Push Rules"
+#: selection:stock.rule,action:0
+msgid "Pull From"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.report_stock_rule
+msgid "Pull Rule"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.report_stock_rule
+msgid "Push Rule"
msgstr ""
#. module: stock
-#: model:ir.model,name:stock.model_stock_location_path
-msgid "Pushed Flow"
+#: selection:stock.rule,action:0
+msgid "Push To"
msgstr ""
#. module: stock
@@ -4198,6 +4061,11 @@ msgid "Putaway"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.report_stock_rule
+msgid "Putaway:"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint__qty_multiple
msgid "Qty Multiple"
msgstr ""
@@ -4208,7 +4076,7 @@ msgid "Qty Multiple must be greater than or equal to zero."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:98
+#: code:addons/stock/models/stock_warehouse.py:445
#, python-format
msgid "Quality Control"
msgstr ""
@@ -4245,6 +4113,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__quantity_done
+#: model:ir.ui.view,arch_db:stock.view_move_kandan
#: model:ir.ui.view,arch_db:stock.view_move_line_form
#: model:ir.ui.view,arch_db:stock.view_move_line_tree
#: model:ir.ui.view,arch_db:stock.view_stock_move_line_kanban
@@ -4271,13 +4140,13 @@ msgid "Quantity Reserved"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:80
+#: code:addons/stock/wizard/stock_change_product_qty.py:74
#, python-format
msgid "Quantity cannot be negative."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:654
+#: code:addons/stock/models/stock_move.py:643
#, python-format
msgid "Quantity decreased!"
msgstr ""
@@ -4373,37 +4242,47 @@ msgid "Receipt Route"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:436
+#: code:addons/stock/models/stock_warehouse.py:726
+#: model:stock.picking.type,name:stock.picking_type_in
#, python-format
-msgid "Receipt in 1 step"
+msgid "Receipts"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:436
-#, python-format
-msgid "Receipt in 2 steps"
+#: selection:stock.warehouse,reception_steps:0
+msgid "Receive goods directly (1 step)"
+msgstr ""
+
+#. module: stock
+#: selection:stock.warehouse,reception_steps:0
+msgid "Receive goods in input and then stock (2 steps)"
+msgstr ""
+
+#. module: stock
+#: selection:stock.warehouse,reception_steps:0
+msgid "Receive goods in input, then quality and then stock (3 steps)"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:437
+#: code:addons/stock/models/stock_warehouse.py:524
#, python-format
-msgid "Receipt in 3 steps"
+msgid "Receive in 1 step (stock)"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:206
-#: model:stock.picking.type,name:stock.picking_type_in
+#: code:addons/stock/models/stock_warehouse.py:524
#, python-format
-msgid "Receipts"
+msgid "Receive in 2 steps (input + stock)"
msgstr ""
#. module: stock
-#: selection:stock.warehouse,reception_steps:0
-msgid "Receive goods directly in stock (1 step)"
+#: code:addons/stock/models/stock_warehouse.py:525
+#, python-format
+msgid "Receive in 3 steps (input + quality + stock)"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:323
+#: code:addons/stock/models/product.py:325
#, python-format
msgid "Received Qty"
msgstr ""
@@ -4574,17 +4453,23 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__activity_user_id
+#: model:ir.model.fields,field_description:stock.field_stock_production_lot__activity_user_id
msgid "Responsible User"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_warehouse__resupply_route_ids
-msgid "Resupply Routes"
+#: model:ir.ui.view,arch_db:stock.view_warehouse
+msgid "Resupply"
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_warehouse__resupply_wh_ids
-msgid "Resupply Warehouses"
+msgid "Resupply From"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_warehouse__resupply_route_ids
+msgid "Resupply Routes"
msgstr ""
#. module: stock
@@ -4626,10 +4511,10 @@ msgid "Reverse Transfer"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__route_id
-#: model:ir.model.fields,field_description:stock.field_stock_location_path__route_id
+#: model:ir.model.fields,field_description:stock.field_stock_rule__route_id
#: model:ir.ui.view,arch_db:stock.stock_location_route_form_view
#: model:ir.ui.view,arch_db:stock.stock_location_route_view_search
+#: model:ir.ui.view,arch_db:stock.view_stock_rule_filter
msgid "Route"
msgstr ""
@@ -4639,8 +4524,7 @@ msgid "Route Name"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__route_sequence
-#: model:ir.model.fields,field_description:stock.field_stock_location_path__route_sequence
+#: model:ir.model.fields,field_description:stock.field_stock_rule__route_sequence
msgid "Route Sequence"
msgstr ""
@@ -4659,11 +4543,27 @@ msgid "Routes"
msgstr ""
#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_warehouse__resupply_wh_ids
+msgid "Routes will be created automatically to resupply this warehouse from the warehouses ticked"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,help:stock.field_stock_warehouse__resupply_route_ids
msgid "Routes will be created for these resupply warehouses and you can select them on products and product categories"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_rule__rule_message
+msgid "Rule Message"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_rules_form
+#: model:ir.model.fields,field_description:stock.field_stock_location_route__rule_ids
+#: model:ir.ui.menu,name:stock.menu_action_rules_form
+#: model:ir.ui.view,arch_db:stock.stock_location_route_form_view
+#: model:ir.ui.view,arch_db:stock.view_stock_rule_form
+#: model:ir.ui.view,arch_db:stock.view_stock_rule_tree
#: model:ir.ui.view,arch_db:stock.view_warehouse_orderpoint_form
msgid "Rules"
msgstr ""
@@ -4701,12 +4601,17 @@ msgid "Scheduled date for the processing of this move"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_move_search
+msgid "Scheduled or processing date"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,help:stock.field_stock_picking__scheduled_date
msgid "Scheduled time for the first part of the shipment to be processed. Setting manually a value here would set it as expected date for all the stock moves."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:1043
+#: code:addons/stock/models/stock_picking.py:1042
#: model:ir.model.fields,field_description:stock.field_stock_move__scrap_ids
#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty_scrap__scrap_id
#: model:ir.ui.menu,name:stock.menu_stock_scrap
@@ -4740,7 +4645,6 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__scrapped
-#: model:stock.location,name:stock.stock_location_scrapped
msgid "Scrapped"
msgstr ""
@@ -4766,7 +4670,7 @@ msgid "Search Inventory Lines"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_procurement_rule_filter
+#: model:ir.ui.view,arch_db:stock.view_stock_rule_filter
msgid "Search Procurement"
msgstr ""
@@ -4776,12 +4680,7 @@ msgid "Search Scrap"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.stock_location_path_filter
-msgid "Search Stock Location Paths"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/models/stock_inventory.py:115
+#: code:addons/stock/models/stock_inventory.py:116
#, python-format
msgid "Select products manually"
msgstr ""
@@ -4803,51 +4702,51 @@ msgid "Sell and purchase products in different units of measure"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__sequence
-#: model:ir.model.fields,field_description:stock.field_stock_location_path__sequence
+#: selection:stock.warehouse,delivery_steps:0
+msgid "Send goods in output and then deliver (2 steps)"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_location_route__sequence
#: model:ir.model.fields,field_description:stock.field_stock_move__sequence
#: model:ir.model.fields,field_description:stock.field_stock_picking_type__sequence
+#: model:ir.model.fields,field_description:stock.field_stock_rule__sequence
#: model:ir.ui.view,arch_db:stock.stock_location_route_form_view
+#: model:ir.ui.view,arch_db:stock.view_stock_rule_form
msgid "Sequence"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:698
+#: code:addons/stock/models/stock_warehouse.py:772
#, python-format
msgid "Sequence in"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:702
+#: code:addons/stock/models/stock_warehouse.py:792
#, python-format
msgid "Sequence internal"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:699
+#: code:addons/stock/models/stock_warehouse.py:777
#, python-format
msgid "Sequence out"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:700
+#: code:addons/stock/models/stock_warehouse.py:782
#, python-format
msgid "Sequence packing"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:701
+#: code:addons/stock/models/stock_warehouse.py:787
#, python-format
msgid "Sequence picking"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__warehouse_id
-msgid "Served Warehouse"
-msgstr ""
-
-#. module: stock
#: selection:product.template,type:0
msgid "Service"
msgstr ""
@@ -4905,14 +4804,8 @@ msgid "Shelves (Y)"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:438
-#, python-format
-msgid "Ship Only"
-msgstr ""
-
-#. module: stock
-#: selection:stock.warehouse,delivery_steps:0
-msgid "Ship directly from stock (Ship only)"
+#: model:ir.ui.view,arch_db:stock.view_warehouse
+msgid "Shipments"
msgstr ""
#. module: stock
@@ -4978,6 +4871,11 @@ msgid "Show Reserved"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_warehouse__show_resupply
+msgid "Show Resupply"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__show_validate
msgid "Show Validate"
msgstr ""
@@ -4988,11 +4886,21 @@ msgid "Show all records which has next action date is before today"
msgstr ""
#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_rules_report__warehouse_ids
+msgid "Show the routes that apply on selected warehouses."
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,help:stock.field_stock_move__string_availability_info
msgid "Show various information on stock availability for this move"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_stock_track_confirmation
+msgid "Some products of the inventory adjustment are tracked. Are you sure you don't want to specify a serial or lot number for them?"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.report_picking
#: model:ir.ui.view,arch_db:stock.view_move_search
msgid "Source"
@@ -5006,11 +4914,12 @@ msgid "Source Document"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__location_src_id
-#: model:ir.model.fields,field_description:stock.field_stock_location_path__location_from_id
+#: code:addons/stock/models/stock_rule.py:95
#: model:ir.model.fields,field_description:stock.field_stock_move__location_id
#: model:ir.model.fields,field_description:stock.field_stock_package_level__picking_source_location
#: model:ir.model.fields,field_description:stock.field_stock_picking__location_id
+#: model:ir.model.fields,field_description:stock.field_stock_rule__location_src_id
+#, python-format
msgid "Source Location"
msgstr ""
@@ -5031,11 +4940,6 @@ msgid "Source Package :"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_procurement_rule__location_src_id
-msgid "Source location is action=move"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,help:stock.field_stock_inventory__lot_id
msgid "Specify Lot/Serial Number to focus your inventory on a particular Lot/Serial Number."
msgstr ""
@@ -5086,6 +4990,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_picking__activity_state
+#: model:ir.model.fields,help:stock.field_stock_production_lot__activity_state
msgid "Status based on activities\n"
"Overdue: Due date is already passed\n"
"Today: Activity date is today\n"
@@ -5093,8 +4998,7 @@ msgid "Status based on activities\n"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:96
-#: model:stock.location,name:stock.stock_location_stock
+#: code:addons/stock/models/stock_warehouse.py:443
#, python-format
msgid "Stock"
msgstr ""
@@ -5172,11 +5076,6 @@ msgid "Stock Operation"
msgstr ""
#. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree_all
-msgid "Stock Operations"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_res_partner__picking_warn
#: model:ir.model.fields,field_description:stock.field_res_users__picking_warn
#: model:ir.model.fields,field_description:stock.field_stock_move_line__picking_id
@@ -5195,6 +5094,17 @@ msgid "Stock Quantity History"
msgstr ""
#. module: stock
+#: model:ir.model,name:stock.model_stock_rule
+#: model:ir.model.fields,field_description:stock.field_stock_move__rule_id
+msgid "Stock Rule"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_rules_report
+msgid "Stock Rules Report"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__move_ids_without_package
msgid "Stock moves not in package"
msgstr ""
@@ -5215,13 +5125,8 @@ msgid "Stock moves that have been processed"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.quant_search_view
-msgid "Stockable"
-msgstr ""
-
-#. module: stock
#: selection:product.template,type:0
-msgid "Stockable Product"
+msgid "Storable Product"
msgstr ""
#. module: stock
@@ -5251,7 +5156,7 @@ msgid "Supplying Warehouse"
msgstr ""
#. module: stock
-#: selection:procurement.rule,procure_method:0
+#: selection:stock.rule,procure_method:0
msgid "Take From Stock"
msgstr ""
@@ -5322,12 +5227,12 @@ msgid "Template"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_location_path__auto
+#: model:ir.model.fields,help:stock.field_stock_rule__auto
msgid "The 'Manual Operation' value will create a stock move after the current one. With 'Automatic No Step Added', the location is replaced in the original move."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:826
+#: code:addons/stock/models/stock_picking.py:825
#, python-format
msgid "The backorder <a href=# data-oe-model=stock.picking data-oe-id=%d>%s</a> has been created."
msgstr ""
@@ -5353,24 +5258,8 @@ msgid "The company is automatically set from your user preferences."
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_inventory__date
-msgid "The date that will be used for the stock level check of the products and the validation of the stock move related to this inventory."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:143
-#, python-format
-msgid "The default resupply warehouse should be different than itself."
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_location_route__pull_ids
-msgid "The demand represented by a procurement from e.g. a sale order, a reordering rule, another move, needs to be solved by applying a procurement rule. Depending on the action on the procurement rule,this triggers a purchase order, manufacturing order or another move. This way we create chains in the reverse order from the endpoint with the original demand to the starting point. That way, it is always known where we need to go and that is why they are preferred over push rules."
-msgstr ""
-
-#. module: stock
-#: model:ir.ui.view,arch_db:stock.product_category_form_view_inherit
-msgid "The following routes will apply to the products in this category taking into account parent categories:"
+#: model:ir.model.fields,help:stock.field_stock_rule__delay
+msgid "The expected date of the created transfer will be computed based on this delay."
msgstr ""
#. module: stock
@@ -5379,11 +5268,6 @@ msgid "The name of the warehouse must be unique per company!"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_location_path__location_dest_id
-msgid "The new location where the goods need to go"
-msgstr ""
-
-#. module: stock
#: model:ir.model,name:stock.model_stock_picking_type
msgid "The operation type determines the picking view"
msgstr ""
@@ -5412,29 +5296,19 @@ msgid "The procurement quantity will be rounded up to this multiple. If it is 0
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_move__rule_id
-msgid "The procurement rule that created this stock move"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_warn_insufficient_qty_form_view
msgid "The product"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_move__push_rule_id
-msgid "The push rule that created this stock move"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/models/stock_move_line.py:371
+#: code:addons/stock/models/stock_move_line.py:369
#, python-format
msgid "The quantity done for the product \"%s\" doesn't respect the rounding precision defined on the unit of measure \"%s\". Please change the quantity done or the rounding precision of your unit of measure."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:286
-#: code:addons/stock/models/stock_move_line.py:81
+#: code:addons/stock/models/stock_move.py:284
+#: code:addons/stock/models/stock_move_line.py:76
#, python-format
msgid "The requested operation cannot be processed because of a programming error setting the `product_qty` field instead of the `product_uom_qty`."
msgstr ""
@@ -5445,25 +5319,25 @@ msgid "The rules defined per product will be applied before the rules defined pe
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:157
+#: code:addons/stock/models/stock_inventory.py:160
#, python-format
msgid "The selected inventory options are not coherent, the package doesn't exist."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:153
+#: code:addons/stock/models/stock_inventory.py:156
#, python-format
msgid "The selected lot number doesn't exist."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:155
+#: code:addons/stock/models/stock_inventory.py:158
#, python-format
msgid "The selected owner doesn't have the proprietary of that product."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:151
+#: code:addons/stock/models/stock_inventory.py:154
#, python-format
msgid "The selected product doesn't belong to that owner.."
msgstr ""
@@ -5474,12 +5348,12 @@ msgid "The stock operation where the packing has been made"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_procurement_rule__warehouse_id
-msgid "The warehouse this rule is for"
+#: model:ir.model.fields,help:stock.field_stock_move__rule_id
+msgid "The stock rule that created this stock move"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_procurement_rule__propagate_warehouse_id
+#: model:ir.model.fields,help:stock.field_stock_rule__propagate_warehouse_id
msgid "The warehouse to propagate on the created move/procurement, which can be different of the warehouse this rule is for (e.g for resupplying rules from another warehouse)"
msgstr ""
@@ -5499,7 +5373,7 @@ msgid "This analysis gives you a fast overview on the current stock level of you
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_procurement_rule__name
+#: model:ir.model.fields,help:stock.field_stock_rule__name
msgid "This field will fill the packing origin and the name of its moves"
msgstr ""
@@ -5520,11 +5394,6 @@ msgid "This is the list of all the production lots you recorded. When\n"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_location_path__picking_type_id
-msgid "This is the operation type that will be put on the stock moves"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,help:stock.field_stock_quant__owner_id
msgid "This is the owner of the quant"
msgstr ""
@@ -5578,11 +5447,6 @@ msgid "This quantity is expressed in the Default Unit of Measure of the product.
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_location_path__location_from_id
-msgid "This rule can be applied when a move is confirmed that has this location as destination location"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,help:stock.field_res_partner__property_stock_customer
#: model:ir.model.fields,help:stock.field_res_users__property_stock_customer
msgid "This stock location will be used, instead of the default one, as the destination location for goods you send to this partner"
@@ -5617,6 +5481,7 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_package_level__location_dest_id
#: model:ir.ui.view,arch_db:stock.report_stock_body_print
#: model:ir.ui.view,arch_db:stock.report_stock_inventory
+#: model:ir.ui.view,arch_db:stock.view_inventory_form
#: model:ir.ui.view,arch_db:stock.view_move_tree
msgid "To"
msgstr ""
@@ -5630,18 +5495,13 @@ msgid "To Do"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_move_line__to_loc
-msgid "To Loc"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
msgid "To Receive"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_move_search
#: selection:stock.picking,activity_state:0
+#: selection:stock.production.lot,activity_state:0
msgid "Today"
msgstr ""
@@ -5662,6 +5522,7 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
+#: model:ir.ui.view,arch_db:stock.view_picking_type_form
#: model:ir.ui.view,arch_db:stock.view_template_property_form
msgid "Traceability"
msgstr ""
@@ -5692,13 +5553,37 @@ msgid "Track product location in your warehouse"
msgstr ""
#. module: stock
+#: code:addons/stock/models/stock_inventory.py:173
+#, python-format
+msgid "Tracked Products in Inventory Adjustment"
+msgstr ""
+
+#. module: stock
+#: selection:stock.track.line,tracking:0
+msgid "Tracked by lot"
+msgstr ""
+
+#. module: stock
+#: selection:stock.track.line,tracking:0
+msgid "Tracked by serial number"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_product_product__tracking
#: model:ir.model.fields,field_description:stock.field_product_template__tracking
+#: model:ir.model.fields,field_description:stock.field_stock_inventory_line__product_tracking
+#: model:ir.model.fields,field_description:stock.field_stock_move_line__tracking
#: model:ir.model.fields,field_description:stock.field_stock_scrap__tracking
+#: model:ir.model.fields,field_description:stock.field_stock_track_line__tracking
msgid "Tracking"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_track_confirmation__tracking_line_ids
+msgid "Tracking Line"
+msgstr ""
+
+#. module: stock
#: model:ir.model,name:stock.model_stock_picking
#: model:ir.ui.view,arch_db:stock.view_picking_form
msgid "Transfer"
@@ -5716,6 +5601,7 @@ msgstr ""
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree
+#: model:ir.actions.act_window,name:stock.action_picking_tree_all
#: model:ir.ui.menu,name:stock.all_picking
#: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
msgid "Transfers"
@@ -5732,6 +5618,12 @@ msgid "Transit Locations"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.report_stock_rule
+#: selection:stock.rule,procure_method:0
+msgid "Trigger Another Rule"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_barcode_rule__type
msgid "Type"
msgstr ""
@@ -5754,6 +5646,14 @@ msgid "USPS Connector"
msgstr ""
#. module: stock
+#. openerp-web
+#: code:addons/stock/static/src/xml/stock_traceability_report_line.xml:10
+#: code:addons/stock/static/src/xml/stock_traceability_report_line.xml:36
+#, python-format
+msgid "Unfold"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,help:stock.field_stock_production_lot__name
msgid "Unique Lot/Serial Number"
msgstr ""
@@ -5816,7 +5716,7 @@ msgid "Unity of measure"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:887
+#: code:addons/stock/models/stock_picking.py:886
#, python-format
msgid "Unknow stream."
msgstr ""
@@ -5828,16 +5728,6 @@ msgid "Unknown Pack"
msgstr ""
#. module: stock
-#: selection:stock.warehouse,reception_steps:0
-msgid "Unload in input location then go to stock (2 steps)"
-msgstr ""
-
-#. module: stock
-#: selection:stock.warehouse,reception_steps:0
-msgid "Unload in input location, go through a quality control before being admitted in stock (3 steps)"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_form
msgid "Unlock"
msgstr ""
@@ -5848,7 +5738,7 @@ msgid "Unpack"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:341
+#: code:addons/stock/models/product.py:343
#, python-format
msgid "Unplanned Qty"
msgstr ""
@@ -5883,7 +5773,6 @@ msgid "UoM Categories"
msgstr ""
#. module: stock
-#: model:ir.actions.act_window,name:stock.action_view_change_product_quantity
#: model:ir.ui.view,arch_db:stock.view_change_product_quantity
msgid "Update Product Quantity"
msgstr ""
@@ -5896,12 +5785,19 @@ msgid "Update Qty On Hand"
msgstr ""
#. module: stock
+#: code:addons/stock/models/product.py:561
+#, python-format
+msgid "Update quantity on hand"
+msgstr ""
+
+#. module: stock
#: selection:stock.move,priority:0
#: selection:stock.picking,priority:0
msgid "Urgent"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move_line__picking_type_use_existing_lots
#: model:ir.model.fields,field_description:stock.field_stock_picking_type__use_existing_lots
msgid "Use Existing Lots/Serial Numbers"
msgstr ""
@@ -5972,7 +5868,6 @@ msgid "Vendor Locations"
msgstr ""
#. module: stock
-#: model:stock.location,name:stock.stock_location_suppliers
#: selection:stock.picking.type,code:0
msgid "Vendors"
msgstr ""
@@ -5994,11 +5889,6 @@ msgid "View Location"
msgstr ""
#. module: stock
-#: model:stock.location,name:stock.stock_location_locations_virtual
-msgid "Virtual Locations"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
#: selection:stock.picking,state:0
@@ -6035,13 +5925,14 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_product_product__warehouse_id
#: model:ir.model.fields,field_description:stock.field_product_replenish__warehouse_id
#: model:ir.model.fields,field_description:stock.field_product_template__warehouse_id
-#: model:ir.model.fields,field_description:stock.field_stock_location_path__warehouse_id
#: model:ir.model.fields,field_description:stock.field_stock_move__warehouse_id
#: model:ir.model.fields,field_description:stock.field_stock_picking_type__warehouse_id
+#: model:ir.model.fields,field_description:stock.field_stock_rule__warehouse_id
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint__warehouse_id
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
#: model:ir.ui.view,arch_db:stock.stock_warehouse_view_search
#: model:ir.ui.view,arch_db:stock.view_partner_stock_form
+#: model:ir.ui.view,arch_db:stock.view_stock_rule_filter
#: model:ir.ui.view,arch_db:stock.view_warehouse
#: model:ir.ui.view,arch_db:stock.view_warehouse_tree
#: model:ir.ui.view,arch_db:stock.warehouse_orderpoint_search
@@ -6054,6 +5945,11 @@ msgid "Warehouse Configuration"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_warehouse__warehouse_count
+msgid "Warehouse Count"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.menu,name:stock.menu_warehouse_config
msgid "Warehouse Management"
msgstr ""
@@ -6064,12 +5960,12 @@ msgid "Warehouse Name"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_procurement_rule__propagate_warehouse_id
+#: model:ir.model.fields,field_description:stock.field_stock_rule__propagate_warehouse_id
msgid "Warehouse to Propagate"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:724
+#: code:addons/stock/models/stock_warehouse.py:822
#, python-format
msgid "Warehouse's Routes"
msgstr ""
@@ -6077,6 +5973,7 @@ msgstr ""
#. module: stock
#: model:ir.actions.act_window,name:stock.action_warehouse_form
#: model:ir.model.fields,field_description:stock.field_stock_location_route__warehouse_ids
+#: model:ir.model.fields,field_description:stock.field_stock_rules_report__warehouse_ids
#: model:ir.ui.menu,name:stock.menu_action_warehouse_form
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
#: model:ir.ui.view,arch_db:stock.stock_location_route_form_view
@@ -6084,8 +5981,8 @@ msgid "Warehouses"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move_line.py:128
-#: code:addons/stock/models/stock_move_line.py:140
+#: code:addons/stock/models/stock_move_line.py:123
+#: code:addons/stock/models/stock_move_line.py:135
#: selection:res.partner,picking_warn:0
#, python-format
msgid "Warning"
@@ -6097,7 +5994,7 @@ msgid "Warning on the Picking"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:302
+#: code:addons/stock/models/product.py:304
#, python-format
msgid "Warning!"
msgstr ""
@@ -6132,11 +6029,6 @@ msgid "Weighted Product"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_location_route__push_ids
-msgid "When a move is foreseen to a location, the push rule will automatically create a move to a next location after. This is mainly only needed when creating manual operations e.g. 2/3 step manual purchase order or 2/3 step finished product manual manufacturing order. In other cases, it is important to use pull rules where you know where you are going based on a demand."
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,help:stock.field_stock_location_route__warehouse_selectable
msgid "When a warehouse is selected for this route, this route should be seen as the default route when products pass through this warehouse. This behaviour can be overridden by the routes on the Product/Product Categories or by the Preferred Routes on the Procurement"
msgstr ""
@@ -6157,6 +6049,18 @@ msgid "When checked, the route will be selectable on the Product Category. It w
msgstr ""
#. module: stock
+#: code:addons/stock/models/stock_rule.py:113
+#, python-format
+msgid "When products are needed in <b>%s</b>, <br/> <b>%s</b> are created from <b>%s</b> to fulfill the need."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_rule.py:114
+#, python-format
+msgid "When products arrive in <b>%s</b>, <br/> <b>%s</b> are created to send them in <b>%s</b>."
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,help:stock.field_stock_picking__is_locked
msgid "When the picking is not done this allows changing the initial demand. When the picking is done this allows changing the done quantities."
msgstr ""
@@ -6172,15 +6076,14 @@ msgid "When the virtual stock goes below the Min Quantity, Odoo generates a proc
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_procurement_compute_wizard
-msgid "When you run the schedulers, Odoo tries to reserve the available stock to fulfill the existing pickings\n"
-" and verify if some reordering rules should be triggered."
+#: model:ir.model.fields,help:stock.field_stock_rule__propagate
+msgid "When ticked, if the move is splitted or cancelled, the next move will be too."
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_change_product_quantity
-msgid "When you select a serial number (lot), the quantity is corrected with respect to\n"
-" the quantity of that serial number (lot) and not to the total quantity of the product."
+#: model:ir.ui.view,arch_db:stock.view_procurement_compute_wizard
+msgid "When you run the schedulers, Odoo tries to reserve the available stock to fulfill the existing pickings\n"
+" and verify if some reordering rules should be triggered."
msgstr ""
#. module: stock
@@ -6190,6 +6093,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line__wizard_id
+#: model:ir.model.fields,field_description:stock.field_stock_track_line__wizard_id
msgid "Wizard"
msgstr ""
@@ -6202,11 +6106,11 @@ msgstr ""
#. module: stock
#: code:addons/stock/models/stock_production_lot.py:37
#, python-format
-msgid "You are not allowed to create a lot for this operation type."
+msgid "You are not allowed to create a lot or serial number with this operation type. To change this, go on the operation type and tick the box \"Create New Lots/Serial Numbers\"."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:679
+#: code:addons/stock/models/stock_move.py:668
#, python-format
msgid "You are using a unit of measure smaller than the one you are using in order to stock your product. This can lead to rounding problem on reserved quantity. You should use the smaller unit of measure possible in order to valuate your stock or change its rounding precision to a smaller value (example: 0.00001)."
msgstr ""
@@ -6225,49 +6129,43 @@ msgid "You can delete lines to ignore some products."
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:521
+#: code:addons/stock/models/product.py:543
#, python-format
msgid "You can not change the type of a product that is currently reserved on a stock move. If you need to change the type, you should first unreserve the stock move."
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:512
-#, python-format
-msgid "You can not change the unit of measure of a product that has already been used in a done stock move. If you need to change the unit of measure, you may deactivate this product."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/models/stock_move_line.py:333
+#: code:addons/stock/models/stock_move_line.py:331
#, python-format
msgid "You can not delete product moves if the picking is done. You can only correct the done quantities."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move_line.py:146
+#: code:addons/stock/models/stock_move_line.py:141
#, python-format
msgid "You can not enter negative quantities."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:388
+#: code:addons/stock/models/stock_inventory.py:426
#, python-format
-msgid "You can only adjust stockable products."
+msgid "You can only adjust storable products."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:1152
+#: code:addons/stock/models/stock_move.py:1144
#, python-format
msgid "You can only delete draft moves."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move_line.py:139
+#: code:addons/stock/models/stock_move_line.py:134
#, python-format
msgid "You can only process 1.0 %s of products with unique serial number."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:1016
+#: code:addons/stock/models/stock_move.py:1008
#, python-format
msgid "You cannot cancel a stock move that has been set to 'Done'."
msgstr ""
@@ -6279,56 +6177,62 @@ msgid "You cannot change the location type or its use as a scrap location as the
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:605
+#: code:addons/stock/models/product.py:645
#, python-format
msgid "You cannot change the ratio of this unit of mesure as some products with this UoM have already been moved or are currently reserved."
msgstr ""
#. module: stock
+#: code:addons/stock/models/product.py:534
+#, python-format
+msgid "You cannot change the unit of measure as there are already stock moves for this product. If you want to change the unit of measure, you should rather archive this product and create a new one."
+msgstr ""
+
+#. module: stock
#: code:addons/stock/models/stock_scrap.py:75
#, python-format
msgid "You cannot delete a scrap which is done."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:104
+#: code:addons/stock/models/stock_inventory.py:105
#, python-format
msgid "You cannot delete a validated inventory adjustement."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:376
+#: code:addons/stock/models/stock_inventory.py:415
#, python-format
-msgid "You cannot have two inventory adjustments in progress for the same product (%s) in the same location, for the same package, the same owner and the same lot number. Please validate or cancel the first inventory adjustment before creating a new one."
+msgid "You cannot have two inventory adjustments in state 'In Progress' with the same product (%s), same location, same package, same owner and same lot. Please first validate the first inventory adjustment before creating another one."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:1136
+#: code:addons/stock/models/stock_move.py:1128
#, python-format
msgid "You cannot move the same package content more than once in the same transfer or split the same package into two location."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:341
+#: code:addons/stock/models/stock_move.py:339
#, python-format
msgid "You cannot perform the move because the unit of measure has a different category as the product unit of measure."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:166
+#: code:addons/stock/models/stock_inventory.py:186
#, python-format
msgid "You cannot set a negative product quantity in an inventory line:\n"
" %s - qty: %s"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:1183
+#: code:addons/stock/models/stock_move.py:1175
#, python-format
msgid "You cannot split a draft move. It needs to be confirmed first."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:1179
+#: code:addons/stock/models/stock_move.py:1171
#, python-format
msgid "You cannot split a stock move that has been set to 'Done'."
msgstr ""
@@ -6340,31 +6244,25 @@ msgid "You cannot take products from or deliver products to a location of type \
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:502
+#: code:addons/stock/models/stock_move.py:501
#, python-format
msgid "You cannot unreserve a stock move that has been set to 'Done'."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move_line.py:121
-#: code:addons/stock/models/stock_move_line.py:125
+#: code:addons/stock/models/stock_move_line.py:116
+#: code:addons/stock/models/stock_move_line.py:120
#, python-format
msgid "You cannot use the same serial number twice. Please correct the serial numbers encoded."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:698
+#: code:addons/stock/models/stock_picking.py:699
#, python-format
msgid "You cannot validate a transfer if no quantites are reserved nor done. To force the transfer, switch in edit more and encode the done quantities."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:714
-#, python-format
-msgid "You cannot validate a transfer if you have not processed any quantity for %s."
-msgstr ""
-
-#. module: stock
#: code:addons/stock/wizard/stock_picking_return.py:111
#, python-format
msgid "You have manually created product lines, please delete them to proceed."
@@ -6388,19 +6286,19 @@ msgid "You have processed more than what was initially\n"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:303
+#: code:addons/stock/models/product.py:305
#, python-format
msgid "You have products in stock that have no lot number. You can assign serial numbers by doing an inventory. "
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:871
+#: code:addons/stock/models/stock_picking.py:870
#, python-format
msgid "You have to define a groupby and sorted method and pass them as arguments."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:808
+#: code:addons/stock/models/stock_warehouse.py:906
#, python-format
msgid "You have to select a product unit of measure that is in the same category than the default unit of measure of the product"
msgstr ""
@@ -6430,26 +6328,31 @@ msgid "You must define a warehouse for the company: %s."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:1029
+#: code:addons/stock/models/stock_picking.py:1028
#, python-format
msgid "You must first set the quantity you will put in the pack."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move_line.py:400
-#: code:addons/stock/models/stock_picking.py:712
+#: code:addons/stock/models/stock_move_line.py:398
+#: code:addons/stock/models/stock_picking.py:713
#, python-format
msgid "You need to supply a Lot/Serial number for product %s."
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:370
-#: code:addons/stock/models/product.py:514
+#: code:addons/stock/models/product.py:392
+#: code:addons/stock/models/product.py:536
#, python-format
msgid "You still have some active reordering rules on this product. Please archive or delete them first."
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.report_stock_rule
+msgid "]<br/>min:"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.view_change_product_quantity
#: model:ir.ui.view,arch_db:stock.view_immediate_transfer
msgid "_Apply"
@@ -6472,8 +6375,6 @@ msgid "bpost Connector"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.stock_location_path_form
-#: model:ir.ui.view,arch_db:stock.view_procurement_rule_form
#: model:ir.ui.view,arch_db:stock.view_template_property_form
msgid "days"
msgstr ""
@@ -6489,11 +6390,6 @@ msgid "e.g. Annual inventory"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_procurement_rule_form
-msgid "e.g. Buy"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.view_production_lot_form
#: model:ir.ui.view,arch_db:stock.view_production_lot_form_simple
msgid "e.g. LOT/0001/20121"
@@ -6535,6 +6431,11 @@ msgid "report.stock.forecast"
msgstr ""
#. module: stock
+#: model:ir.model,name:stock.model_report_stock_report_stock_rule
+msgid "report.stock.report_stock_rule"
+msgstr ""
+
+#. module: stock
#: model:ir.model,name:stock.model_res_config_settings
msgid "res.config.settings"
msgstr ""
@@ -6560,6 +6461,11 @@ msgid "stock.return.picking.line"
msgstr ""
#. module: stock
+#: model:ir.model,name:stock.model_stock_rules_report
+msgid "stock.rules.report"
+msgstr ""
+
+#. module: stock
#: model:ir.model,name:stock.model_stock_scrap
msgid "stock.scrap"
msgstr ""
@@ -6570,6 +6476,16 @@ msgid "stock.traceability.report"
msgstr ""
#. module: stock
+#: model:ir.model,name:stock.model_stock_track_confirmation
+msgid "stock.track.confirmation"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_track_line
+msgid "stock.track.line"
+msgstr ""
+
+#. module: stock
#: model:ir.model,name:stock.model_stock_warn_insufficient_qty
msgid "stock.warn.insufficient.qty"
msgstr ""
diff --git a/addons/stock_account/i18n/stock_account.pot b/addons/stock_account/i18n/stock_account.pot
index 35a5907e0df..466a8816606 100644
--- a/addons/stock_account/i18n/stock_account.pot
+++ b/addons/stock_account/i18n/stock_account.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:11+0000\n"
-"PO-Revision-Date: 2018-08-02 09:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: stock_account
+#: code:addons/stock_account/models/product.py:146
+#: code:addons/stock_account/models/product.py:152
+#, python-format
+msgid "%s changed cost from %s to %s - %s"
+msgstr ""
+
+#. module: stock_account
#: model:ir.model,name:stock_account.model_account_move
msgid "Account Entry"
msgstr ""
@@ -31,6 +38,11 @@ msgid "Account Stock Properties"
msgstr ""
#. module: stock_account
+#: model:ir.model.fields,field_description:stock_account.field_stock_inventory__accounting_date
+msgid "Accounting Date"
+msgstr ""
+
+#. module: stock_account
#: model:ir.ui.view,arch_db:stock_account.view_move_form_inherit
msgid "Accounting Entries"
msgstr ""
@@ -47,11 +59,21 @@ msgid "Affect landed costs on reception operations and split them among products
msgstr ""
#. module: stock_account
+#: model:ir.ui.view,arch_db:stock_account.view_inventory_valuation_search
+msgid "Archived"
+msgstr ""
+
+#. module: stock_account
#: selection:product.category,property_valuation:0
msgid "Automated"
msgstr ""
#. module: stock_account
+#: model:ir.ui.view,arch_db:stock_account.view_inventory_valuation_search
+msgid "Available Products"
+msgstr ""
+
+#. module: stock_account
#: selection:product.category,property_cost_method:0
#: selection:product.template,property_cost_method:0
msgid "Average Cost (AVCO)"
@@ -64,18 +86,23 @@ msgid "Cancel"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/models/stock.py:501
+#: code:addons/stock_account/models/stock.py:502
#, python-format
msgid "Cannot find a stock input account for the product %s. You must define one on the product category, or on the location, before processing this operation."
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/models/stock.py:503
+#: code:addons/stock_account/models/stock.py:504
#, python-format
msgid "Cannot find a stock output account for the product %s. You must define one on the product category, or on the location, before processing this operation."
msgstr ""
#. module: stock_account
+#: model:ir.ui.view,arch_db:stock_account.view_inventory_valuation_search
+msgid "Category"
+msgstr ""
+
+#. module: stock_account
#: model:ir.ui.view,arch_db:stock_account.view_change_standard_price
msgid "Change Price"
msgstr ""
@@ -94,17 +121,12 @@ msgid "Changing your cost method is an important change that will impact your in
msgstr ""
#. module: stock_account
-#: model:ir.model.fields,help:stock_account.field_stock_inventory__accounting_date
-msgid "Choose the accounting date at which you want to value the stock moves created by the inventory instead of the default one (the inventory end date)"
-msgstr ""
-
-#. module: stock_account
#: model:ir.ui.view,arch_db:stock_account.view_stock_quantity_history
msgid "Choose your date"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/models/stock.py:578
+#: code:addons/stock_account/models/stock.py:579
#, python-format
msgid "Configuration error. Please configure the price difference account on the product or its category to process this operation."
msgstr ""
@@ -158,19 +180,24 @@ msgid "Created on"
msgstr ""
#. module: stock_account
+#: model:ir.model.fields,help:stock_account.field_stock_inventory__accounting_date
+msgid "Date at which the accounting entries will be created in case of automated inventory valuation. If empty, the inventoy date will be used."
+msgstr ""
+
+#. module: stock_account
#: model:ir.model.fields,field_description:stock_account.field_stock_change_standard_price__display_name
msgid "Display Name"
msgstr ""
#. module: stock_account
-#: selection:product.category,property_cost_method:0
-#: selection:product.template,property_cost_method:0
-msgid "First In First Out (FIFO)"
+#: model:ir.ui.view,arch_db:stock_account.view_inventory_valuation_search
+msgid "Exhausted Stock"
msgstr ""
#. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_stock_inventory__accounting_date
-msgid "Force Accounting Date"
+#: selection:product.category,property_cost_method:0
+#: selection:product.template,property_cost_method:0
+msgid "First In First Out (FIFO)"
msgstr ""
#. module: stock_account
@@ -205,11 +232,15 @@ msgid "Inventory Locations"
msgstr ""
#. module: stock_account
+#: code:addons/stock_account/wizard/stock_quantity_history.py:25
+#: model:ir.actions.act_window,name:stock_account.product_valuation_action
#: model:ir.model.fields,field_description:stock_account.field_product_category__property_valuation
#: model:ir.model.fields,field_description:stock_account.field_product_product__property_valuation
#: model:ir.model.fields,field_description:stock_account.field_product_template__property_valuation
#: model:ir.ui.menu,name:stock_account.menu_valuation
#: model:ir.ui.view,arch_db:stock_account.view_category_property_form
+#: model:ir.ui.view,arch_db:stock_account.view_inventory_valuation_search
+#, python-format
msgid "Inventory Valuation"
msgstr ""
@@ -263,6 +294,11 @@ msgid "Manual: The accounting entries to value the inventory are not posted auto
msgstr ""
#. module: stock_account
+#: model:ir.ui.view,arch_db:stock_account.view_inventory_valuation_search
+msgid "Negative Stock"
+msgstr ""
+
+#. module: stock_account
#: code:addons/stock_account/models/product.py:128
#, python-format
msgid "No difference between the standard price and the new price."
@@ -309,17 +345,6 @@ msgid "Product Template"
msgstr ""
#. module: stock_account
-#: model:ir.actions.act_window,name:stock_account.product_valuation_action
-msgid "Product Valuation"
-msgstr ""
-
-#. module: stock_account
-#: code:addons/stock_account/wizard/stock_quantity_history.py:24
-#, python-format
-msgid "Products"
-msgstr ""
-
-#. module: stock_account
#: model:ir.model.fields,field_description:stock_account.field_product_product__qty_at_date
#: model:ir.ui.view,arch_db:stock_account.view_move_tree_valuation_at_date
msgid "Quantity"
@@ -357,13 +382,6 @@ msgid "Standard Price"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/models/product.py:146
-#: code:addons/stock_account/models/product.py:152
-#, python-format
-msgid "Standard Price changed - %s"
-msgstr ""
-
-#. module: stock_account
#: model:ir.model.fields,help:stock_account.field_product_product__property_cost_method
#: model:ir.model.fields,help:stock_account.field_product_template__property_cost_method
msgid "Standard Price: The products are valued at their standard cost defined on the product.\n"
@@ -451,25 +469,25 @@ msgid "Templates for Account Chart"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/models/stock.py:527
+#: code:addons/stock_account/models/stock.py:528
#, python-format
msgid "The cost of %s is currently equal to 0. Change the cost or the configuration of your product to avoid an incorrect valuation."
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/models/stock.py:349
+#: code:addons/stock_account/models/stock.py:350
#, python-format
msgid "The move lines are not in a consistent state: some are entering and other are leaving the company."
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/models/stock.py:360
+#: code:addons/stock_account/models/stock.py:361
#, python-format
msgid "The move lines are not in a consistent states: they are doing an intercompany in a single step while they should go through the intercompany transit location."
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/models/stock.py:358
+#: code:addons/stock_account/models/stock.py:359
#, python-format
msgid "The move lines are not in a consistent states: they do not share the same origin or destination company."
msgstr ""
@@ -510,6 +528,7 @@ msgstr ""
#. module: stock_account
#: model:ir.model.fields,field_description:stock_account.field_product_product__valuation
#: model:ir.model.fields,field_description:stock_account.field_product_template__valuation
+#: model:ir.ui.view,arch_db:stock_account.view_stock_product_tree2
msgid "Valuation"
msgstr ""
@@ -570,14 +589,14 @@ msgid "When real-time inventory valuation is enabled on a product, this account
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/models/stock.py:499
+#: code:addons/stock_account/models/stock.py:500
#, python-format
msgid "You don't have any stock journal defined on your product category, check if you have installed a chart of accounts."
msgstr ""
#. module: stock_account
#: code:addons/stock_account/models/product.py:130
-#: code:addons/stock_account/models/stock.py:505
+#: code:addons/stock_account/models/stock.py:506
#, python-format
msgid "You don't have any stock valuation account defined on your product category. You must define one before processing this operation."
msgstr ""
diff --git a/addons/stock_dropshipping/i18n/stock_dropshipping.pot b/addons/stock_dropshipping/i18n/stock_dropshipping.pot
index b420c33ee00..47538bca9e3 100644
--- a/addons/stock_dropshipping/i18n/stock_dropshipping.pot
+++ b/addons/stock_dropshipping/i18n/stock_dropshipping.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:10+0000\n"
-"PO-Revision-Date: 2018-03-22 14:10+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,22 @@ msgstr ""
#. module: stock_dropshipping
#: model:stock.location.route,name:stock_dropshipping.route_drop_shipping
-msgid "Drop Shipping"
-msgstr ""
-
-#. module: stock_dropshipping
#: model:stock.picking.type,name:stock_dropshipping.picking_type_dropship
msgid "Dropship"
msgstr ""
#. module: stock_dropshipping
-#: model:ir.model,name:stock_dropshipping.model_procurement_rule
-msgid "Procurement Rule"
-msgstr ""
-
-#. module: stock_dropshipping
#: model:ir.model,name:stock_dropshipping.model_purchase_order_line
msgid "Purchase Order Line"
msgstr ""
#. module: stock_dropshipping
-#: model:ir.model.fields,field_description:stock_dropshipping.field_purchase_order_line__sale_line_id
-msgid "Sale Line"
+#: model:ir.model,name:stock_dropshipping.model_stock_rule
+msgid "Stock Rule"
msgstr ""
#. module: stock_dropshipping
-#: model:procurement.rule,name:stock_dropshipping.procurement_rule_drop_shipping
-msgid "Vendor → Customer"
+#: model:stock.rule,name:stock_dropshipping.stock_rule_drop_shipping
+msgid "Vendor → Customer (Dropshipping)"
msgstr ""
diff --git a/addons/stock_landed_costs/i18n/stock_landed_costs.pot b/addons/stock_landed_costs/i18n/stock_landed_costs.pot
index 2e40f16b9c4..209791a1afc 100644
--- a/addons/stock_landed_costs/i18n/stock_landed_costs.pot
+++ b/addons/stock_landed_costs/i18n/stock_landed_costs.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:11+0000\n"
-"PO-Revision-Date: 2018-08-02 09:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,10 +16,10 @@ msgstr ""
"Plural-Forms: \n"
#. module: stock_landed_costs
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:344
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:348
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:365
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:369
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:346
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:350
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:367
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:371
#, python-format
msgid " already out"
msgstr ""
@@ -79,6 +79,16 @@ msgid "Cancelled"
msgstr ""
#. module: stock_landed_costs
+#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__company_id
+msgid "Company"
+msgstr ""
+
+#. module: stock_landed_costs
+#: model:ir.model.fields,help:stock_landed_costs.field_stock_landed_cost__company_id
+msgid "Company related to this journal"
+msgstr ""
+
+#. module: stock_landed_costs
#: model:ir.ui.view,arch_db:stock_landed_costs.view_stock_landed_cost_form
msgid "Compute"
msgstr ""
@@ -100,7 +110,7 @@ msgid "Cost Lines"
msgstr ""
#. module: stock_landed_costs
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:91
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:93
#, python-format
msgid "Cost and adjustments lines do not match. You should maybe recompute the landed costs."
msgstr ""
@@ -341,13 +351,13 @@ msgstr ""
#. module: stock_landed_costs
#: code:addons/stock_landed_costs/models/stock_landed_cost.py:24
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:62
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:64
#, python-format
msgid "New"
msgstr ""
#. module: stock_landed_costs
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:89
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:91
#, python-format
msgid "No valuation adjustments lines. You should maybe recompute the landed costs."
msgstr ""
@@ -378,18 +388,13 @@ msgid "Number of unread messages"
msgstr ""
#. module: stock_landed_costs
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:87
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:89
#, python-format
msgid "Only draft landed costs can be validated"
msgstr ""
#. module: stock_landed_costs
-#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__picking_ids
-msgid "Pickings"
-msgstr ""
-
-#. module: stock_landed_costs
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:312
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:314
#, python-format
msgid "Please configure Stock Expense Account for product: %s."
msgstr ""
@@ -465,14 +470,13 @@ msgid "Stock Valuation Adjustment Lines"
msgstr ""
#. module: stock_landed_costs
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:161
-#, python-format
-msgid "The selected picking does not contain any move that would be impacted by landed costs. Landed costs are only possible for products configured in real time valuation with real price costing method. Please make sure it is the case, or you selected the correct picking"
+#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__amount_total
+msgid "Total"
msgstr ""
#. module: stock_landed_costs
-#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__amount_total
-msgid "Total"
+#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__picking_ids
+msgid "Transfers"
msgstr ""
#. module: stock_landed_costs
@@ -491,7 +495,7 @@ msgid "Validate"
msgstr ""
#. module: stock_landed_costs
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:81
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:83
#, python-format
msgid "Validated landed costs cannot be cancelled, but you could create negative landed costs to reverse them"
msgstr ""
@@ -523,6 +527,12 @@ msgid "Weight"
msgstr ""
#. module: stock_landed_costs
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:163
+#, python-format
+msgid "You cannot apply landed costs on the chosen transfer(s). Landed costs can only be applied for products with automated inventory valuation and FIFO costing method."
+msgstr ""
+
+#. module: stock_landed_costs
#: model:ir.ui.view,arch_db:stock_landed_costs.view_stock_landed_cost_type_form
msgid "describe the product characteristics..."
msgstr ""
diff --git a/addons/stock_picking_batch/i18n/stock_picking_batch.pot b/addons/stock_picking_batch/i18n/stock_picking_batch.pot
index 355c8027815..b40be3954da 100644
--- a/addons/stock_picking_batch/i18n/stock_picking_batch.pot
+++ b/addons/stock_picking_batch/i18n/stock_picking_batch.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,21 @@ msgstr ""
"Plural-Forms: \n"
#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.report_picking_batch
+msgid "<strong>Lot/Serial Number</strong>"
+msgstr ""
+
+#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.report_picking_batch
+msgid "<strong>Package</strong>"
+msgstr ""
+
+#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.report_picking_batch
+msgid "<strong>Responsible:</strong>"
+msgstr ""
+
+#. module: stock_picking_batch
#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch__message_needaction
msgid "Action Needed"
msgstr ""
@@ -38,12 +53,18 @@ msgid "Add to Batch"
msgstr ""
#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.report_picking_batch
+msgid "Barcode"
+msgstr ""
+
+#. module: stock_picking_batch
#: model:ir.ui.view,arch_db:stock_picking_batch.view_picking_internal_search_inherit_stock_picking_batch
msgid "Batch"
msgstr ""
#. module: stock_picking_batch
#: code:addons/stock_picking_batch/models/stock_picking_batch.py:64
+#: model:ir.actions.report,name:stock_picking_batch.action_report_picking_batch
#: model:ir.model,name:stock_picking_batch.model_stock_picking_batch
#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking__batch_id
#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_to_batch__batch_id
@@ -90,6 +111,11 @@ msgid "Cancelled"
msgstr ""
#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.report_picking_batch
+msgid "Commitment Date"
+msgstr ""
+
+#. module: stock_picking_batch
#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_form
msgid "Confirm"
msgstr ""
@@ -117,6 +143,11 @@ msgid "Created on"
msgstr ""
#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.report_picking_batch
+msgid "Destination"
+msgstr ""
+
+#. module: stock_picking_batch
#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch__display_name
#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_to_batch__display_name
msgid "Display Name"
@@ -275,6 +306,16 @@ msgid "Pick To Backorder"
msgstr ""
#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.report_picking_batch
+msgid "Picking"
+msgstr ""
+
+#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.report_picking_batch
+msgid "Picking Reference"
+msgstr ""
+
+#. module: stock_picking_batch
#: model:ir.model.fields,help:stock_picking_batch.field_stock_immediate_transfer__pick_to_backorder_ids
msgid "Picking to backorder"
msgstr ""
@@ -291,6 +332,16 @@ msgid "Print"
msgstr ""
#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.report_picking_batch
+msgid "Product"
+msgstr ""
+
+#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.report_picking_batch
+msgid "Quantity"
+msgstr ""
+
+#. module: stock_picking_batch
#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch__user_id
msgid "Responsible"
msgstr ""
@@ -301,6 +352,11 @@ msgid "Running"
msgstr ""
#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.report_picking_batch
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: stock_picking_batch
#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_filter
msgid "Search Batch Picking"
msgstr ""
@@ -335,12 +391,22 @@ msgid "State"
msgstr ""
#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.report_picking_batch
+msgid "Status"
+msgstr ""
+
+#. module: stock_picking_batch
#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_form
#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_tree
msgid "Stock Batch Picking"
msgstr ""
#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.report_picking_batch
+msgid "Summary:"
+msgstr ""
+
+#. module: stock_picking_batch
#: model:ir.actions.act_window,help:stock_picking_batch.stock_picking_batch_action
msgid "The goal of the batch picking is to group operations that may\n"
" (needs to) be done together in order to increase their efficiency.\n"
@@ -349,6 +415,11 @@ msgid "The goal of the batch picking is to group operations that may\n"
msgstr ""
#. module: stock_picking_batch
+#: model:ir.ui.view,arch_db:stock_picking_batch.report_picking_batch
+msgid "To take from:"
+msgstr ""
+
+#. module: stock_picking_batch
#: model:ir.model,name:stock_picking_batch.model_stock_picking
msgid "Transfer"
msgstr ""
diff --git a/addons/stock_zebra/i18n/stock_zebra.pot b/addons/stock_zebra/i18n/stock_zebra.pot
new file mode 100644
index 00000000000..546fd67af85
--- /dev/null
+++ b/addons/stock_zebra/i18n/stock_zebra.pot
@@ -0,0 +1,44 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * stock_zebra
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~11.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: stock_zebra
+#: model:ir.actions.report,name:stock_zebra.label_transfer_template
+msgid "Barcodes (ZPL)"
+msgstr ""
+
+#. module: stock_zebra
+#: model:ir.actions.report,name:stock_zebra.label_lot_template
+msgid "Lot/Serial Number (ZPL)"
+msgstr ""
+
+#. module: stock_zebra
+#: model:ir.actions.report,name:stock_zebra.label_package_template
+msgid "Package Barcode (ZPL)"
+msgstr ""
+
+#. module: stock_zebra
+#: model:ir.actions.report,name:stock_zebra.label_barcode_product_product
+#: model:ir.actions.report,name:stock_zebra.label_barcode_product_template
+msgid "Product Barcode (ZPL)"
+msgstr ""
+
+#. module: stock_zebra
+#: model:ir.actions.report,name:stock_zebra.label_product_product
+#: model:ir.actions.report,name:stock_zebra.label_product_template
+msgid "Product Label (ZPL)"
+msgstr ""
+
diff --git a/addons/survey/i18n/survey.pot b/addons/survey/i18n/survey.pot
index 558a1b493f7..be1bc1a3346 100644
--- a/addons/survey/i18n/survey.pot
+++ b/addons/survey/i18n/survey.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,20 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: survey
-#: model:mail.template,body_html:survey.email_template_survey
-msgid "\n"
-" \n"
-"<p>Hello,</p>\n"
-"<p>We are conducting a survey, and your response would be appreciated.</p>\n"
-"<p><a style=\"margin-left: 85px; padding:5px 10px; border-radius: 3px; background-color:#875A7B; text-align:center; text-decoration:none; color:#F7FBFD;\" href=\"__URL__\">Please, click here to start survey</a></p>\n"
-"<p>Thanks for your participation!</p>\n"
-" \n"
-" "
+#: model:ir.ui.view,arch_db:survey.survey_page_tree
+msgid "#Questions"
msgstr ""
#. module: survey
-#: model:ir.ui.view,arch_db:survey.survey_page_tree
-msgid "#Questions"
+#: model:mail.template,subject:survey.email_template_survey
+msgid "${object.title}: Survey"
msgstr ""
#. module: survey
@@ -54,8 +47,25 @@ msgid "<b>Question </b>"
msgstr ""
#. module: survey
+#: model:mail.template,body_html:survey.email_template_survey
+msgid "<div style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+" Hello<br/><br/>\n"
+" We are conducting a survey, and your response would be appreciated.\n"
+" <div style=\"margin: 16px 0px 16px 0px;\">\n"
+" <a href=\"__URL__\" style=\"background-color: #875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:13px;\">\n"
+" Start Survey\n"
+" </a>\n"
+" </div>\n"
+" Thanks for your participation!\n"
+" </p>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_question_form
-msgid "<i class=\"fa fa-2x\">123..</i>"
+msgid "<i class=\"fa fa-2x\" role=\"img\" aria-label=\"Numeric\" title=\"Numeric\">123..</i>"
msgstr ""
#. module: survey
@@ -124,49 +134,49 @@ msgstr ""
#. module: survey
#: model:ir.ui.view,arch_db:survey.result
-msgid "<span class=\"fa fa-filter\"/> Filters"
+msgid "<span class=\"badge badge-primary only_left_radius filter-all\">All surveys</span><span class=\"badge badge-secondary only_right_radius filter-finished\">Finished surveys</span>"
msgstr ""
#. module: survey
#: model:ir.ui.view,arch_db:survey.result
-msgid "<span class=\"label label-default only_left_radius filter-all\">All surveys</span><span class=\"label label-primary only_right_radius filter-finished\">Finished surveys</span>"
+msgid "<span class=\"badge badge-secondary only_left_radius filter-all\">All surveys</span><span class=\"badge badge-primary only_right_radius filter-finished\">Finished surveys</span>"
msgstr ""
#. module: survey
#: model:ir.ui.view,arch_db:survey.result_number
-msgid "<span class=\"label label-default only_left_radius\">Average </span>"
+msgid "<span class=\"badge badge-secondary only_left_radius\">Average </span>"
msgstr ""
#. module: survey
#: model:ir.ui.view,arch_db:survey.result_number
-msgid "<span class=\"label label-default only_left_radius\">Maximum </span>"
+msgid "<span class=\"badge badge-secondary only_left_radius\">Maximum </span>"
msgstr ""
#. module: survey
#: model:ir.ui.view,arch_db:survey.result_number
-msgid "<span class=\"label label-default only_left_radius\">Minimum </span>"
+msgid "<span class=\"badge badge-secondary only_left_radius\">Minimum </span>"
msgstr ""
#. module: survey
#: model:ir.ui.view,arch_db:survey.result_number
-msgid "<span class=\"label label-default only_left_radius\">Sum </span>"
+msgid "<span class=\"badge badge-secondary only_left_radius\">Sum </span>"
msgstr ""
#. module: survey
#: model:ir.ui.view,arch_db:survey.result
-msgid "<span class=\"label label-primary only_left_radius filter-all\">All surveys</span><span class=\"label label-default only_right_radius filter-finished\">Finished surveys</span>"
+msgid "<span class=\"fa fa-filter\"/> Filters"
msgstr ""
#. module: survey
#: model:ir.ui.view,arch_db:survey.no_result
msgid "<span>\n"
-" <i style=\"font-size:1.8em\" class=\"fa fa-users pull-right\"/>\n"
+" <i style=\"font-size:1.8em\" class=\"fa fa-users float-right\" role=\"img\" aria-label=\"No answer\" title=\"No answer\"/>\n"
" </span>\n"
" Sorry, No one answered this survey yet"
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:687
+#: code:addons/survey/models/survey.py:688
#, python-format
msgid "A label must be attached to only one question."
msgstr ""
@@ -589,6 +599,11 @@ msgid "Draft"
msgstr ""
#. module: survey
+#: model:ir.ui.view,arch_db:survey.survey_kanban
+msgid "Dropdown menu"
+msgstr ""
+
+#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_user_input__email
msgid "E-mail"
msgstr ""
@@ -640,6 +655,11 @@ msgid "Favorited By"
msgstr ""
#. module: survey
+#: model:ir.ui.view,arch_db:survey.result_choice
+msgid "Filter question"
+msgstr ""
+
+#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_stage__fold
msgid "Folded in kanban view"
msgstr ""
@@ -737,7 +757,7 @@ msgid "If closed, people won't be able to answer to surveys in this column."
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:470
+#: code:addons/survey/models/survey.py:471
#, python-format
msgid "If other, please specify:"
msgstr ""
@@ -753,7 +773,7 @@ msgid "In progress"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_email_compose_message.py:68
+#: code:addons/survey/wizard/survey_email_compose_message.py:72
#, python-format
msgid "Incorrect Email Address: %s"
msgstr ""
@@ -872,6 +892,11 @@ msgid "Login required"
msgstr ""
#. module: survey
+#: model:ir.ui.view,arch_db:survey.layout
+msgid "Logo"
+msgstr ""
+
+#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__mail_activity_type_id
msgid "Mail Activity Type"
msgstr ""
@@ -1023,6 +1048,16 @@ msgid "Multiple Lines Text Box"
msgstr ""
#. module: survey
+#: model:ir.ui.view,arch_db:survey.survey_question_form
+msgid "Multiple choice with multiple answers"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.view,arch_db:survey.survey_question_form
+msgid "Multiple choice with one answer"
+msgstr ""
+
+#. module: survey
#: selection:survey.question,type:0
msgid "Multiple choice: multiple answers allowed"
msgstr ""
@@ -1286,11 +1321,6 @@ msgid "Partner"
msgstr ""
#. module: survey
-#: model:ir.actions.act_window,name:survey.action_partner_survey_mail
-msgid "Partner Survey Mailing"
-msgstr ""
-
-#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__needaction_partner_ids
msgid "Partners with Need Action"
msgstr ""
@@ -1311,7 +1341,7 @@ msgid "Planned"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_email_compose_message.py:162
+#: code:addons/survey/wizard/survey_email_compose_message.py:188
#, python-format
msgid "Please enter at least one valid recipient."
msgstr ""
@@ -1775,6 +1805,11 @@ msgid "Survey User inputs"
msgstr ""
#. module: survey
+#: model:ir.ui.view,arch_db:survey.result_matrix
+msgid "Survey filter"
+msgstr ""
+
+#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_question__page_id
msgid "Survey page"
msgstr ""
@@ -1833,19 +1868,19 @@ msgid "Thanks Message"
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:818
+#: code:addons/survey/models/survey.py:819
#, python-format
msgid "The answer must be in the right type"
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:484
+#: code:addons/survey/models/survey.py:485
#, python-format
msgid "The answer you entered has an invalid format."
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_email_compose_message.py:137
+#: code:addons/survey/wizard/survey_email_compose_message.py:163
#, python-format
msgid "The content of the text don't contain '__URL__'. __URL__ is automaticaly converted into the special url of the survey."
msgstr ""
@@ -1856,21 +1891,21 @@ msgid "The page you were looking for could not be authorized."
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:543
+#: code:addons/survey/models/survey.py:544
#: code:addons/survey/tests/test_survey.py:86
#, python-format
msgid "This answer must be an email address"
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:587
+#: code:addons/survey/models/survey.py:588
#: code:addons/survey/tests/test_survey.py:107
#, python-format
msgid "This is not a date"
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:564
+#: code:addons/survey/models/survey.py:565
#: code:addons/survey/tests/test_survey.py:97
#, python-format
msgid "This is not a number"
@@ -1887,13 +1922,13 @@ msgid "This message will be displayed when survey is completed"
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:805
+#: code:addons/survey/models/survey.py:806
#, python-format
msgid "This question cannot be unanswered or skipped."
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:488
+#: code:addons/survey/models/survey.py:489
#, python-format
msgid "This question requires an answer."
msgstr ""
@@ -2087,7 +2122,7 @@ msgstr ""
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_question_form
msgid "YYYY-MM-DD\n"
-" <i class=\"fa fa-calendar fa-2x\"/>"
+" <i class=\"fa fa-calendar fa-2x\" role=\"img\" aria-label=\"Calendar\" title=\"Calendar\"/>"
msgstr ""
#. module: survey
diff --git a/addons/uom/i18n/uom.pot b/addons/uom/i18n/uom.pot
index f2aa3c2ddb7..32a55f33ed0 100644
--- a/addons/uom/i18n/uom.pot
+++ b/addons/uom/i18n/uom.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -51,12 +51,6 @@ msgid "Conversion between Units of Measure can only occur if they belong to the
msgstr ""
#. module: uom
-#: code:addons/uom/models/uom_uom.py:138
-#, python-format
-msgid "Conversion from Product UoM %s to Default UoM %s is not possible as they both belong to different Category!."
-msgstr ""
-
-#. module: uom
#: model:ir.model.fields,field_description:uom.field_uom_category__create_uid
#: model:ir.model.fields,field_description:uom.field_uom_uom__create_uid
msgid "Created by"
@@ -191,7 +185,18 @@ msgstr ""
#. module: uom
#: sql_constraint:uom.uom:0
-msgid "The rounding precision must be greater than 0!"
+msgid "The reference unit must have a conversion factor equal to 1."
+msgstr ""
+
+#. module: uom
+#: sql_constraint:uom.uom:0
+msgid "The rounding precision must be strictly positive."
+msgstr ""
+
+#. module: uom
+#: code:addons/uom/models/uom_uom.py:152
+#, python-format
+msgid "The unit of measure %s defined on the order line doesn't belong to the same category than the unit of measure %s defined on the product. Please correct the unit of measure defined on the order line or on the product, they should belong to the same category."
msgstr ""
#. module: uom
@@ -265,13 +270,13 @@ msgid "Units of measure belonging to the same category can be\n"
msgstr ""
#. module: uom
-#: code:addons/uom/models/uom_uom.py:86
+#: code:addons/uom/models/uom_uom.py:93
#, python-format
msgid "UoM category %s should have a reference unit of measure. If you just created a new category, please record the 'reference' unit first."
msgstr ""
#. module: uom
-#: code:addons/uom/models/uom_uom.py:88
+#: code:addons/uom/models/uom_uom.py:95
#, python-format
msgid "UoM category %s should only have one reference unit of measure."
msgstr ""
@@ -304,6 +309,18 @@ msgid "You can have only one category per measurement type."
msgstr ""
#. module: uom
+#: code:addons/uom/models/uom_uom.py:28
+#, python-format
+msgid "You cannot delete this UoM Category as it is used by the system."
+msgstr ""
+
+#. module: uom
+#: code:addons/uom/models/uom_uom.py:115
+#, python-format
+msgid "You cannot delete this UoM as it is used by the system. You should rather archive it."
+msgstr ""
+
+#. module: uom
#: model:ir.actions.act_window,help:uom.product_uom_form_action
msgid "You must define a conversion rate between several Units of\n"
" Measure within the same category."
diff --git a/addons/web/i18n/web.pot b/addons/web/i18n/web.pot
index b5ce6c7784a..2c030a0dd7c 100644
--- a/addons/web/i18n/web.pot
+++ b/addons/web/i18n/web.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/view_dialogs.js:125
+#: code:addons/web/static/src/js/views/view_dialogs.js:137
#, python-format
msgid " & Close"
msgstr ""
@@ -38,23 +38,23 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/search_inputs.js:567
-#: code:addons/web/static/src/js/views/search/search_view.js:206
+#: code:addons/web/static/src/js/views/search/search_inputs.js:580
+#: code:addons/web/static/src/js/views/search/search_view.js:226
#, python-format
msgid " or "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:258
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:151
+#: code:addons/web/static/src/js/fields/field_utils.js:273
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:155
#, python-format
msgid " records"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:648
+#: code:addons/web/static/src/xml/base.xml:652
#, python-format
msgid "# Code editor"
msgstr ""
@@ -130,7 +130,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:399
+#: code:addons/web/static/src/js/fields/field_utils.js:414
#, python-format
msgid "'%s' is not a correct date"
msgstr ""
@@ -144,28 +144,28 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:446
+#: code:addons/web/static/src/js/fields/field_utils.js:461
#, python-format
msgid "'%s' is not a correct datetime"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:480
+#: code:addons/web/static/src/js/fields/field_utils.js:495
#, python-format
msgid "'%s' is not a correct float"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:558
+#: code:addons/web/static/src/js/fields/field_utils.js:585
#, python-format
msgid "'%s' is not a correct integer"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:516
+#: code:addons/web/static/src/js/fields/field_utils.js:531
#, python-format
msgid "'%s' is not a correct monetary field"
msgstr ""
@@ -179,8 +179,15 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:498
-#: code:addons/web/static/src/xml/base.xml:527
+#: code:addons/web/static/src/xml/base.xml:295
+#, python-format
+msgid "(change)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:505
+#: code:addons/web/static/src/xml/base.xml:534
#, python-format
msgid "(count)"
msgstr ""
@@ -201,7 +208,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:256
+#: code:addons/web/static/src/js/fields/field_utils.js:271
#, python-format
msgid "1 record"
msgstr ""
@@ -218,28 +225,28 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/action_manager.js:557
+#: code:addons/web/static/src/js/chrome/action_manager.js:576
#, python-format
msgid "A popup window has been blocked. You may need to change your browser settings to allow popup windows for this page."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/action_manager_report.js:65
+#: code:addons/web/static/src/js/chrome/action_manager_report.js:66
#, python-format
msgid "A popup window with your report was blocked. You may need to change your browser settings to allow popup windows for this page."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:625
+#: code:addons/web/static/src/xml/base.xml:629
#, python-format
msgid "ALL"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:626
+#: code:addons/web/static/src/xml/base.xml:630
#, python-format
msgid "ANY"
msgstr ""
@@ -260,7 +267,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1435
+#: code:addons/web/static/src/xml/base.xml:1550
#, python-format
msgid "Access to all Enterprise Apps"
msgstr ""
@@ -281,33 +288,33 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1742
+#: code:addons/web/static/src/js/fields/basic_fields.js:1980
#, python-format
msgid "Activate"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:232
+#: code:addons/web/static/src/xml/base.xml:247
#, python-format
msgid "Activate Assets Debugging"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1741
-#: code:addons/web/static/src/js/fields/basic_fields.js:1745
-#: code:addons/web/static/src/js/fields/basic_fields.js:1749
+#: code:addons/web/static/src/js/fields/basic_fields.js:1979
+#: code:addons/web/static/src/js/fields/basic_fields.js:1983
+#: code:addons/web/static/src/js/fields/basic_fields.js:1987
#, python-format
msgid "Active"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:705
-#: code:addons/web/static/src/xml/base.xml:1278
-#: code:addons/web/static/src/xml/kanban.xml:55
-#: code:addons/web/static/src/xml/kanban.xml:72
+#: code:addons/web/static/src/js/fields/relational_fields.js:714
+#: code:addons/web/static/src/xml/base.xml:1393
+#: code:addons/web/static/src/xml/kanban.xml:56
+#: code:addons/web/static/src/xml/kanban.xml:73
#, python-format
msgid "Add"
msgstr ""
@@ -321,92 +328,120 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1077
+#: code:addons/web/static/src/xml/base.xml:1113
#, python-format
msgid "Add Custom Filter"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1060
+#: code:addons/web/static/src/xml/base.xml:1098
#, python-format
msgid "Add Custom Group"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/kanban.xml:48
+#: code:addons/web/static/src/xml/kanban.xml:49
#, python-format
msgid "Add a Column"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1082
+#: code:addons/web/static/src/xml/base.xml:1117
#, python-format
msgid "Add a condition"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list/list_editable_renderer.js:530
+#: code:addons/web/static/src/js/views/list/list_editable_renderer.js:79
#, python-format
msgid "Add a line"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:633
+#: code:addons/web/static/src/xml/base.xml:613
+#, python-format
+msgid "Add branch"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/kanban.xml:48
+#, python-format
+msgid "Add column"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:637
#, python-format
msgid "Add filter"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:693
+#: code:addons/web/static/src/xml/base.xml:697
#, python-format
msgid "Add new value"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1666
+#: code:addons/web/static/src/xml/base.xml:612
+#, python-format
+msgid "Add node"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:698
+#, python-format
+msgid "Add tag"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/fields/basic_fields.js:1902
#, python-format
msgid "Add to Favorites"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:365
+#: code:addons/web/static/src/xml/base.xml:372
#, python-format
msgid "Add..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:1387
+#: code:addons/web/static/src/js/fields/relational_fields.js:1445
#, python-format
msgid "Add: "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1091
+#: code:addons/web/static/src/xml/base.xml:1192
#, python-format
msgid "Advanced Search..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/core/dialog.js:293
+#: code:addons/web/static/src/js/core/dialog.js:315
#, python-format
msgid "Alert"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:615
-#: code:addons/web/static/src/xml/base.xml:620
+#: code:addons/web/static/src/xml/base.xml:619
+#: code:addons/web/static/src/xml/base.xml:624
#, python-format
msgid "All"
msgstr ""
@@ -421,7 +456,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:484
+#: code:addons/web/static/src/xml/base.xml:491
#, python-format
msgid "All users"
msgstr ""
@@ -435,37 +470,38 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:193
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:195
#, python-format
msgid "An unknown CORS error occured. The error probably originates from a JavaScript file served from a different origin."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1440
+#: code:addons/web/static/src/xml/base.xml:1555
#, python-format
msgid "And more"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:616
-#: code:addons/web/static/src/xml/base.xml:621
+#: code:addons/web/static/src/xml/base.xml:620
+#: code:addons/web/static/src/xml/base.xml:625
#, python-format
msgid "Any"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1070
-#: code:addons/web/static/src/xml/base.xml:1080
+#: code:addons/web/static/src/xml/base.xml:1107
+#: code:addons/web/static/src/xml/base.xml:1115
+#: code:addons/web/static/src/xml/base.xml:1185
#, python-format
msgid "Apply"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1746
+#: code:addons/web/static/src/js/fields/basic_fields.js:1984
#: code:addons/web/static/src/js/views/list/list_controller.js:148
#, python-format
msgid "Archive"
@@ -473,21 +509,21 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/kanban.xml:26
+#: code:addons/web/static/src/xml/kanban.xml:27
#, python-format
msgid "Archive All"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1745
+#: code:addons/web/static/src/js/fields/basic_fields.js:1983
#, python-format
msgid "Archived"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:366
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:371
#, python-format
msgid "Are you sure that you want to archive all the records from this column?"
msgstr ""
@@ -501,14 +537,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:304
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:309
#, python-format
msgid "Are you sure that you want to remove this column ?"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/favorites_menu.js:263
+#: code:addons/web/static/src/js/views/search/favorites_menu.js:273
#, python-format
msgid "Are you sure that you want to remove this filter?"
msgstr ""
@@ -523,34 +559,65 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:338
+#: code:addons/web/static/src/xml/base.xml:1015
+#, python-format
+msgid "Attach"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:345
#, python-format
msgid "Attachment :"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1274
+#: code:addons/web/static/src/xml/base.xml:1389
#, python-format
msgid "Available fields"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:505
+#: code:addons/web/static/src/xml/base.xml:1518
+#: code:addons/web/static/src/xml/kanban.xml:161
+#: code:addons/web/static/src/xml/web_calendar.xml:53
+#: code:addons/web/static/src/xml/web_calendar.xml:56
+#, python-format
+msgid "Avatar"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:512
#, python-format
msgid "Bar Chart"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:1495
+#: code:addons/web/controllers/main.py:1515
#, python-format
msgid "Binary fields can not be exported to Excel unless their content is base64-encoded. That does not seem to be the case for %s."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1439
+#: code:addons/web/static/src/xml/base.xml:939
+#, python-format
+msgid "Binary file"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/colorpicker.xml:32
+#, python-format
+msgid "Blue"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1554
#, python-format
msgid "Bugfixes guarantee"
msgstr ""
@@ -571,14 +638,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/core/utils.js:145
+#: code:addons/web/static/src/js/core/utils.js:131
#, python-format
msgid "Bytes,Kb,Mb,Gb,Tb,Pb,Eb,Zb,Yb"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1103
+#: code:addons/web/static/src/xml/base.xml:1204
#, python-format
msgid "CLEAR"
msgstr ""
@@ -599,14 +666,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/core/dialog.js:307
-#: code:addons/web/static/src/js/core/dialog.js:359
+#: code:addons/web/static/src/js/core/dialog.js:329
+#: code:addons/web/static/src/js/core/dialog.js:382
#: code:addons/web/static/src/js/fields/relational_fields.js:65
#: code:addons/web/static/src/js/fields/upgrade_fields.js:75
-#: code:addons/web/static/src/js/services/crash_manager.js:204
+#: code:addons/web/static/src/js/services/crash_manager.js:200
#: code:addons/web/static/src/js/views/calendar/calendar_quick_create.js:56
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:298
-#: code:addons/web/static/src/js/views/view_dialogs.js:362
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:303
+#: code:addons/web/static/src/js/views/view_dialogs.js:397
#: code:addons/web/static/src/xml/base.xml:179
#, python-format
msgid "Cancel"
@@ -614,17 +681,24 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_renderer.js:93
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:94
#, python-format
msgid "Cannot render chart with mode : "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/controllers/main.py:794
-#: code:addons/web/controllers/main.py:796
-#: code:addons/web/controllers/main.py:801
-#: code:addons/web/controllers/main.py:802
+#: code:addons/web/static/src/js/views/kanban/kanban_record.js:407
+#, python-format
+msgid "Card color: %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:803
+#: code:addons/web/controllers/main.py:805
+#: code:addons/web/controllers/main.py:810
+#: code:addons/web/controllers/main.py:811
#: code:addons/web/static/src/js/widgets/change_password.js:27
#: code:addons/web/static/src/xml/base.xml:178
#, python-format
@@ -640,49 +714,64 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:901
-#: code:addons/web/static/src/xml/base.xml:930
-#: code:addons/web/static/src/xml/base.xml:961
+#: code:addons/web/static/src/js/widgets/colorpicker.js:34
+#, python-format
+msgid "Choose"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:923
+#: code:addons/web/static/src/xml/base.xml:963
+#: code:addons/web/static/src/xml/base.xml:994
#, python-format
msgid "Clear"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:229
+#: code:addons/web/static/src/xml/base.xml:244
#, python-format
msgid "Clear Events"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1750
+#: code:addons/web/static/src/js/fields/basic_fields.js:1988
#: code:addons/web/static/src/js/views/calendar/calendar_controller.js:356
-#: code:addons/web/static/src/js/views/view_dialogs.js:111
-#: code:addons/web/static/src/js/widgets/data_export.js:203
-#: code:addons/web/static/src/js/widgets/debug_manager.js:459
+#: code:addons/web/static/src/js/views/view_dialogs.js:123
+#: code:addons/web/static/src/js/widgets/data_export.js:212
+#: code:addons/web/static/src/js/widgets/debug_manager.js:473
#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:24
+#: code:addons/web/static/src/xml/base.xml:740
#, python-format
msgid "Close"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1749
+#: code:addons/web/static/src/js/fields/basic_fields.js:1987
#, python-format
msgid "Closed"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/kanban.xml:53
+#: code:addons/web/static/src/xml/kanban.xml:54
#, python-format
msgid "Column title"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:458
+#: code:addons/web/static/src/xml/base.xml:1167
+#, python-format
+msgid "Compare To"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:465
#, python-format
msgid "Condition:"
msgstr ""
@@ -696,22 +785,22 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/core/dialog.js:318
-#: code:addons/web/static/src/js/core/dialog.js:368
+#: code:addons/web/static/src/js/core/dialog.js:341
+#: code:addons/web/static/src/js/core/dialog.js:391
#, python-format
msgid "Confirmation"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:327
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:329
#, python-format
msgid "Connection lost"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:341
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:343
#, python-format
msgid "Connection restored"
msgstr ""
@@ -726,13 +815,22 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/services/crash_manager.js:133
+#: code:addons/web/static/src/js/fields/basic_fields.js:1248
+#: code:addons/web/static/src/js/services/crash_manager.js:129
#, python-format
msgid "Copied !"
msgstr ""
#. module: web
#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:943
+#: code:addons/web/static/src/xml/base.xml:948
+#, python-format
+msgid "Copy Text"
+msgstr ""
+
+#. module: web
+#. openerp-web
#: code:addons/web/static/src/xml/base.xml:147
#, python-format
msgid "Copy the full error to clipboard"
@@ -740,26 +838,33 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1214
+#: code:addons/web/static/src/js/core/ajax.js:368
+#, python-format
+msgid "Could not connect to the server"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/fields/basic_fields.js:1451
#, python-format
msgid "Could not display the selected image."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/core/utils.js:482
+#: code:addons/web/static/src/js/core/utils.js:457
#, python-format
msgid "Could not serialize XML"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_view.js:48
-#: code:addons/web/static/src/js/views/graph/graph_view.js:51
-#: code:addons/web/static/src/js/views/pivot/pivot_view.js:48
-#: code:addons/web/static/src/js/views/pivot/pivot_view.js:60
-#: code:addons/web/static/src/xml/base.xml:501
-#: code:addons/web/static/src/xml/base.xml:530
+#: code:addons/web/static/src/js/views/graph/graph_view.js:49
+#: code:addons/web/static/src/js/views/graph/graph_view.js:52
+#: code:addons/web/static/src/js/views/pivot/pivot_view.js:47
+#: code:addons/web/static/src/js/views/pivot/pivot_view.js:59
+#: code:addons/web/static/src/xml/base.xml:508
+#: code:addons/web/static/src/xml/base.xml:537
#, python-format
msgid "Count"
msgstr ""
@@ -769,24 +874,24 @@ msgstr ""
#: code:addons/web/static/src/js/fields/relational_fields.js:44
#: code:addons/web/static/src/js/views/calendar/calendar_controller.js:262
#: code:addons/web/static/src/js/views/calendar/calendar_quick_create.js:45
-#: code:addons/web/static/src/js/views/kanban/kanban_controller.js:395
-#: code:addons/web/static/src/js/views/view_dialogs.js:368
-#: code:addons/web/static/src/xml/base.xml:376
-#: code:addons/web/static/src/xml/base.xml:396
+#: code:addons/web/static/src/js/views/kanban/kanban_controller.js:400
+#: code:addons/web/static/src/js/views/view_dialogs.js:403
+#: code:addons/web/static/src/xml/base.xml:383
+#: code:addons/web/static/src/xml/base.xml:403
#, python-format
msgid "Create"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form/form_controller.js:606
+#: code:addons/web/static/src/js/views/form/form_controller.js:610
#, python-format
msgid "Create "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:424
+#: code:addons/web/static/src/js/fields/relational_fields.js:433
#, python-format
msgid "Create \"<strong>%s</strong>\""
msgstr ""
@@ -800,7 +905,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:438
+#: code:addons/web/static/src/js/fields/relational_fields.js:447
#, python-format
msgid "Create and Edit..."
msgstr ""
@@ -814,7 +919,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:467
+#: code:addons/web/static/src/js/fields/relational_fields.js:476
#, python-format
msgid "Create: "
msgstr ""
@@ -827,57 +932,105 @@ msgid "Create: %s"
msgstr ""
#. module: web
+#: model:ir.model.fields,field_description:web.field_report_layout__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:343
+#: code:addons/web/static/src/xml/base.xml:350
#, python-format
msgid "Created by :"
msgstr ""
#. module: web
+#: model:ir.model.fields,field_description:web.field_report_layout__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:297
+#: code:addons/web/static/src/xml/base.xml:304
#, python-format
msgid "Creation Date:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:293
+#: code:addons/web/static/src/xml/base.xml:300
#, python-format
msgid "Creation User:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/favorites_menu.js:184
+#: code:addons/web/static/src/xml/base.xml:906
+#, python-format
+msgid "Current state"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/search/favorites_menu.js:185
#, python-format
msgid "Custom Filter"
msgstr ""
#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/kanban/kanban_record.js:29
+#: code:addons/web/static/src/xml/base.xml:854
+#: code:addons/web/static/src/xml/kanban.xml:88
+#, python-format
+msgid "Dark blue"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/kanban/kanban_record.js:26
+#: code:addons/web/static/src/xml/base.xml:851
+#: code:addons/web/static/src/xml/kanban.xml:85
+#, python-format
+msgid "Dark purple"
+msgstr ""
+
+#. module: web
#: model:ir.ui.view,arch_db:web.login
msgid "Database"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/filters_menu.js:51
-#: code:addons/web/static/src/xml/base.xml:548
-#: code:addons/web/static/src/xml/web_calendar.xml:72
+#: code:addons/web/static/src/xml/base.xml:1130
+#, python-format
+msgid "Date Field"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1147
+#, python-format
+msgid "Date Range"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:555
+#: code:addons/web/static/src/xml/web_calendar.xml:80
#, python-format
msgid "Day"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1742
+#: code:addons/web/static/src/js/fields/basic_fields.js:1980
#, python-format
msgid "Deactivate"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:441
+#: code:addons/web/static/src/xml/base.xml:448
#, python-format
msgid "Default:"
msgstr ""
@@ -885,50 +1038,65 @@ msgstr ""
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/views/calendar/calendar_controller.js:343
-#: code:addons/web/static/src/js/views/form/form_controller.js:176
+#: code:addons/web/static/src/js/views/form/form_controller.js:178
#: code:addons/web/static/src/js/views/list/list_controller.js:162
-#: code:addons/web/static/src/xml/base.xml:1319
-#: code:addons/web/static/src/xml/kanban.xml:23
+#: code:addons/web/static/src/xml/base.xml:839
+#: code:addons/web/static/src/xml/base.xml:1312
+#: code:addons/web/static/src/xml/base.xml:1435
+#: code:addons/web/static/src/xml/kanban.xml:24
#, python-format
msgid "Delete"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list/list_editable_renderer.js:514
+#: code:addons/web/static/src/xml/base.xml:611
+#, python-format
+msgid "Delete node"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/list/list_editable_renderer.js:557
#, python-format
msgid "Delete row "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:354
+#: code:addons/web/static/src/xml/base.xml:361
#, python-format
msgid "Delete this attachment"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1003
+#: code:addons/web/static/src/xml/base.xml:1036
#, python-format
msgid "Delete this file"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/view_dialogs.js:111
+#: code:addons/web/static/src/js/views/view_dialogs.js:123
+#: code:addons/web/static/src/js/widgets/colorpicker.js:35
#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:31
-#: code:addons/web/static/src/xml/base.xml:383
-#: code:addons/web/static/src/xml/base.xml:406
-#: code:addons/web/static/src/xml/kanban.xml:74
+#: code:addons/web/static/src/xml/base.xml:390
+#: code:addons/web/static/src/xml/base.xml:413
+#: code:addons/web/static/src/xml/kanban.xml:75
#: code:addons/web/static/src/xml/report.xml:18
#, python-format
msgid "Discard"
msgstr ""
#. module: web
+#: model:ir.model.fields,field_description:web.field_report_layout__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/data_export.js:336
+#: code:addons/web/static/src/js/widgets/data_export.js:362
#, python-format
msgid "Do you really want to delete this export template?"
msgstr ""
@@ -941,8 +1109,13 @@ msgid "Do you really want to delete this filter from favorites ?"
msgstr ""
#. module: web
+#: model:ir.model.fields,field_description:web.field_report_layout__view_id
+msgid "Document Template"
+msgstr ""
+
+#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1413
+#: code:addons/web/static/src/xml/base.xml:1528
#, python-format
msgid "Documentation"
msgstr ""
@@ -950,13 +1123,14 @@ msgstr ""
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:36
+#: code:addons/web/static/src/xml/base.xml:598
#, python-format
msgid "Domain"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/domain_selector.js:520
+#: code:addons/web/static/src/js/widgets/domain_selector.js:522
#, python-format
msgid "Domain error"
msgstr ""
@@ -977,14 +1151,22 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:536
+#: code:addons/web/static/src/xml/base.xml:543
#, python-format
msgid "Download xls"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form/form_controller.js:182
+#: code:addons/web/static/src/xml/base.xml:584
+#: code:addons/web/static/src/xml/base.xml:1538
+#, python-format
+msgid "Dropdown menu"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/form/form_controller.js:184
#, python-format
msgid "Duplicate"
msgstr ""
@@ -993,9 +1175,9 @@ msgstr ""
#. openerp-web
#: code:addons/web/static/src/js/views/calendar/calendar_controller.js:337
#: code:addons/web/static/src/js/views/calendar/calendar_quick_create.js:50
-#: code:addons/web/static/src/xml/base.xml:392
-#: code:addons/web/static/src/xml/base.xml:900
-#: code:addons/web/static/src/xml/kanban.xml:73
+#: code:addons/web/static/src/xml/base.xml:399
+#: code:addons/web/static/src/xml/base.xml:922
+#: code:addons/web/static/src/xml/kanban.xml:74
#: code:addons/web/static/src/xml/report.xml:14
#, python-format
msgid "Edit"
@@ -1003,42 +1185,42 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:239
+#: code:addons/web/static/src/xml/base.xml:254
#, python-format
msgid "Edit Action"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:317
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:322
#, python-format
msgid "Edit Column"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:601
+#: code:addons/web/static/src/xml/base.xml:605
#, python-format
msgid "Edit Domain"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:274
+#: code:addons/web/static/src/xml/base.xml:276
#, python-format
msgid "Edit SearchView"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/kanban.xml:22
+#: code:addons/web/static/src/xml/kanban.xml:23
#, python-format
msgid "Edit Stage"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:270
+#: code:addons/web/static/src/xml/base.xml:273
#, python-format
msgid "Edit View:"
msgstr ""
@@ -1055,22 +1237,22 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/services/crash_manager.js:136
-#: code:addons/web/static/src/js/views/search/favorites_menu.js:89
-#: code:addons/web/static/src/js/views/search/favorites_menu.js:96
+#: code:addons/web/static/src/js/services/crash_manager.js:132
+#: code:addons/web/static/src/js/views/search/favorites_menu.js:87
+#: code:addons/web/static/src/js/views/search/favorites_menu.js:94
#, python-format
msgid "Error"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:802
+#: code:addons/web/controllers/main.py:811
#, python-format
msgid "Error, password not changed !"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/kanban.xml:61
+#: code:addons/web/static/src/xml/kanban.xml:62
#, python-format
msgid "Esc to discard"
msgstr ""
@@ -1091,77 +1273,79 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/kanban.xml:59
+#: code:addons/web/static/src/xml/kanban.xml:60
#, python-format
msgid "Examples"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:535
+#: code:addons/web/static/src/xml/base.xml:542
#, python-format
msgid "Expand all"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list/list_controller.js:143
+#: code:addons/web/static/src/xml/base.xml:1415
#, python-format
-msgid "Export"
+msgid "Expand parents"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/data_export.js:200
+#: code:addons/web/static/src/js/views/list/list_controller.js:143
#, python-format
-msgid "Export Data"
+msgid "Export"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1267
+#: code:addons/web/static/src/js/widgets/data_export.js:209
#, python-format
-msgid "Export Formats :"
+msgid "Export Data"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/data_export.js:202
+#: code:addons/web/static/src/xml/base.xml:1382
#, python-format
-msgid "Export To File"
+msgid "Export Format:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1260
+#: code:addons/web/static/src/js/widgets/data_export.js:211
#, python-format
-msgid "Export Type :"
+msgid "Export To File"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1263
+#: code:addons/web/controllers/main.py:1279
+#: code:addons/web/controllers/main.py:1282
+#: code:addons/web/static/src/js/widgets/data_export.js:482
#, python-format
-msgid "Export all Data"
+msgid "External ID"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/data_export.js:458
+#: code:addons/web/static/src/xml/base.xml:821
#, python-format
-msgid "External ID"
+msgid "External link"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1101
+#: code:addons/web/static/src/xml/base.xml:1202
#, python-format
msgid "FILTER"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/action_manager_act_window.js:532
+#: code:addons/web/static/src/js/chrome/action_manager_act_window.js:537
#, python-format
msgid "Failed to evaluate search criterions"
msgstr ""
@@ -1175,7 +1359,8 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1229
+#: code:addons/web/static/src/xml/base.xml:1334
+#: code:addons/web/static/src/xml/base.xml:1335
#, python-format
msgid "Favorites"
msgstr ""
@@ -1189,84 +1374,84 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:496
-#: code:addons/web/static/src/xml/base.xml:267
+#: code:addons/web/static/src/js/widgets/debug_manager.js:510
+#: code:addons/web/static/src/xml/base.xml:271
#, python-format
msgid "Fields View Get"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:285
-#, python-format
-msgid "Fields of %s"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1286
+#: code:addons/web/static/src/xml/base.xml:1401
#, python-format
msgid "Fields to export"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1122
+#: code:addons/web/static/src/js/fields/basic_fields.js:1359
#, python-format
msgid "File Upload"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1102
+#: code:addons/web/static/src/js/fields/basic_fields.js:1339
#, python-format
msgid "File upload"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/search_inputs.js:565
+#: code:addons/web/static/src/js/views/search/search_inputs.js:578
#, python-format
msgid "Filter"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/favorites_menu.js:89
+#: code:addons/web/static/src/js/views/search/favorites_menu.js:87
#, python-format
msgid "Filter name is required."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/search_inputs.js:507
+#: code:addons/web/static/src/js/views/search/search_inputs.js:516
#, python-format
msgid "Filter on: %s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/favorites_menu.js:96
+#: code:addons/web/static/src/js/views/search/favorites_menu.js:94
#, python-format
msgid "Filter with same name already exists."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:534
+#: code:addons/web/static/src/xml/base.xml:541
#, python-format
msgid "Flip axis"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/kanban.xml:20
+#: code:addons/web/static/src/xml/kanban.xml:21
#, python-format
msgid "Fold"
msgstr ""
#. module: web
#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:753
+#, python-format
+msgid "Followed by"
+msgstr ""
+
+#. module: web
+#. openerp-web
#: code:addons/web/static/src/js/views/pivot/pivot_controller.js:128
#, python-format
msgid "For Excel compatibility, data cannot be exported if there are more than 256 columns.\n"
@@ -1276,14 +1461,30 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form/form_view.js:17
+#: code:addons/web/static/src/js/views/form/form_view.js:18
#, python-format
msgid "Form"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1432
+#: code:addons/web/static/src/js/views/search/filters_menu.js:181
+#, python-format
+msgid "From %s To %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/kanban/kanban_record.js:30
+#: code:addons/web/static/src/xml/base.xml:855
+#: code:addons/web/static/src/xml/kanban.xml:89
+#, python-format
+msgid "Fushia"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1547
#, python-format
msgid "Get this feature and much more with Odoo Enterprise!"
msgstr ""
@@ -1311,14 +1512,24 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/search_inputs.js:738
+#: code:addons/web/static/src/js/views/kanban/kanban_record.js:31
+#: code:addons/web/static/src/xml/base.xml:856
+#: code:addons/web/static/src/xml/colorpicker.xml:28
+#: code:addons/web/static/src/xml/kanban.xml:90
+#, python-format
+msgid "Green"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/search/search_inputs.js:780
#, python-format
msgid "Group By"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/search_inputs.js:712
+#: code:addons/web/static/src/js/views/search/search_inputs.js:754
#, python-format
msgid "Group by: %s"
msgstr ""
@@ -1330,114 +1541,120 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:850
+#: code:addons/web/static/src/xml/base.xml:864
#, python-format
msgid "Hide in Kanban"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:422
+#: code:addons/web/static/src/xml/base.xml:429
#, python-format
-msgid "Hit DOWN to navigate to the list bellow"
+msgid "Hit DOWN to navigate to the list below"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:429
+#: code:addons/web/static/src/xml/base.xml:436
#, python-format
msgid "Hit ENTER to"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:421
+#: code:addons/web/static/src/xml/base.xml:428
#, python-format
msgid "Hit ENTER to CREATE"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:413
+#: code:addons/web/static/src/xml/base.xml:420
#, python-format
msgid "Hit ENTER to SAVE"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:414
+#: code:addons/web/static/src/xml/base.xml:421
#, python-format
msgid "Hit ESCAPE to DISCARD"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/core/dialog.js:334
+#: code:addons/web/static/src/xml/colorpicker.xml:38
#, python-format
-msgid "I am sure about this."
+msgid "Hue"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:281
+#: code:addons/web/static/src/js/core/dialog.js:357
#, python-format
-msgid "ID:"
+msgid "I am sure about this."
+msgstr ""
+
+#. module: web
+#: model:ir.model.fields,field_description:web.field_report_layout__id
+msgid "ID"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1214
+#: code:addons/web/static/src/xml/base.xml:283
#, python-format
-msgid "Image"
+msgid "ID:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1262
+#: code:addons/web/static/src/js/fields/basic_fields.js:1451
+#: code:addons/web/static/src/js/fields/basic_fields.js:1771
#, python-format
-msgid "Import-Compatible Export"
+msgid "Image"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1741
+#: code:addons/web/static/src/js/fields/basic_fields.js:1979
#, python-format
msgid "Inactive"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_renderer.js:222
-#: code:addons/web/static/src/js/views/graph/graph_renderer.js:230
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:247
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:255
#, python-format
msgid "Invalid data"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:695
-#: code:addons/web/controllers/main.py:709
+#: code:addons/web/controllers/main.py:701
+#: code:addons/web/controllers/main.py:715
#, python-format
msgid "Invalid database name. Only alphanumerical characters, underscore, hyphen and dot are allowed."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:599
+#: code:addons/web/static/src/xml/base.xml:603
#, python-format
msgid "Invalid domain"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/model_field_selector.js:393
-#: code:addons/web/static/src/xml/base.xml:730
+#: code:addons/web/static/src/js/widgets/model_field_selector.js:405
+#: code:addons/web/static/src/xml/base.xml:734
#, python-format
msgid "Invalid field chain"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_renderer.js:92
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:93
#, python-format
msgid "Invalid mode for chart"
msgstr ""
@@ -1464,35 +1681,115 @@ msgid "Kanban"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:809
+#: code:addons/web/controllers/main.py:818
#, python-format
msgid "Languages"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:305
+#: code:addons/web/static/src/js/views/search/time_range_menu_options.js:19
+#, python-format
+msgid "Last 30 Days"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/search/time_range_menu_options.js:20
+#, python-format
+msgid "Last 365 Days"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/search/time_range_menu_options.js:18
+#, python-format
+msgid "Last 7 Days"
+msgstr ""
+
+#. module: web
+#: model:ir.model.fields,field_description:web.field_report_layout____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/search/time_range_menu_options.js:15
+#, python-format
+msgid "Last Month"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/search/time_range_menu_options.js:16
+#, python-format
+msgid "Last Quarter"
+msgstr ""
+
+#. module: web
+#: model:ir.model.fields,field_description:web.field_report_layout__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: web
+#: model:ir.model.fields,field_description:web.field_report_layout__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/search/time_range_menu_options.js:14
+#, python-format
+msgid "Last Week"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/search/time_range_menu_options.js:17
+#, python-format
+msgid "Last Year"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:312
#, python-format
msgid "Latest Modification Date:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:301
+#: code:addons/web/static/src/xml/base.xml:308
#, python-format
msgid "Latest Modification by:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:234
+#: code:addons/web/static/src/xml/base.xml:249
#, python-format
msgid "Leave the Developer Tools"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:506
+#: code:addons/web/static/src/js/views/kanban/kanban_record.js:25
+#: code:addons/web/static/src/xml/base.xml:850
+#: code:addons/web/static/src/xml/kanban.xml:84
+#, python-format
+msgid "Light blue"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/colorpicker.xml:46
+#, python-format
+msgid "Lightness %"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:513
#, python-format
msgid "Line Chart"
msgstr ""
@@ -1506,7 +1803,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/kanban.xml:41
+#: code:addons/web/static/src/xml/kanban.xml:42
#, python-format
msgid "Load more... ("
msgstr ""
@@ -1527,7 +1824,16 @@ msgstr ""
#. module: web
#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1049
+#: code:addons/web/static/src/xml/base.xml:1448
+#, python-format
+msgid "Loading, please wait..."
+msgstr ""
+
+#. module: web
+#. openerp-web
#: code:addons/web/static/src/js/core/misc.js:13
+#: code:addons/web/static/src/xml/base.xml:1441
#, python-format
msgid "Loading..."
msgstr ""
@@ -1539,14 +1845,24 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1418
+#: code:addons/web/static/src/xml/base.xml:1533
#, python-format
msgid "Log out"
msgstr ""
#. module: web
+#: model:ir.ui.view,arch_db:web.external_layout_background
+#: model:ir.ui.view,arch_db:web.external_layout_boxed
+#: model:ir.ui.view,arch_db:web.external_layout_clean
+#: model:ir.ui.view,arch_db:web.external_layout_standard
+#: model:ir.ui.view,arch_db:web.login_layout
+#: model:ir.ui.view,arch_db:web.menu_secondary
+msgid "Logo"
+msgstr ""
+
+#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/search_inputs.js:456
+#: code:addons/web/static/src/js/views/search/search_inputs.js:461
#, python-format
msgid "M2O search fields do not currently handle multiple default values"
msgstr ""
@@ -1563,29 +1879,29 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:295
-#: code:addons/web/static/src/xml/base.xml:242
+#: code:addons/web/static/src/js/widgets/debug_manager.js:296
+#: code:addons/web/static/src/xml/base.xml:257
#, python-format
msgid "Manage Filters"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:632
+#: code:addons/web/static/src/xml/base.xml:636
#, python-format
msgid "Match"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:639
+#: code:addons/web/static/src/xml/base.xml:643
#, python-format
msgid "Match records with"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:637
+#: code:addons/web/static/src/xml/base.xml:641
#, python-format
msgid "Match records with the following rule:"
msgstr ""
@@ -1599,15 +1915,24 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:493
-#: code:addons/web/static/src/xml/base.xml:522
+#: code:addons/web/static/src/xml/base.xml:500
+#: code:addons/web/static/src/xml/base.xml:529
#, python-format
msgid "Measures"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:372
+#: code:addons/web/static/src/js/views/kanban/kanban_record.js:28
+#: code:addons/web/static/src/xml/base.xml:853
+#: code:addons/web/static/src/xml/kanban.xml:87
+#, python-format
+msgid "Medium blue"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/widgets/debug_manager.js:373
#, python-format
msgid "Metadata (%s)"
msgstr ""
@@ -1628,14 +1953,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1437
+#: code:addons/web/static/src/xml/base.xml:1552
#, python-format
msgid "Mobile support"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:348
+#: code:addons/web/static/src/xml/base.xml:355
#, python-format
msgid "Modified by :"
msgstr ""
@@ -1650,64 +1975,58 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/filters_menu.js:53
-#: code:addons/web/static/src/xml/base.xml:550
-#: code:addons/web/static/src/xml/web_calendar.xml:74
+#: code:addons/web/static/src/xml/base.xml:557
+#: code:addons/web/static/src/xml/web_calendar.xml:82
#, python-format
msgid "Month"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form/form_renderer.js:364
-#: code:addons/web/static/src/xml/base.xml:878
+#: code:addons/web/static/src/js/views/form/form_renderer.js:387
+#: code:addons/web/static/src/xml/base.xml:890
#, python-format
msgid "More"
msgstr ""
#. module: web
-#: model:ir.ui.view,arch_db:web.menu
-msgid "More <b class=\"caret\"/>"
-msgstr ""
-
-#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1282
+#: code:addons/web/static/src/xml/base.xml:1397
#, python-format
msgid "Move Down"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1281
+#: code:addons/web/static/src/xml/base.xml:1396
#, python-format
msgid "Move Up"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1417
+#: code:addons/web/static/src/xml/base.xml:1532
#, python-format
msgid "My Odoo.com account"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:627
+#: code:addons/web/static/src/xml/base.xml:631
#, python-format
msgid "NONE"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1336
+#: code:addons/web/static/src/xml/base.xml:1452
#, python-format
msgid "Name:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/basic/basic_model.js:582
+#: code:addons/web/static/src/js/views/basic/basic_model.js:681
#, python-format
msgid "New"
msgstr ""
@@ -1721,66 +2040,90 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1436
+#: code:addons/web/static/src/xml/base.xml:1551
#, python-format
msgid "New design"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/search_inputs.js:333
+#: code:addons/web/static/src/xml/base.xml:1487
+#: code:addons/web/static/src/xml/base.xml:1488
+#: code:addons/web/static/src/xml/web_calendar.xml:77
+#, python-format
+msgid "Next"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/search/search_inputs.js:338
#, python-format
msgid "No"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:289
+#: code:addons/web/static/src/xml/base.xml:291
#, python-format
msgid "No Update:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_renderer.js:98
-#: code:addons/web/static/src/xml/base.xml:567
+#: code:addons/web/static/src/js/views/kanban/kanban_record.js:21
+#: code:addons/web/static/src/xml/kanban.xml:80
+#, python-format
+msgid "No color"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:99
+#: code:addons/web/static/src/xml/base.xml:572
#, python-format
msgid "No data to display"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:356
+#: code:addons/web/static/src/js/widgets/debug_manager.js:357
#, python-format
msgid "No metadata available"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:254
+#: code:addons/web/static/src/js/fields/field_utils.js:269
#, python-format
msgid "No records"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:444
+#: code:addons/web/static/src/js/fields/relational_fields.js:453
#, python-format
msgid "No results to show..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:617
+#: code:addons/web/static/src/xml/base.xml:621
#, python-format
msgid "None"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_renderer.js:269
+#: code:addons/web/static/src/xml/base.xml:910
+#, python-format
+msgid "Not active state"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:914
#, python-format
-msgid "Not enough data points"
+msgid "Not active state, click to change it"
msgstr ""
#. module: web
@@ -1793,7 +2136,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/core/dialog.js:56
+#: code:addons/web/static/src/js/core/dialog.js:59
#, python-format
msgid "Odoo"
msgstr ""
@@ -1807,9 +2150,9 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:191
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:199
-#: code:addons/web/static/src/js/services/crash_manager.js:157
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:193
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:201
+#: code:addons/web/static/src/js/services/crash_manager.js:153
#, python-format
msgid "Odoo Client Error"
msgstr ""
@@ -1823,41 +2166,41 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/services/crash_manager.js:119
+#: code:addons/web/static/src/js/services/crash_manager.js:115
#, python-format
msgid "Odoo Error"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/services/crash_manager.js:59
+#: code:addons/web/static/src/js/services/crash_manager.js:212
#, python-format
msgid "Odoo Session Expired"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/services/crash_manager.js:109
-#: code:addons/web/static/src/js/services/crash_manager.js:198
+#: code:addons/web/static/src/js/services/crash_manager.js:105
+#: code:addons/web/static/src/js/services/crash_manager.js:194
#, python-format
msgid "Odoo Warning"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1758
+#: code:addons/web/static/src/js/fields/basic_fields.js:1996
#, python-format
msgid "Off"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/core/dialog.js:60
-#: code:addons/web/static/src/js/core/dialog.js:283
-#: code:addons/web/static/src/js/core/dialog.js:301
-#: code:addons/web/static/src/js/core/dialog.js:352
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:293
-#: code:addons/web/static/src/xml/base.xml:1309
+#: code:addons/web/static/src/js/core/dialog.js:64
+#: code:addons/web/static/src/js/core/dialog.js:304
+#: code:addons/web/static/src/js/core/dialog.js:323
+#: code:addons/web/static/src/js/core/dialog.js:375
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:298
+#: code:addons/web/static/src/xml/base.xml:1425
#, python-format
msgid "Ok"
msgstr ""
@@ -1871,7 +2214,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1757
+#: code:addons/web/static/src/js/fields/basic_fields.js:1995
#, python-format
msgid "On"
msgstr ""
@@ -1885,56 +2228,65 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:2004
+#: code:addons/web/static/src/js/fields/basic_fields.js:2219
#, python-format
msgid "Only Integer Value should be valid."
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:494
+#: code:addons/web/controllers/main.py:500
#, python-format
msgid "Only employee can access this database. Please contact the administrator."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:477
+#: code:addons/web/static/src/xml/base.xml:484
#, python-format
msgid "Only you"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1750
+#: code:addons/web/static/src/js/fields/basic_fields.js:1988
#, python-format
msgid "Open"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:216
+#: code:addons/web/static/src/xml/base.xml:231
#, python-format
msgid "Open Developer Tools"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:225
+#: code:addons/web/static/src/xml/base.xml:240
#, python-format
msgid "Open View"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:543
+#: code:addons/web/static/src/js/fields/relational_fields.js:552
#: code:addons/web/static/src/js/views/calendar/calendar_controller.js:323
-#: code:addons/web/static/src/js/views/form/form_controller.js:606
-#: code:addons/web/static/src/js/views/form/form_controller.js:626
+#: code:addons/web/static/src/js/views/form/form_controller.js:610
+#: code:addons/web/static/src/js/views/form/form_controller.js:632
#, python-format
msgid "Open: "
msgstr ""
#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/kanban/kanban_record.js:23
+#: code:addons/web/static/src/xml/base.xml:848
+#: code:addons/web/static/src/xml/kanban.xml:82
+#, python-format
+msgid "Orange"
+msgstr ""
+
+#. module: web
#: model:ir.ui.view,arch_db:web.external_layout_background
msgid "Page:\n"
" <span class=\"page\"/>\n"
@@ -1960,21 +2312,28 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:507
+#: code:addons/web/static/src/js/widgets/colorpicker.js:32
+#, python-format
+msgid "Pick a color"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:514
#, python-format
msgid "Pie Chart"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_renderer.js:231
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:256
#, python-format
msgid "Pie chart cannot display all zero numbers.. Try to change your domain to display positive results"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_renderer.js:223
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:248
#, python-format
msgid "Pie chart cannot mix positive and negative numbers. Try to change your domain to only display positive results"
msgstr ""
@@ -1988,49 +2347,35 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list/list_renderer.js:337
+#: code:addons/web/static/src/js/views/list/list_renderer.js:352
#, python-format
msgid "Please click on the \"save\" button first."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/data_export.js:168
+#: code:addons/web/static/src/js/widgets/data_export.js:177
#, python-format
msgid "Please enter save field list name"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1297
-#, python-format
-msgid "Please note that only the selected ids will be exported."
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1296
-#, python-format
-msgid "Please pay attention that all records matching your search filter will be exported. Not only the selected ids."
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/widgets/data_export.js:455
+#: code:addons/web/static/src/js/widgets/data_export.js:478
#, python-format
msgid "Please select fields to export..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/data_export.js:441
+#: code:addons/web/static/src/js/widgets/data_export.js:464
#, python-format
msgid "Please select fields to save export list..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1392
+#: code:addons/web/static/src/xml/base.xml:1507
#, python-format
msgid "Please update translations of :"
msgstr ""
@@ -2054,7 +2399,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1416
+#: code:addons/web/static/src/xml/base.xml:1531
#, python-format
msgid "Preferences"
msgstr ""
@@ -2070,6 +2415,38 @@ msgid "Preview Internal Report"
msgstr ""
#. module: web
+#: model:ir.model.fields,field_description:web.field_report_layout__image
+msgid "Preview image src"
+msgstr ""
+
+#. module: web
+#: model:ir.model.fields,field_description:web.field_report_layout__pdf
+msgid "Preview pdf src"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:738
+#: code:addons/web/static/src/xml/web_calendar.xml:75
+#, python-format
+msgid "Previous"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/search/time_range_menu_options.js:24
+#, python-format
+msgid "Previous Period"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/search/time_range_menu_options.js:25
+#, python-format
+msgid "Previous Year"
+msgstr ""
+
+#. module: web
#. openerp-web
#: code:addons/web/static/src/js/chrome/sidebar.js:33
#: code:addons/web/static/src/xml/report.xml:11
@@ -2079,27 +2456,60 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:551
+#: code:addons/web/static/src/js/views/kanban/kanban_record.js:32
+#: code:addons/web/static/src/xml/base.xml:857
+#: code:addons/web/static/src/xml/kanban.xml:91
+#, python-format
+msgid "Purple"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:558
#, python-format
msgid "Quarter"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:233
+#: code:addons/web/static/src/xml/kanban.xml:32
+#, python-format
+msgid "Quick add"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/kanban/kanban_record.js:22
+#: code:addons/web/static/src/xml/base.xml:847
+#: code:addons/web/static/src/xml/colorpicker.xml:24
+#: code:addons/web/static/src/xml/kanban.xml:81
+#, python-format
+msgid "Red"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:248
#, python-format
msgid "Regenerate Assets Bundles"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/model_field_selector.js:455
+#: code:addons/web/static/src/js/widgets/model_field_selector.js:467
#, python-format
msgid "Relation not allowed"
msgstr ""
#. module: web
#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:768
+#, python-format
+msgid "Relation to follow"
+msgstr ""
+
+#. module: web
+#. openerp-web
#: code:addons/web/static/src/xml/base.xml:57
#, python-format
msgid "Relation:"
@@ -2107,74 +2517,106 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1279
+#: code:addons/web/static/src/js/views/view_dialogs.js:157
+#: code:addons/web/static/src/xml/base.xml:1220
+#: code:addons/web/static/src/xml/base.xml:1394
#, python-format
msgid "Remove"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1280
+#: code:addons/web/static/src/xml/base.xml:1395
#, python-format
msgid "Remove All"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1666
+#: code:addons/web/static/src/js/fields/basic_fields.js:1902
#, python-format
msgid "Remove from Favorites"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/web_calendar.xml:57
+#: code:addons/web/static/src/xml/base.xml:693
+#, python-format
+msgid "Remove tag"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/web_calendar.xml:65
#, python-format
msgid "Remove this favorite from the list"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/action_manager_report.js:90
+#: code:addons/web/static/src/js/chrome/action_manager_report.js:113
#, python-format
msgid "Report"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1746
+#: code:addons/web/static/src/js/services/crash_manager.js:223
+#, python-format
+msgid "Request timeout"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/fields/basic_fields.js:1984
#, python-format
msgid "Restore"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:224
+#: code:addons/web/static/src/xml/base.xml:239
#, python-format
msgid "Run JS Mobile Tests"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:223
+#: code:addons/web/static/src/xml/base.xml:238
#, python-format
msgid "Run JS Tests"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1107
+#: code:addons/web/static/src/xml/base.xml:1208
#, python-format
msgid "SEE RESULT"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/view_dialogs.js:125
+#: code:addons/web/static/src/js/views/kanban/kanban_record.js:27
+#: code:addons/web/static/src/xml/base.xml:852
+#: code:addons/web/static/src/xml/kanban.xml:86
+#, python-format
+msgid "Salmon pink"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/colorpicker.xml:42
+#, python-format
+msgid "Saturation %"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/view_dialogs.js:137
#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:28
-#: code:addons/web/static/src/xml/base.xml:380
-#: code:addons/web/static/src/xml/base.xml:402
-#: code:addons/web/static/src/xml/base.xml:1247
+#: code:addons/web/static/src/xml/base.xml:387
+#: code:addons/web/static/src/xml/base.xml:409
+#: code:addons/web/static/src/xml/base.xml:1357
#: code:addons/web/static/src/xml/report.xml:17
#, python-format
msgid "Save"
@@ -2182,86 +2624,93 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/view_dialogs.js:134
+#: code:addons/web/static/src/js/views/view_dialogs.js:146
#, python-format
msgid "Save & New"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1276
+#: code:addons/web/static/src/js/fields/basic_fields.js:1513
#, python-format
msgid "Save As..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1309
+#: code:addons/web/static/src/xml/base.xml:1425
#, python-format
msgid "Save as:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1235
+#: code:addons/web/static/src/xml/base.xml:1340
#, python-format
msgid "Save current search"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:460
+#: code:addons/web/static/src/js/widgets/debug_manager.js:474
#, python-format
msgid "Save default"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1286
+#: code:addons/web/static/src/xml/base.xml:1401
#, python-format
msgid "Save fields list"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1312
+#: code:addons/web/static/src/xml/base.xml:1428
#, python-format
msgid "Saved exports:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/search_inputs.js:361
+#: code:addons/web/static/src/xml/base.xml:1574
+#, python-format
+msgid "Search"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/search/search_inputs.js:366
#, python-format
msgid "Search %(field)s at: %(value)s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/search_inputs.js:194
-#: code:addons/web/static/src/js/views/search/search_inputs.js:213
-#: code:addons/web/static/src/js/views/search/search_inputs.js:402
+#: code:addons/web/static/src/js/views/search/search_inputs.js:199
+#: code:addons/web/static/src/js/views/search/search_inputs.js:218
+#: code:addons/web/static/src/js/views/search/search_inputs.js:407
#, python-format
msgid "Search %(field)s for: %(value)s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:400
+#: code:addons/web/static/src/js/fields/relational_fields.js:409
#, python-format
msgid "Search More..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1112
+#: code:addons/web/static/src/xml/base.xml:1213
#, python-format
msgid "Search..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:467
+#: code:addons/web/static/src/js/fields/relational_fields.js:476
#, python-format
msgid "Search: "
msgstr ""
@@ -2275,23 +2724,23 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/view_dialogs.js:375
-#: code:addons/web/static/src/xml/base.xml:928
-#: code:addons/web/static/src/xml/base.xml:929
-#: code:addons/web/static/src/xml/base.xml:959
-#: code:addons/web/static/src/xml/base.xml:960
+#: code:addons/web/static/src/js/views/view_dialogs.js:410
+#: code:addons/web/static/src/xml/base.xml:961
+#: code:addons/web/static/src/xml/base.xml:962
+#: code:addons/web/static/src/xml/base.xml:992
+#: code:addons/web/static/src/xml/base.xml:993
#, python-format
msgid "Select"
msgstr ""
#. module: web
#: model:ir.ui.view,arch_db:web.login
-msgid "Select <i class=\"fa fa-database\"/>"
+msgid "Select <i class=\"fa fa-database\" role=\"img\" aria-label=\"Database\" title=\"Database\"/>"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:603
+#: code:addons/web/static/src/xml/base.xml:607
#, python-format
msgid "Select a model to add a filter."
msgstr ""
@@ -2305,7 +2754,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:2429
+#: code:addons/web/static/src/js/fields/basic_fields.js:2683
#, python-format
msgid "Selected records"
msgstr ""
@@ -2319,21 +2768,28 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:457
+#: code:addons/web/static/src/js/widgets/debug_manager.js:471
#, python-format
msgid "Set Default"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:262
+#: code:addons/web/static/src/xml/base.xml:266
#, python-format
msgid "Set Defaults"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1244
+#: code:addons/web/static/src/xml/kanban.xml:19
+#, python-format
+msgid "Settings"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1353
#, python-format
msgid "Share with all users"
msgstr ""
@@ -2353,7 +2809,7 @@ msgid "Size:"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:1134
+#: code:addons/web/controllers/main.py:1149
#, python-format
msgid "Something horrible happened"
msgstr ""
@@ -2380,36 +2836,41 @@ msgid "Still loading...<br />Please be patient."
msgstr ""
#. module: web
+#: model:ir.ui.view,arch_db:web.webclient_bootstrap
+msgid "Submenu"
+msgstr ""
+
+#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/web_calendar.xml:88
+#: code:addons/web/static/src/xml/web_calendar.xml:96
#, python-format
msgid "Summary:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1414
+#: code:addons/web/static/src/xml/base.xml:1529
#, python-format
msgid "Support"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1759
+#: code:addons/web/static/src/js/fields/basic_fields.js:1997
#, python-format
msgid "Switch Off"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1760
+#: code:addons/web/static/src/js/fields/basic_fields.js:1998
#, python-format
msgid "Switch On"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/domain_selector.js:567
+#: code:addons/web/static/src/js/widgets/domain_selector.js:569
#, python-format
msgid "Syntax error"
msgstr ""
@@ -2430,7 +2891,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:243
+#: code:addons/web/static/src/xml/base.xml:258
#, python-format
msgid "Technical Translation"
msgstr ""
@@ -2443,22 +2904,22 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/domain_selector.js:521
-#: code:addons/web/static/src/js/widgets/domain_selector.js:567
+#: code:addons/web/static/src/js/widgets/domain_selector.js:523
+#: code:addons/web/static/src/js/widgets/domain_selector.js:569
#, python-format
msgid "The domain you entered is not properly formed"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/model_field_selector.js:394
+#: code:addons/web/static/src/js/widgets/model_field_selector.js:406
#, python-format
msgid "The field chain is not valid. Did you maybe use a non-existing field name or followed a non-relational field?"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1276
+#: code:addons/web/static/src/js/fields/basic_fields.js:1513
#, python-format
msgid "The field is empty, there's nothing to save !"
msgstr ""
@@ -2472,19 +2933,26 @@ msgid "The following fields are invalid:"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:796
+#: code:addons/web/controllers/main.py:805
#, python-format
msgid "The new password and its confirmation must be identical."
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:801
+#: code:addons/web/controllers/main.py:810
#, python-format
msgid "The old password you provided is incorrect, your password was not changed."
msgstr ""
#. module: web
#. openerp-web
+#: code:addons/web/static/src/js/services/crash_manager.js:224
+#, python-format
+msgid "The operation was interrupted. This usually means that the current operation is taking too much time."
+msgstr ""
+
+#. module: web
+#. openerp-web
#: code:addons/web/static/src/js/views/basic/basic_controller.js:75
#, python-format
msgid "The record has been modified, your changes will be discarded. Do you want to proceed?"
@@ -2492,41 +2960,76 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1101
+#: code:addons/web/static/src/js/fields/basic_fields.js:1338
#, python-format
msgid "The selected file exceed the maximum file size of %s."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:1451
+#: code:addons/web/static/src/js/fields/relational_fields.js:1514
#, python-format
msgid "The type of the field '%s' must be a many2many field with a relation to 'ir.attachment' model."
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:1470
+#: code:addons/web/controllers/main.py:1490
#, python-format
msgid "There are too many rows (%s rows, limit: 65535) to export as Excel 97-2003 (.xls) format. Consider splitting the export."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1122
+#: code:addons/web/static/src/js/fields/basic_fields.js:1359
#, python-format
msgid "There was a problem while uploading your file"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/domain_selector.js:459
+#: code:addons/web/static/src/js/views/search/time_range_menu_options.js:10
+#, python-format
+msgid "This Month"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/search/time_range_menu_options.js:11
+#, python-format
+msgid "This Quarter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/search/time_range_menu_options.js:9
+#, python-format
+msgid "This Week"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/search/time_range_menu_options.js:12
+#, python-format
+msgid "This Year"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/widgets/date_picker.js:156
+#, python-format
+msgid "This date is on the future. Make sure it is what you expected."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/widgets/domain_selector.js:461
#, python-format
msgid "This domain is not supported."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/favorites_menu.js:262
+#: code:addons/web/static/src/js/views/search/favorites_menu.js:272
#, python-format
msgid "This filter is global and will be removed for everybody if you continue."
msgstr ""
@@ -2543,10 +3046,17 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1253
+#: code:addons/web/static/src/js/views/search/search_view.js:1039
+#: code:addons/web/static/src/js/views/search/time_range_menu.js:115
+#, python-format
+msgid "Time Range"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1126
#, python-format
-msgid "This wizard will export all data that matches the current search criteria to a CSV file.\n"
-" You can export all data or only the fields that can be reimported after modification."
+msgid "Time Ranges"
msgstr ""
#. module: web
@@ -2558,29 +3068,31 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/web_calendar.xml:68
+#: code:addons/web/static/src/js/views/search/time_range_menu_options.js:8
+#: code:addons/web/static/src/xml/web_calendar.xml:76
+#: code:addons/web/static/src/xml/web_calendar.xml:89
#, python-format
msgid "Today"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:228
+#: code:addons/web/static/src/xml/base.xml:243
#, python-format
msgid "Toggle Timelines"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/pivot/pivot_model.js:473
-#: code:addons/web/static/src/js/views/pivot/pivot_model.js:589
+#: code:addons/web/static/src/js/views/pivot/pivot_model.js:617
+#: code:addons/web/static/src/js/views/pivot/pivot_model.js:765
#, python-format
msgid "Total"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:201
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:203
#, python-format
msgid "Traceback:"
msgstr ""
@@ -2594,7 +3106,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:569
+#: code:addons/web/static/src/xml/base.xml:574
#, python-format
msgid "Try to add some records, or make sure\n"
" that there is at least one measure and no active filter in the search bar."
@@ -2602,14 +3114,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_renderer.js:99
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:100
#, python-format
msgid "Try to add some records, or make sure that there is no active filter in the search bar."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:328
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:330
#, python-format
msgid "Trying to reconnect..."
msgstr ""
@@ -2637,7 +3149,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/kanban.xml:27
+#: code:addons/web/static/src/xml/kanban.xml:28
#, python-format
msgid "Unarchive All"
msgstr ""
@@ -2645,34 +3157,41 @@ msgstr ""
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/views/calendar/calendar_model.js:578
-#: code:addons/web/static/src/js/views/graph/graph_model.js:205
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:74
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:77
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:461
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:75
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:78
#: code:addons/web/static/src/js/views/kanban/kanban_renderer_mobile.js:182
-#: code:addons/web/static/src/js/views/list/list_renderer.js:428
-#: code:addons/web/static/src/js/views/list/list_renderer.js:431
-#: code:addons/web/static/src/js/views/pivot/pivot_model.js:727
+#: code:addons/web/static/src/js/views/list/list_renderer.js:435
+#: code:addons/web/static/src/js/views/list/list_renderer.js:438
+#: code:addons/web/static/src/js/views/pivot/pivot_model.js:1034
#, python-format
msgid "Undefined"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:192
+#: code:addons/web/static/src/xml/kanban.xml:17
+#, python-format
+msgid "Unfold"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:194
#, python-format
msgid "Unknown CORS error"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/core/pyeval.js:1001
+#: code:addons/web/static/src/js/core/py_utils.js:299
#, python-format
msgid "Unknown nonliteral type "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list/list_editable_renderer.js:513
+#: code:addons/web/static/src/js/views/list/list_editable_renderer.js:556
#, python-format
msgid "Unlink row "
msgstr ""
@@ -2693,6 +3212,13 @@ msgstr ""
#. module: web
#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1375
+#, python-format
+msgid "Update data (import-compatible export)"
+msgstr ""
+
+#. module: web
+#. openerp-web
#: code:addons/web/static/src/js/fields/upgrade_fields.js:69
#, python-format
msgid "Upgrade now"
@@ -2700,45 +3226,66 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1438
+#: code:addons/web/static/src/xml/base.xml:1559
+#, python-format
+msgid "Upgrade to enterprise"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1553
#, python-format
msgid "Upgrade to future versions"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:928
-#: code:addons/web/static/src/xml/base.xml:959
+#: code:addons/web/static/src/xml/base.xml:961
+#: code:addons/web/static/src/xml/base.xml:992
#, python-format
msgid "Upload your file"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:1611
+#: code:addons/web/static/src/js/fields/relational_fields.js:1678
#, python-format
msgid "Uploading Error"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:903
-#: code:addons/web/static/src/xml/base.xml:932
-#: code:addons/web/static/src/xml/base.xml:958
-#: code:addons/web/static/src/xml/base.xml:1013
+#: code:addons/web/static/src/xml/base.xml:925
+#: code:addons/web/static/src/xml/base.xml:965
+#: code:addons/web/static/src/xml/base.xml:991
+#: code:addons/web/static/src/xml/base.xml:1047
#, python-format
msgid "Uploading..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1241
+#: code:addons/web/static/src/xml/base.xml:1347
#, python-format
msgid "Use by default"
msgstr ""
#. module: web
#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1369
+#, python-format
+msgid "Use data in a spreadsheet (export all data)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1353
+#, python-format
+msgid "Users"
+msgstr ""
+
+#. module: web
+#. openerp-web
#: code:addons/web/static/src/js/services/crash_manager.js:17
#, python-format
msgid "Validation Error"
@@ -2746,26 +3293,28 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:241
+#: code:addons/web/static/src/js/widgets/debug_manager.js:283
+#: code:addons/web/static/src/xml/base.xml:256
#, python-format
msgid "View Fields"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:264
+#: code:addons/web/static/src/xml/base.xml:268
#, python-format
msgid "View Metadata"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/action_manager.js:560
-#: code:addons/web/static/src/js/chrome/action_manager_report.js:68
+#: code:addons/web/static/src/js/chrome/action_manager.js:579
+#: code:addons/web/static/src/js/chrome/action_manager_report.js:69
#: code:addons/web/static/src/js/services/crash_manager.js:13
#: code:addons/web/static/src/js/services/crash_manager.js:14
#: code:addons/web/static/src/js/views/basic/basic_controller.js:78
-#: code:addons/web/static/src/js/views/list/list_renderer.js:337
+#: code:addons/web/static/src/js/views/list/list_renderer.js:352
+#: code:addons/web/static/src/xml/base.xml:603
#, python-format
msgid "Warning"
msgstr ""
@@ -2800,58 +3349,72 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/filters_menu.js:52
-#: code:addons/web/static/src/xml/base.xml:549
-#: code:addons/web/static/src/xml/web_calendar.xml:73
+#: code:addons/web/static/src/xml/base.xml:556
+#: code:addons/web/static/src/xml/web_calendar.xml:81
#, python-format
msgid "Week"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/rainbow_man.js:43
+#: code:addons/web/static/src/js/widgets/rainbow_man.js:37
#, python-format
msgid "Well Done!"
msgstr ""
#. module: web
#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1365
+#, python-format
+msgid "What do you want to do?"
+msgstr ""
+
+#. module: web
+#. openerp-web
#: code:addons/web/static/src/xml/base.xml:29
#, python-format
msgid "Widget:"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:491
+#: code:addons/web/controllers/main.py:495
#, python-format
msgid "Wrong login/password"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:2004
+#: code:addons/web/static/src/js/fields/basic_fields.js:2219
#, python-format
msgid "Wrong value entered!"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:285
+#: code:addons/web/static/src/xml/base.xml:287
#, python-format
msgid "XML ID:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/filters_menu.js:54
-#: code:addons/web/static/src/xml/base.xml:552
+#: code:addons/web/static/src/xml/base.xml:559
#, python-format
msgid "Year"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/search_inputs.js:332
+#: code:addons/web/static/src/js/views/kanban/kanban_record.js:24
+#: code:addons/web/static/src/xml/base.xml:849
+#: code:addons/web/static/src/xml/kanban.xml:83
+#, python-format
+msgid "Yellow"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/search/search_inputs.js:337
#: code:addons/web/static/src/xml/base.xml:49
#, python-format
msgid "Yes"
@@ -2859,7 +3422,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:342
+#: code:addons/web/static/src/js/views/search/time_range_menu_options.js:13
+#, python-format
+msgid "Yesterday"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:344
#, python-format
msgid "You are back online"
msgstr ""
@@ -2873,13 +3443,13 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/model_field_selector.js:455
+#: code:addons/web/static/src/js/widgets/model_field_selector.js:467
#, python-format
msgid "You cannot follow relations for this field chain construction"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:794
+#: code:addons/web/controllers/main.py:803
#, python-format
msgid "You cannot leave any password empty."
msgstr ""
@@ -2907,7 +3477,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/services/crash_manager.js:59
+#: code:addons/web/static/src/js/services/crash_manager.js:212
#, python-format
msgid "Your Odoo session expired. Please refresh the current web page."
msgstr ""
@@ -2921,7 +3491,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/kanban/kanban_record.js:199
+#: code:addons/web/static/src/js/views/kanban/kanban_record.js:239
#, python-format
msgid "[No widget %s]"
msgstr ""
@@ -2963,7 +3533,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:632
+#: code:addons/web/static/src/xml/base.xml:636
#, python-format
msgid "all records"
msgstr ""
@@ -3034,8 +3604,8 @@ msgstr ""
#. openerp-web
#: code:addons/web/static/src/js/views/search/search_filters.js:296
#: code:addons/web/static/src/js/views/search/search_filters.js:331
-#: code:addons/web/static/src/js/widgets/domain_selector.js:847
-#: code:addons/web/static/src/xml/base.xml:720
+#: code:addons/web/static/src/js/widgets/domain_selector.js:849
+#: code:addons/web/static/src/xml/base.xml:724
#, python-format
msgid "is"
msgstr ""
@@ -3081,7 +3651,7 @@ msgstr ""
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/views/search/search_filters.js:332
-#: code:addons/web/static/src/js/widgets/domain_selector.js:848
+#: code:addons/web/static/src/js/widgets/domain_selector.js:850
#, python-format
msgid "is not"
msgstr ""
@@ -3136,7 +3706,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/core/utils.js:127
+#: code:addons/web/static/src/js/core/utils.js:113
#, python-format
msgid "kMGTPE"
msgstr ""
@@ -3166,21 +3736,21 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:722
+#: code:addons/web/static/src/xml/base.xml:726
#, python-format
msgid "not"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/search_inputs.js:232
+#: code:addons/web/static/src/js/views/search/search_inputs.js:237
#, python-format
msgid "not a valid integer"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search/search_inputs.js:247
+#: code:addons/web/static/src/js/views/search/search_inputs.js:252
#, python-format
msgid "not a valid number"
msgstr ""
@@ -3194,29 +3764,29 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/domain_selector.js:658
+#: code:addons/web/static/src/js/widgets/domain_selector.js:660
#, python-format
msgid "not set (false)"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:641
+#: code:addons/web/static/src/xml/base.xml:645
#, python-format
msgid "of the following rules:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:656
+#: code:addons/web/static/src/xml/base.xml:660
#, python-format
msgid "of:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:713
-#: code:addons/web/static/src/xml/base.xml:1196
+#: code:addons/web/static/src/xml/base.xml:717
+#: code:addons/web/static/src/xml/base.xml:1302
#, python-format
msgid "or"
msgstr ""
@@ -3230,28 +3800,33 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:597
+#: code:addons/web/static/src/xml/base.xml:601
#, python-format
msgid "record(s)"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/kanban.xml:41
+#: code:addons/web/static/src/xml/kanban.xml:42
#, python-format
msgid "remaining)"
msgstr ""
#. module: web
+#: model:ir.model,name:web.model_report_layout
+msgid "report.layout"
+msgstr ""
+
+#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:722
+#: code:addons/web/static/src/xml/base.xml:726
#, python-format
msgid "set"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/domain_selector.js:658
+#: code:addons/web/static/src/js/widgets/domain_selector.js:660
#, python-format
msgid "set (true)"
msgstr ""
diff --git a/addons/web_editor/i18n/web_editor.pot b/addons/web_editor/i18n/web_editor.pot
index c32a8e0ef6b..d6a9fb933e3 100644
--- a/addons/web_editor/i18n/web_editor.pot
+++ b/addons/web_editor/i18n/web_editor.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,49 +17,19 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:193
+#: code:addons/web_editor/static/src/xml/editor.xml:189
#, python-format
msgid "(URL or Embed)"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:963
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1025
#, python-format
msgid "(YouTube, Vimeo, Vine, Instagram, DailyMotion or Youku)"
msgstr ""
#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "25% Black"
-msgstr ""
-
-#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "25% White"
-msgstr ""
-
-#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "50% Black"
-msgstr ""
-
-#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "50% White"
-msgstr ""
-
-#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "75% Black"
-msgstr ""
-
-#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "75% White"
-msgstr ""
-
-#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.snippets
msgid "<i class=\"fa fa-th-large\"/> First Panel"
msgstr ""
@@ -73,28 +43,28 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:198
+#: code:addons/web_editor/static/src/xml/editor.xml:194
#, python-format
msgid "Accepts"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1015
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1075
#, python-format
msgid "Action"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:113
+#: code:addons/web_editor/static/src/xml/editor.xml:106
#, python-format
msgid "Add"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:110
+#: code:addons/web_editor/static/src/xml/editor.xml:102
#, python-format
msgid "Add an image URL"
msgstr ""
@@ -106,47 +76,42 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:997
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1060
#, python-format
msgid "Align center"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:996
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1059
#, python-format
msgid "Align left"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:998
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1061
#, python-format
msgid "Align right"
msgstr ""
#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Alpha"
-msgstr ""
-
-#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:99
+#: code:addons/web_editor/static/src/xml/editor.xml:95
#, python-format
msgid "Alternate Upload"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:318
+#: code:addons/web_editor/static/src/xml/editor.xml:326
#, python-format
msgid "Aspect Ratio"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:357
+#: code:addons/web_editor/static/src/xml/editor.xml:365
#, python-format
msgid "Assign a focal point that will always be visible"
msgstr ""
@@ -158,14 +123,21 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:204
+#: code:addons/web_editor/static/src/xml/editor.xml:191
+#, python-format
+msgid "Attention"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:200
#, python-format
msgid "Autoplay"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1004
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1066
#: code:addons/web_editor/static/src/xml/snippets.xml:28
#, python-format
msgid "Background Color"
@@ -173,57 +145,47 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/snippets.options.js:950
+#: code:addons/web_editor/static/src/js/editor/snippets.options.js:947
#, python-format
msgid "Background Image Sizing"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:396
+#: code:addons/web_editor/static/src/xml/editor.xml:406
#, python-format
msgid "Background height"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:406
+#: code:addons/web_editor/static/src/xml/editor.xml:418
#, python-format
msgid "Background position"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:428
+#: code:addons/web_editor/static/src/xml/editor.xml:444
#, python-format
msgid "Background repeat"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:384
+#: code:addons/web_editor/static/src/xml/editor.xml:392
#, python-format
msgid "Background size"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:387
+#: code:addons/web_editor/static/src/xml/editor.xml:395
#, python-format
msgid "Background width"
msgstr ""
#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Beta"
-msgstr ""
-
-#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Black"
-msgstr ""
-
-#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/snippets.editor.js:255
#, python-format
@@ -232,7 +194,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:924
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:986
#, python-format
msgid "Bold"
msgstr ""
@@ -246,7 +208,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:96
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:133
#, python-format
msgid "Center"
msgstr ""
@@ -260,31 +222,38 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1013
-#: code:addons/web_editor/static/src/js/editor/translator.js:52
-#: code:addons/web_editor/static/src/js/widgets/widgets.js:1604
-#: code:addons/web_editor/static/src/xml/ace.xml:30
+#: code:addons/web_editor/static/src/xml/editor.xml:191
+#, python-format
+msgid "Checked"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1073
+#: code:addons/web_editor/static/src/js/editor/translator.js:56
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:1615
+#: code:addons/web_editor/static/src/xml/ace.xml:36
#, python-format
msgid "Close"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:975
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1037
#, python-format
msgid "Code"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:990
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1053
#, python-format
msgid "Code View"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:265
+#: code:addons/web_editor/static/src/xml/editor.xml:273
#, python-format
msgid "Color"
msgstr ""
@@ -298,14 +267,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:62
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:79
#, python-format
msgid "Common colors"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:352
+#: code:addons/web_editor/static/src/xml/editor.xml:360
#, python-format
msgid "Contain"
msgstr ""
@@ -319,14 +288,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:194
+#: code:addons/web_editor/static/src/xml/editor.xml:190
#, python-format
msgid "Copy-paste your URL or embed code here"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:351
+#: code:addons/web_editor/static/src/xml/editor.xml:359
#, python-format
msgid "Cover"
msgstr ""
@@ -343,60 +312,58 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:161
-#: code:addons/web_editor/static/src/js/widgets/widgets.js:1602
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:198
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:1613
#, python-format
msgid "Crop Image"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:353
+#: code:addons/web_editor/static/src/xml/editor.xml:361
#, python-format
msgid "Custom"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:15
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1065
#, python-format
-msgid "Customize"
+msgid "Custom Color"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:198
+#: code:addons/web_editor/static/src/xml/snippets.xml:15
#, python-format
-msgid "Dailymotion"
+msgid "Customize"
msgstr ""
#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Danger"
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:194
+#, python-format
+msgid "Dailymotion"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/summernote.js:2008
+#: code:addons/web_editor/static/src/js/editor/summernote.js:2007
+#: code:addons/web_editor/static/src/xml/editor.xml:264
#, python-format
msgid "Default"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:429
+#: code:addons/web_editor/static/src/xml/editor.xml:445
#, python-format
msgid "Define if/how the background image will be repeated"
msgstr ""
#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Delta"
-msgstr ""
-
-#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:171
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:208
#, python-format
msgid "Description"
msgstr ""
@@ -410,11 +377,11 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/snippets.options.js:954
+#: code:addons/web_editor/static/src/js/editor/snippets.options.js:951
#: code:addons/web_editor/static/src/js/widgets/widgets.js:38
-#: code:addons/web_editor/static/src/js/widgets/widgets.js:1611
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:1622
#: code:addons/web_editor/static/src/xml/editor.xml:12
-#: code:addons/web_editor/static/src/xml/editor.xml:137
+#: code:addons/web_editor/static/src/xml/editor.xml:132
#, python-format
msgid "Discard"
msgstr ""
@@ -433,21 +400,21 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1017
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1077
#, python-format
msgid "Document Style"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:901
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:963
#, python-format
msgid "Double-click to edit"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:944
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1006
#, python-format
msgid "Drag an image here"
msgstr ""
@@ -468,18 +435,13 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:152
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:953
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:189
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1015
#, python-format
msgid "Edit"
msgstr ""
#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Epsilon"
-msgstr ""
-
-#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/widgets/ace.js:97
#, python-format
@@ -488,123 +450,107 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:257
+#: code:addons/web_editor/static/src/xml/editor.xml:253
#, python-format
msgid "Extra Small"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:936
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:998
#, python-format
msgid "File / Image"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:335
+#: code:addons/web_editor/static/src/xml/editor.xml:268
+#, python-format
+msgid "Flat"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:343
#, python-format
msgid "Flip Horizontal"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:336
+#: code:addons/web_editor/static/src/xml/editor.xml:344
#, python-format
msgid "Flip Vertical"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:941
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1003
#, python-format
msgid "Float Left"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:943
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1005
#, python-format
msgid "Float None"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:942
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1004
#, python-format
msgid "Float Right"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1005
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1067
#, python-format
msgid "Font Color"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:932
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:994
#, python-format
msgid "Font Family"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:933
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:995
#, python-format
msgid "Font Size"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/ace.xml:37
+#: code:addons/web_editor/static/src/xml/ace.xml:43
#, python-format
msgid "Format"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/widgets/widgets.js:1588
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:1599
#, python-format
msgid "Free"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:989
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1052
#, python-format
msgid "Full Screen"
msgstr ""
#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Gamma"
-msgstr ""
-
-#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Gray"
-msgstr ""
-
-#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Gray Dark"
-msgstr ""
-
-#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Gray Darker"
-msgstr ""
-
-#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Gray Light"
-msgstr ""
-
-#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Gray Lighter"
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/backend.xml:21
+#, python-format
+msgid "Fullscreen"
msgstr ""
#. module: web_editor
@@ -614,49 +560,49 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:976
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1039
#, python-format
msgid "Header 1"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:977
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1040
#, python-format
msgid "Header 2"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:978
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1041
#, python-format
msgid "Header 3"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:979
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1042
#, python-format
msgid "Header 4"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:980
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1043
#, python-format
msgid "Header 5"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:981
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1044
#, python-format
msgid "Header 6"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:988
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1051
#, python-format
msgid "Help"
msgstr ""
@@ -670,42 +616,42 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:219
+#: code:addons/web_editor/static/src/xml/editor.xml:215
#, python-format
msgid "Hide Dailymotion logo"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:216
+#: code:addons/web_editor/static/src/xml/editor.xml:212
#, python-format
msgid "Hide Youtube logo"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:213
+#: code:addons/web_editor/static/src/xml/editor.xml:209
#, python-format
msgid "Hide fullscreen button"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:210
+#: code:addons/web_editor/static/src/xml/editor.xml:206
#, python-format
msgid "Hide player controls"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:222
+#: code:addons/web_editor/static/src/xml/editor.xml:218
#, python-format
msgid "Hide sharing button"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:409
+#: code:addons/web_editor/static/src/xml/editor.xml:421
#, python-format
msgid "Horizontal"
msgstr ""
@@ -717,7 +663,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/editor.js:125
+#: code:addons/web_editor/static/src/js/editor/editor.js:126
#, python-format
msgid "If you discard the current edition, all unsaved changes will be lost. You can cancel to return to the edition mode."
msgstr ""
@@ -731,7 +677,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:309
+#: code:addons/web_editor/static/src/xml/editor.xml:317
#, python-format
msgid "If you want to crop it, please first download it from the original source and upload it in Odoo."
msgstr ""
@@ -745,7 +691,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:946
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1008
#, python-format
msgid "Image URL"
msgstr ""
@@ -760,97 +706,92 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/ace.xml:23
+#: code:addons/web_editor/static/src/xml/ace.xml:31
#, python-format
msgid "Include All SCSS Files"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/ace.xml:17
+#: code:addons/web_editor/static/src/xml/ace.xml:22
#, python-format
msgid "Include Asset Bundles"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:995
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1058
#, python-format
msgid "Indent"
msgstr ""
#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Info"
-msgstr ""
-
-#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:969
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1031
#, python-format
msgid "Insert Horizontal Rule"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:937
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:999
#, python-format
msgid "Insert Image"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:951
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1013
#, python-format
msgid "Insert Link"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:961
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1023
#, python-format
msgid "Insert Video"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:198
+#: code:addons/web_editor/static/src/xml/editor.xml:194
#, python-format
msgid "Instagram"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/snippets.editor.js:1058
+#: code:addons/web_editor/static/src/js/editor/snippets.editor.js:1064
#, python-format
msgid "Install"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:925
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:987
#, python-format
msgid "Italic"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:999
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1062
#, python-format
msgid "Justify full"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1012
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1072
#, python-format
msgid "Keyboard shortcuts"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:110
-#: code:addons/web_editor/static/src/xml/editor.xml:260
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:147
+#: code:addons/web_editor/static/src/xml/editor.xml:256
#, python-format
msgid "Large"
msgstr ""
@@ -872,76 +813,70 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:931
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:993
#, python-format
msgid "Line Height"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:950
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1012
#, python-format
msgid "Link"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:242
+#: code:addons/web_editor/static/src/xml/editor.xml:238
#, python-format
msgid "Link Label"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/widgets/widgets.js:1340
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:1346
#, python-format
msgid "Link to"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:207
+#: code:addons/web_editor/static/src/xml/editor.xml:203
#, python-format
msgid "Loop"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:109
-#: code:addons/web_editor/static/src/xml/editor.xml:259
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:146
+#: code:addons/web_editor/static/src/xml/editor.xml:255
#, python-format
msgid "Medium"
msgstr ""
#. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1003
-#, python-format
-msgid "More Color"
-msgstr ""
-
-#. module: web_editor
#: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub__name
msgid "Name"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:60
+#: code:addons/web_editor/static/src/xml/editor.xml:63
#, python-format
msgid "Next"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:431
+#: code:addons/web_editor/static/src/xml/editor.xml:447
#, python-format
msgid "No repeat"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:107
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:144
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1069
#: code:addons/web_editor/static/src/xml/snippets.xml:30
#, python-format
msgid "None"
@@ -949,72 +884,86 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:973
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1035
#, python-format
msgid "Normal"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/snippets.options.js:953
-#: code:addons/web_editor/static/src/js/editor/translator.js:94
+#: code:addons/web_editor/static/src/js/editor/snippets.options.js:950
+#: code:addons/web_editor/static/src/js/editor/translator.js:98
#, python-format
msgid "Ok"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/translator.js:93
+#: code:addons/web_editor/static/src/js/editor/translator.js:97
#, python-format
msgid "Ok, never show me this again"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:956
-#: code:addons/web_editor/static/src/xml/editor.xml:286
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1018
+#: code:addons/web_editor/static/src/xml/editor.xml:294
#, python-format
msgid "Open in new window"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:201
+#: code:addons/web_editor/static/src/xml/editor.xml:197
#, python-format
msgid "Options"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:985
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1048
#, python-format
msgid "Ordered list"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:994
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1057
#, python-format
msgid "Outdent"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:114
+#: code:addons/web_editor/static/src/xml/editor.xml:265
+#, python-format
+msgid "Outline"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:267
+#, python-format
+msgid "Outline-Rounded"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:151
#, python-format
msgid "Padding"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:993
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1056
#, python-format
msgid "Paragraph"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1016
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1076
#, python-format
msgid "Paragraph formatting"
msgstr ""
@@ -1028,27 +977,23 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:228
-#: code:addons/web_editor/static/src/xml/editor.xml:294
+#: code:addons/web_editor/static/src/xml/editor.xml:224
+#: code:addons/web_editor/static/src/xml/editor.xml:302
+#: code:addons/web_editor/static/src/xml/editor.xml:304
#, python-format
msgid "Preview"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:57
+#: code:addons/web_editor/static/src/xml/editor.xml:62
#, python-format
msgid "Previous"
msgstr ""
#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Primary"
-msgstr ""
-
-#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:974
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1036
#, python-format
msgid "Quote"
msgstr ""
@@ -1062,21 +1007,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1002
-#, python-format
-msgid "Recent Color"
-msgstr ""
-
-#. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1021
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1081
#, python-format
msgid "Redo"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:156
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:193
#, python-format
msgid "Remove"
msgstr ""
@@ -1090,70 +1028,62 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:930
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:992
#, python-format
msgid "Remove Font Style"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:947
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1009
#, python-format
msgid "Remove Image"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:371
+#: code:addons/web_editor/static/src/xml/editor.xml:379
#, python-format
msgid "Repeat"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:432
+#: code:addons/web_editor/static/src/xml/editor.xml:448
#, python-format
msgid "Repeat both"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:433
+#: code:addons/web_editor/static/src/xml/editor.xml:449
#, python-format
msgid "Repeat x"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:434
+#: code:addons/web_editor/static/src/xml/editor.xml:450
#, python-format
msgid "Repeat y"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1008
-#: code:addons/web_editor/static/src/xml/ace.xml:36
+#: code:addons/web_editor/static/src/xml/ace.xml:42
#, python-format
msgid "Reset"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:339
+#: code:addons/web_editor/static/src/xml/editor.xml:347
#, python-format
msgid "Reset Image"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1009
-#, python-format
-msgid "Reset to default"
-msgstr ""
-
-#. module: web_editor
-#. openerp-web
#: code:addons/web_editor/static/src/js/widgets/ace.js:490
#, python-format
msgid "Reseting views is not supported yet"
@@ -1161,41 +1091,48 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:938
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1000
#, python-format
msgid "Resize Full"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:939
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1001
#, python-format
msgid "Resize Half"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:940
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1002
#, python-format
msgid "Resize Quarter"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:331
+#: code:addons/web_editor/static/src/xml/editor.xml:339
#, python-format
msgid "Rotate Left"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:332
+#: code:addons/web_editor/static/src/xml/editor.xml:340
#, python-format
msgid "Rotate Right"
msgstr ""
#. module: web_editor
#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:266
+#, python-format
+msgid "Rounded"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
#: code:addons/web_editor/static/src/xml/ace.xml:11
#, python-format
msgid "SCSS (CSS)"
@@ -1211,8 +1148,8 @@ msgstr ""
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/widgets/widgets.js:37
-#: code:addons/web_editor/static/src/js/widgets/widgets.js:1607
-#: code:addons/web_editor/static/src/xml/ace.xml:29
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:1618
+#: code:addons/web_editor/static/src/xml/ace.xml:35
#: code:addons/web_editor/static/src/xml/editor.xml:13
#, python-format
msgid "Save"
@@ -1220,14 +1157,15 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:45
+#: code:addons/web_editor/static/src/xml/editor.xml:57
+#: code:addons/web_editor/static/src/xml/snippets.xml:44
#, python-format
msgid "Search"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:43
+#: code:addons/web_editor/static/src/xml/snippets.xml:42
#, python-format
msgid "Search Contact"
msgstr ""
@@ -1241,21 +1179,21 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/widgets/widgets.js:1114
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:1123
#, python-format
msgid "Select a Media"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:130
+#: code:addons/web_editor/static/src/xml/editor.xml:124
#, python-format
msgid "Select a Picture"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:945
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1007
#, python-format
msgid "Select from files"
msgstr ""
@@ -1269,90 +1207,80 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:407
+#: code:addons/web_editor/static/src/xml/editor.xml:419
#, python-format
msgid "Set the starting position of the background image."
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1007
-#, python-format
-msgid "Set transparent"
-msgstr ""
-
-#. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:385
+#: code:addons/web_editor/static/src/xml/editor.xml:393
#, python-format
msgid "Sets the width and height of the background image in percent of the parent element."
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:121
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:158
#, python-format
msgid "Shadow"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:254
+#: code:addons/web_editor/static/src/xml/editor.xml:250
#, python-format
msgid "Size"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:108
-#: code:addons/web_editor/static/src/xml/editor.xml:258
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:145
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1038
+#: code:addons/web_editor/static/src/xml/editor.xml:254
#, python-format
msgid "Small"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:129
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:166
#, python-format
msgid "Spin"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:927
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:989
#, python-format
msgid "Strikethrough"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:972
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1034
+#: code:addons/web_editor/static/src/xml/editor.xml:261
#, python-format
msgid "Style"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:928
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:990
#, python-format
msgid "Subscript"
msgstr ""
#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Success"
-msgstr ""
-
-#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:929
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:991
#, python-format
msgid "Superscript"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:966
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1028
#, python-format
msgid "Table"
msgstr ""
@@ -1366,21 +1294,21 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1014
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1074
#, python-format
msgid "Text formatting"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:954
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1016
#, python-format
msgid "Text to display"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:156
+#: code:addons/web_editor/static/src/xml/editor.xml:151
#, python-format
msgid "The image could not be deleted because it is used in the\n"
" following pages or views:"
@@ -1388,64 +1316,64 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/widgets/widgets.js:1048
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:1056
#, python-format
msgid "The provided url does not reference any supported video"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/widgets/widgets.js:1042
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:1050
#, python-format
msgid "The provided url is not valid"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:54
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:71
#, python-format
msgid "Theme colors"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/editor.js:85
-#: code:addons/web_editor/static/src/js/editor/translator.js:177
+#: code:addons/web_editor/static/src/js/editor/editor.js:86
+#: code:addons/web_editor/static/src/js/editor/translator.js:181
#, python-format
msgid "This document is not saved!"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:147
+#: code:addons/web_editor/static/src/xml/editor.xml:142
#, python-format
msgid "This file is a public view attachment"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:148
+#: code:addons/web_editor/static/src/xml/editor.xml:143
#, python-format
msgid "This file is attached to the current record"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:307
+#: code:addons/web_editor/static/src/xml/editor.xml:315
#, python-format
msgid "This image is an external image"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:308
+#: code:addons/web_editor/static/src/xml/editor.xml:316
#, python-format
msgid "This type of image is not supported for cropping."
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:955
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1017
#, python-format
msgid "To what URL should this link go?"
msgstr ""
@@ -1459,7 +1387,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/translator.js:50
+#: code:addons/web_editor/static/src/xml/backend.xml:12
+#, python-format
+msgid "Translate"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/editor/translator.js:54
#, python-format
msgid "Translate Attribute"
msgstr ""
@@ -1473,36 +1408,35 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/translator.js:91
+#: code:addons/web_editor/static/src/js/editor/translator.js:95
#, python-format
msgid "Translation Info"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1006
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1068
#, python-format
msgid "Transparent"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:248
+#: code:addons/web_editor/static/src/xml/editor.xml:244
#, python-format
msgid "URL or Email"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:926
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:988
#, python-format
msgid "Underline"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1020
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1080
#, python-format
msgid "Undo"
msgstr ""
@@ -1516,42 +1450,42 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:952
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1014
#, python-format
msgid "Unlink"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:984
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1047
#, python-format
msgid "Unordered list"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:96
+#: code:addons/web_editor/static/src/xml/editor.xml:93
#, python-format
msgid "Upload an image"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:103
+#: code:addons/web_editor/static/src/xml/editor.xml:98
#, python-format
msgid "Upload image without optimization"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:418
+#: code:addons/web_editor/static/src/xml/editor.xml:432
#, python-format
msgid "Vertical"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:959
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1021
#: code:addons/web_editor/static/src/xml/editor.xml:53
#, python-format
msgid "Video"
@@ -1559,50 +1493,40 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:960
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1022
#, python-format
msgid "Video Link"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:962
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1024
#, python-format
msgid "Video URL?"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:193
+#: code:addons/web_editor/static/src/xml/editor.xml:189
#, python-format
msgid "Video code"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:198
+#: code:addons/web_editor/static/src/xml/editor.xml:194
#, python-format
msgid "Vimeo"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:198
+#: code:addons/web_editor/static/src/xml/editor.xml:194
#, python-format
msgid "Vine.co"
msgstr ""
#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Warning"
-msgstr ""
-
-#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "White"
-msgstr ""
-
-#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/ace.xml:8
#: code:addons/web_editor/static/src/xml/ace.xml:10
@@ -1612,7 +1536,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:111
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:148
#, python-format
msgid "Xl"
msgstr ""
@@ -1626,52 +1550,52 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:198
+#: code:addons/web_editor/static/src/xml/editor.xml:194
#, python-format
msgid "Youku"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:198
+#: code:addons/web_editor/static/src/xml/editor.xml:194
#, python-format
msgid "Youtube"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:327
+#: code:addons/web_editor/static/src/xml/editor.xml:335
#, python-format
msgid "Zoom In"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:328
+#: code:addons/web_editor/static/src/xml/editor.xml:336
#, python-format
msgid "Zoom Out"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:198
+#: code:addons/web_editor/static/src/xml/editor.xml:194
#, python-format
msgid "and"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:390
-#: code:addons/web_editor/static/src/xml/editor.xml:399
-#: code:addons/web_editor/static/src/xml/editor.xml:412
-#: code:addons/web_editor/static/src/xml/editor.xml:421
+#: code:addons/web_editor/static/src/xml/editor.xml:398
+#: code:addons/web_editor/static/src/xml/editor.xml:409
+#: code:addons/web_editor/static/src/xml/editor.xml:424
+#: code:addons/web_editor/static/src/xml/editor.xml:435
#, python-format
msgid "auto"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:112
+#: code:addons/web_editor/static/src/xml/editor.xml:104
#, python-format
msgid "https://www.odoo.com/logo.png"
msgstr ""
@@ -1773,7 +1697,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:198
+#: code:addons/web_editor/static/src/xml/editor.xml:194
#, python-format
msgid "videos"
msgstr ""
@@ -1790,7 +1714,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:109
+#: code:addons/web_editor/static/src/xml/editor.xml:101
#, python-format
msgid "— or —"
msgstr ""
diff --git a/addons/web_settings_dashboard/i18n/web_settings_dashboard.pot b/addons/web_settings_dashboard/i18n/web_settings_dashboard.pot
index 0be3f875864..1ad557b7691 100644
--- a/addons/web_settings_dashboard/i18n/web_settings_dashboard.pot
+++ b/addons/web_settings_dashboard/i18n/web_settings_dashboard.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:116
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:113
#, python-format
msgid "(Community Edition)"
msgstr ""
@@ -30,51 +30,66 @@ msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:132
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:58
+#, python-format
+msgid "Access rights"
+msgstr ""
+
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:126
#, python-format
msgid "Activate the developer mode"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:134
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:128
#, python-format
msgid "Activate the developer mode (with assets)"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:67
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:64
#, python-format
msgid "Active User"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:68
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:65
#, python-format
msgid "Active Users"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:43
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:40
#, python-format
msgid "App store"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:40
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:24
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:37
#, python-format
msgid "Browse Apps"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:123
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:167
+#, python-format
+msgid "Company"
+msgstr ""
+
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:120
#, python-format
-msgid "Copyright © 2004-2016"
+msgid "Copyright © 2004"
msgstr ""
#. module: web_settings_dashboard
@@ -85,189 +100,232 @@ msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:136
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:130
#, python-format
msgid "Deactivate the developer mode"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:77
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:74
#, python-format
msgid "Enter e-mail addresses"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:123
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:103
+#, python-format
+msgid "Facebook"
+msgstr ""
+
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:120
#, python-format
msgid "GNU LGPL Licensed"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:147
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:140
#, python-format
msgid "Get more features with the Enterprise Edition!"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:100
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:97
#, python-format
msgid "Help us spread the word: Share Odoo's awesomeness with your friends!"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:32
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:29
#, python-format
msgid "Installed App"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:33
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:30
#, python-format
msgid "Installed Apps"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:78
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:75
#, python-format
msgid "Invite"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:76
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:73
#, python-format
msgid "Invite new users:"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:168
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:104
+#, python-format
+msgid "LinkedIn"
+msgstr ""
+
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:160
#, python-format
msgid "Load a Translation"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:72
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:132
+#, python-format
+msgid "Load demo data"
+msgstr ""
+
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:69
#, python-format
msgid "Manage access rights"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:35
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:32
#, python-format
msgid "No app installed"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:115
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:112
#, python-format
msgid "Odoo"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:146
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:139
#, python-format
msgid "Odoo Enterprise"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:123
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:120
#, python-format
msgid "Odoo S.A."
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:82
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:79
#, python-format
msgid "Pending invitations:"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:55
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:52
#, python-format
msgid "Remove Email"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:163
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:155
#, python-format
msgid "Send your documents in your partner's language or set up a language for your users"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:185
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:177
#, python-format
msgid "Set Up"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:180
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:172
#, python-format
msgid "Set up your company information"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:98
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:94
+#, python-format
+msgid "Share"
+msgstr ""
+
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:95
#, python-format
msgid "Share the Love"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/js/dashboard.js:114
+#: code:addons/web_settings_dashboard/static/src/js/dashboard.js:115
#, python-format
msgid "The following email addresses already exist: %s."
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/js/dashboard.js:103
+#: code:addons/web_settings_dashboard/static/src/js/dashboard.js:104
#, python-format
msgid "The following email addresses are invalid: %s."
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:44
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:41
#, python-format
msgid "Theme store"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:159
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:150
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:151
#, python-format
msgid "Translations"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:150
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:102
+#, python-format
+msgid "Twitter"
+msgstr ""
+
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:143
#, python-format
msgid "Upgrade Now"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/js/dashboard.js:174
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:141
+#, python-format
+msgid "Upgrade to enterprise"
+msgstr ""
+
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/js/dashboard.js:175
#: model:ir.model,name:web_settings_dashboard.model_res_users
#, python-format
msgid "Users"
@@ -275,7 +333,7 @@ msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:88
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:85
#, python-format
msgid "more"
msgstr ""
diff --git a/addons/web_tour/i18n/web_tour.pot b/addons/web_tour/i18n/web_tour.pot
index 4196de52a90..0946e9638c8 100644
--- a/addons/web_tour/i18n/web_tour.pot
+++ b/addons/web_tour/i18n/web_tour.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
#. module: web_tour
#. openerp-web
-#: code:addons/web_tour/static/src/js/tour_manager.js:371
+#: code:addons/web_tour/static/src/js/tour_manager.js:391
#, python-format
msgid "Click on the <i>Home icon</i> to navigate across apps."
msgstr ""
@@ -29,7 +29,7 @@ msgstr ""
#. module: web_tour
#. openerp-web
-#: code:addons/web_tour/static/src/xml/debug_manager.xml:8
+#: code:addons/web_tour/static/src/xml/debug_manager.xml:7
#, python-format
msgid "Disable Tours"
msgstr ""
@@ -61,28 +61,28 @@ msgstr ""
#. module: web_tour
#. openerp-web
-#: code:addons/web_tour/static/src/xml/debug_manager.xml:21
+#: code:addons/web_tour/static/src/xml/debug_manager.xml:17
#, python-format
msgid "Name"
msgstr ""
#. module: web_tour
#. openerp-web
-#: code:addons/web_tour/static/src/xml/debug_manager.xml:22
+#: code:addons/web_tour/static/src/xml/debug_manager.xml:18
#, python-format
msgid "Path"
msgstr ""
#. module: web_tour
#. openerp-web
-#: code:addons/web_tour/static/src/js/tour_manager.js:75
+#: code:addons/web_tour/static/src/js/tour_manager.js:76
#, python-format
msgid "Skip tour"
msgstr ""
#. module: web_tour
#. openerp-web
-#: code:addons/web_tour/static/src/xml/debug_manager.xml:11
+#: code:addons/web_tour/static/src/xml/debug_manager.xml:8
#, python-format
msgid "Start Tour"
msgstr ""
@@ -93,6 +93,13 @@ msgid "Tip"
msgstr ""
#. module: web_tour
+#. openerp-web
+#: code:addons/web_tour/static/src/xml/debug_manager.xml:25
+#, python-format
+msgid "Tour"
+msgstr ""
+
+#. module: web_tour
#: model:ir.model.fields,field_description:web_tour.field_web_tour_tour__name
msgid "Tour name"
msgstr ""
diff --git a/addons/web_unsplash/i18n/web_unsplash.pot b/addons/web_unsplash/i18n/web_unsplash.pot
new file mode 100644
index 00000000000..ae0d59744ee
--- /dev/null
+++ b/addons/web_unsplash/i18n/web_unsplash.pot
@@ -0,0 +1,136 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * web_unsplash
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~11.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: web_unsplash
+#: model:ir.ui.view,arch_db:web_unsplash.res_config_settings_view_form
+msgid "<i class=\"fa fa-arrow-right\"/> Generate an Access Key"
+msgstr ""
+
+#. module: web_unsplash
+#: model:ir.model.fields,field_description:web_unsplash.field_res_config_settings__unsplash_access_key
+msgid "Access Key"
+msgstr ""
+
+#. module: web_unsplash
+#. openerp-web
+#: code:addons/web_unsplash/static/src/xml/unsplash_image_widget.xml:36
+#, python-format
+msgid "Access key is not set"
+msgstr ""
+
+#. module: web_unsplash
+#. openerp-web
+#: code:addons/web_unsplash/static/src/xml/unsplash_image_widget.xml:70
+#, python-format
+msgid "Add"
+msgstr ""
+
+#. module: web_unsplash
+#. openerp-web
+#: code:addons/web_unsplash/static/src/xml/unsplash_image_widget.xml:44
+#, python-format
+msgid "Apply"
+msgstr ""
+
+#. module: web_unsplash
+#. openerp-web
+#: code:addons/web_unsplash/static/src/xml/unsplash_image_widget.xml:40
+#, python-format
+msgid "Generate an access key"
+msgstr ""
+
+#. module: web_unsplash
+#. openerp-web
+#: code:addons/web_unsplash/static/src/xml/unsplash_image_widget.xml:43
+#: code:addons/web_unsplash/static/src/xml/unsplash_image_widget.xml:69
+#, python-format
+msgid "Paste your access key here"
+msgstr ""
+
+#. module: web_unsplash
+#. openerp-web
+#: code:addons/web_unsplash/static/src/xml/unsplash_image_widget.xml:27
+#, python-format
+msgid "Photos not found"
+msgstr ""
+
+#. module: web_unsplash
+#. openerp-web
+#: code:addons/web_unsplash/static/src/xml/unsplash_image_widget.xml:81
+#, python-format
+msgid "Please check your internet connection or contact administrator."
+msgstr ""
+
+#. module: web_unsplash
+#. openerp-web
+#: code:addons/web_unsplash/static/src/xml/unsplash_image_widget.xml:65
+#, python-format
+msgid "Please check your unsplash api key."
+msgstr ""
+
+#. module: web_unsplash
+#. openerp-web
+#: code:addons/web_unsplash/static/src/xml/unsplash_image_widget.xml:8
+#, python-format
+msgid "Search from Unsplash"
+msgstr ""
+
+#. module: web_unsplash
+#. openerp-web
+#: code:addons/web_unsplash/static/src/xml/unsplash_image_widget.xml:52
+#, python-format
+msgid "Search is temporary unavailable"
+msgstr ""
+
+#. module: web_unsplash
+#. openerp-web
+#: code:addons/web_unsplash/static/src/xml/unsplash_image_widget.xml:78
+#, python-format
+msgid "Something went wrong"
+msgstr ""
+
+#. module: web_unsplash
+#. openerp-web
+#: code:addons/web_unsplash/static/src/xml/unsplash_image_widget.xml:55
+#, python-format
+msgid "The max number of searches is exceeded. Please retry in an hour or extend to a better account."
+msgstr ""
+
+#. module: web_unsplash
+#. openerp-web
+#: code:addons/web_unsplash/static/src/xml/unsplash_image_widget.xml:62
+#, python-format
+msgid "Unauthorized Key"
+msgstr ""
+
+#. module: web_unsplash
+#: model:ir.model,name:web_unsplash.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: web_unsplash
+#: model:ir.model,name:web_unsplash.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#. module: web_unsplash
+#. openerp-web
+#: code:addons/web_unsplash/static/src/xml/unsplash_image_widget.xml:7
+#, python-format
+msgid "— or —"
+msgstr ""
+
diff --git a/addons/website/i18n/website.pot b/addons/website/i18n/website.pot
index a48f609d910..c34e07db4e3 100644
--- a/addons/website/i18n/website.pot
+++ b/addons/website/i18n/website.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:12+0000\n"
-"PO-Revision-Date: 2018-08-02 09:12+0000\n"
+"POT-Creation-Date: 2018-08-24 09:03+0000\n"
+"PO-Revision-Date: 2018-08-24 09:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,14 +17,14 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/editor/snippets.options.js:1009
+#: code:addons/website/static/src/js/editor/snippets.options.js:1015
#, python-format
msgid " Add Images"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:241
-#: code:addons/website/models/website.py:310
+#: code:addons/website/models/website.py:324
+#: code:addons/website/models/website.py:390
#, python-format
msgid "%s (id:%s)"
msgstr ""
@@ -60,14 +60,13 @@ msgid "&times;"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.edit_website_pages
+#: model:ir.ui.view,arch_db:website.list_website_pages
msgid "' did not match any pages."
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:737
-#: code:addons/website/models/website.py:739
-#: code:addons/website/models/website.py:757
+#: code:addons/website/models/website.py:989
+#: code:addons/website/models/website.py:1007
#, python-format
msgid "(copy)"
msgstr ""
@@ -110,6 +109,16 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "1/5"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "100%"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
msgid "10s"
msgstr ""
@@ -124,21 +133,41 @@ msgid "1s"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "2/5"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.s_comparisons
msgid "24x7 toll-free support"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "25%"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
msgid "2s"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "3/5"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
msgid "3s"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "4/5"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.403
msgid "403: Forbidden"
msgstr ""
@@ -150,12 +179,27 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "5/5"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "50%"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
msgid "5s"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_big_picture
-msgid "<b>A Small Subtitle</b>"
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "75%"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_call_to_action
+msgid "<b>50,000+ companies</b> run Odoo to grow their businesses."
msgstr ""
#. module: website
@@ -173,21 +217,15 @@ msgid "<b>Click on a text</b> to start editing it. <i>It's that easy to edit you
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.s_tabs
#: model:ir.ui.view,arch_db:website.s_text_block
-msgid "<b>Great stories are for everyone even when only written for\n"
-" just one person.</b> If you try to write with a wide general\n"
-" audience in mind, your story will ring false and be bland.\n"
-" No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest."
+msgid "<b>Great stories are for everyone even when only written for just one person.</b> If you try to write with a wide general audience in mind, your story will ring false and be bland. No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest."
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.s_tabs
#: model:ir.ui.view,arch_db:website.s_text_block
-msgid "<b>Great stories have personality.</b> Consider telling\n"
-" a great story that provides personality. Writing a story\n"
-" with personality for potential clients will assists with\n"
-" making a relationship connection. This shows up in small\n"
-" quirks like word choices or phrases. Write from your point\n"
-" of view, not from someone else's experience."
+msgid "<b>Great stories have personality.</b> Consider telling a great story that provides personality. Writing a story with personality for potential clients will assists with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience."
msgstr ""
#. module: website
@@ -205,17 +243,106 @@ msgid "<b>Install new apps</b> to get more features. Let's install the <i>'Conta
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.s_carousel
+msgid "<font style=\"background-color: rgb(255, 255, 255);\">Good writing is simple, but not simplistic.</font>"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_carousel
+msgid "<font style=\"font-size: 62px; background-color: rgb(255, 255, 255);\">Edit this title</font>"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_banner
+msgid "<font style=\"font-size: 62px;\"><b>Sell Online.</b> Easily.</font>"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_picture
+msgid "<font style=\"font-size: 62px;\">A punchy Headline</font>"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_faq_collapse
+msgid "<font style=\"font-size: 62px;\">FAQ</font>"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_comparisons
+msgid "<font style=\"font-size: 62px;\">Our offers</font>"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_carousel
+msgid "<font style=\"font-size: 62px;\">Slide Title</font>"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_parallax
+#: model:ir.ui.view,arch_db:website.s_title
+msgid "<font style=\"font-size: 62px;\">Your Site Title</font>"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_card
+msgid "<i class=\"fa fa-1x fa-clock-o mr8\"/><small>2 days ago</small>"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_picture
+msgid "<i class=\"fa fa-1x fa-picture-o mr-2\"/>Add a caption to enhance the meaning of this image."
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-align-left\"/>Alignment"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "<i class=\"fa fa-arrow-right\"/>\n"
+" Create a Google Project and Get a Key"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "<i class=\"fa fa-arrow-right\"/>\n"
+" How to get my Client ID"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "<i class=\"fa fa-arrow-right\"/>\n"
+" How to get my Tracking ID"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
msgid "<i class=\"fa fa-arrows\"/>Background Image Sizing"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-arrows\"/>Size"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
msgid "<i class=\"fa fa-arrows-h\"/>Images spacing"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-arrows-h\"/>Width"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-arrows-v\"/>Alignment"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
msgid "<i class=\"fa fa-clock-o\"/>Scroll Speed"
msgstr ""
@@ -226,6 +353,16 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-clock-o\"/>Speed"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-clone\"/>Transition"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
msgid "<i class=\"fa fa-columns\"/>Number of columns"
msgstr ""
@@ -236,7 +373,7 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "<i class=\"fa fa-expand\"/>Margin"
+msgid "<i class=\"fa fa-eye-slash\"/>Transparent"
msgstr ""
#. module: website
@@ -246,7 +383,12 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "<i class=\"fa fa-eyedropper\"/>Overlay color"
+msgid "<i class=\"fa fa-eyedropper\"/>Color"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-eyedropper\"/>Filter"
msgstr ""
#. module: website
@@ -255,11 +397,26 @@ msgid "<i class=\"fa fa-facebook\"/>Options"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-font\"/>Typography"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-heart\"/>Hearts"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.snippets
msgid "<i class=\"fa fa-indent\"/> Inner content"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.s_three_columns
+msgid "<i class=\"fa fa-info-circle mr-1\"/> <small>An additional information</small>"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.snippets
msgid "<i class=\"fa fa-magic icon-fix\"/> Effect"
msgstr ""
@@ -271,7 +428,17 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "<i class=\"fa fa-magnet\"/>Float"
+msgid "<i class=\"fa fa-magic\"/>Style"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-magic\"/>Styles"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-minus\"/>Thickness"
msgstr ""
#. module: website
@@ -281,7 +448,12 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "<i class=\"fa fa-picture-o\"/>Choose Background Image"
+msgid "<i class=\"fa fa-pencil\"/>Style"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-picture-o\"/>Background Image"
msgstr ""
#. module: website
@@ -307,6 +479,21 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-square\"/>Squares"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-star\"/>Stars"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-tasks\"/>Progress Bar"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
msgid "<i class=\"fa fa-th\"/>Columns"
msgstr ""
@@ -317,7 +504,7 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.user_navbar
-msgid "<i class=\"fa fa-th-large\"/> WEBSITE <b class=\"caret\"/>"
+msgid "<i class=\"fa fa-th-large\"/> WEBSITE"
msgstr ""
#. module: website
@@ -343,24 +530,22 @@ msgid "<p><b>That's it.</b> Your homepage is live.</p><p>Continue adding more pa
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_image_floating
-msgid "<small class=\"text-muted\">A great way to catch your reader's attention is to tell a story. Everything you consider writing can be told as a story.</small>"
+#: model:ir.ui.view,arch_db:website.s_comparisons
+msgid "<small>/ month</small>"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_parallax_slider
-msgid "<small>Author of this quote</small>"
+#: model:ir.ui.view,arch_db:website.s_carousel
+#: model:ir.ui.view,arch_db:website.s_quotes_carousel
+msgid "<span class=\"carousel-control-next-icon\"/>\n"
+" <span class=\"sr-only\">Next</span>"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_parallax_slider
-msgid "<small>John Doe, CEO</small>"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.user_navbar
-msgid "<span class=\"caret\"/>\n"
-" <span class=\"sr-only\">Toggle Dropdown</span>"
+#: model:ir.ui.view,arch_db:website.s_carousel
+#: model:ir.ui.view,arch_db:website.s_quotes_carousel
+msgid "<span class=\"carousel-control-prev-icon\"/>\n"
+" <span class=\"sr-only\">Previous</span>"
msgstr ""
#. module: website
@@ -386,31 +571,42 @@ msgid "<span class=\"o_add_images\" style=\"cursor: pointer;\"><i class=\"fa fa-
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.user_navbar
-msgid "<span/>\n"
-" <span class=\"css_publish\">Unpublished</span>\n"
-" <span class=\"css_unpublish\">Published</span>"
+#: model:ir.ui.view,arch_db:website.s_comparisons
+msgid "<span class=\"s_comparisons_currency\">$</span>\n"
+" <span class=\"s_comparisons_price\"><b>125</b></span>\n"
+" <span class=\"s_comparisons_decimal\">.00</span>"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.s_comparisons
-msgid "<span>$</span><b style=\"font-size: 60px\">125</b><small>.00</small>"
+msgid "<span class=\"s_comparisons_currency\">$</span>\n"
+" <span class=\"s_comparisons_price\"><b>35</b></span>\n"
+" <span class=\"s_comparisons_decimal\">.00</span>"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.s_comparisons
-msgid "<span>$</span><b style=\"font-size: 60px\">35</b><small>.00</small>"
+msgid "<span class=\"s_comparisons_currency\">$</span>\n"
+" <span class=\"s_comparisons_price\"><b>65</b></span>\n"
+" <span class=\"s_comparisons_decimal\">.00</span>"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_comparisons
-msgid "<span>$</span><b style=\"font-size: 60px\">65</b><small>.00</small>"
+#: model:ir.ui.view,arch_db:website.user_navbar
+msgid "<span class=\"sr-only\">Toggle Dropdown</span>"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_button
-msgid "<span>Contact Us Now</span>\n"
-" <i class=\"fa fa-chevron-right\"/>"
+#: model:ir.ui.view,arch_db:website.user_navbar
+msgid "<span/>\n"
+" <span class=\"css_publish\">Unpublished</span>\n"
+" <span class=\"css_unpublish\">Published</span>"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_call_to_action
+msgid "<span>Contact us</span>\n"
+" <i class=\"fa fa-1x fa-fw fa-arrow-circle-right ml-1\"/>"
msgstr ""
#. module: website
@@ -419,13 +615,13 @@ msgid "<span>Copyright &amp;copy;</span>"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_share
-msgid "<span>Share</span>"
+#: model:ir.ui.view,arch_db:website.s_quotes_carousel
+msgid "<span>— Jane DOE, CEO of <b>MyCompany</b></span>"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_button
-msgid "<strong>50,000+ companies run Odoo to grow their businesses.</strong>"
+#: model:ir.ui.view,arch_db:website.s_quotes_carousel
+msgid "<span>— John DOE, CEO of <b>MyCompany</b></span>"
msgstr ""
#. module: website
@@ -439,40 +635,28 @@ msgid "A CDN helps you serve your website’s content with high availability and
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_text_block
-msgid "A Great Headline"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.s_big_picture
-msgid "A Punchy Headline"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.s_image_text
#: model:ir.ui.view,arch_db:website.s_text_image
msgid "A Section Subtitle"
msgstr ""
#. module: website
-#: model:ir.model.fields,help:website.field_ir_actions_server__website_published
-msgid "A code server action can be executed from the website, using a dedicated controller. The address is <base>/website/action/<website_path>. Set this field as True to allow users to run this action. If it is set to False the action cannot be run through the website."
+#: model:ir.ui.view,arch_db:website.s_card
+msgid "A card is a flexible and extensible content container. It includes options for headers and footers, a wide variety of content, contextual background colors, and powerful display options."
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_text_block
-msgid "A good subtitle"
+#: model:ir.model.fields,help:website.field_ir_actions_server__website_published
+msgid "A code server action can be executed from the website, using a dedicated controller. The address is <base>/website/action/<website_path>. Set this field as True to allow users to run this action. If it is set to False the action cannot be run through the website."
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.s_text_block
-msgid "A great way to catch your reader's attention is to tell a story.\n"
-" Everything you consider writing can be told as a story."
+msgid "A great way to catch your reader's attention is to tell a story. <br/>Everything you consider writing can be told as a story."
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.s_features
-msgid "A small explanation of this great<br/>feature, in clear words."
+msgid "A small explanation of this great <br/>feature, in clear words."
msgstr ""
#. module: website
@@ -489,6 +673,8 @@ msgstr ""
#: model:ir.ui.view,arch_db:website.aboutus
#: model:ir.ui.view,arch_db:website.aboutus_page_ir_ui_view
#: model:ir.ui.view,arch_db:website.footer_custom
+#: model:ir.ui.view,arch_db:website.s_carousel
+#: model:ir.ui.view,arch_db:website.s_cover
#: model:website.page,arch_db:website.aboutus_page
msgid "About us"
msgstr ""
@@ -499,11 +685,6 @@ msgid "Account &amp; Sales management"
msgstr ""
#. module: website
-#: model:ir.model.fields,field_description:website.field_website__cdn_activated
-msgid "Activate CDN for assets"
-msgstr ""
-
-#. module: website
#: model:ir.model.fields,field_description:website.field_website_page__active
#: model:ir.model.fields,field_description:website.field_website_redirect__active
msgid "Active"
@@ -511,9 +692,7 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.s_three_columns
-msgid "Adapt these three columns to fit you design need.\n"
-" To duplicate, delete or move columns, select the\n"
-" column and use the top icons to perform your action."
+msgid "Adapt these three columns to fit you design need. To duplicate, delete or move columns, select the column and use the top icons to perform your action."
msgstr ""
#. module: website
@@ -524,15 +703,25 @@ msgid "Add"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.user_navbar
+msgid "Add Features"
+msgstr ""
+
+#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.contentMenu.xml:49
+#: code:addons/website/static/src/xml/website.contentMenu.xml:51
#, python-format
msgid "Add Menu Entry"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_feature_grid
-msgid "Add a great slogan"
+#: model:ir.ui.view,arch_db:website.s_features_grid
+msgid "Add a great slogan."
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "Add links to social media on your website"
msgstr ""
#. module: website
@@ -562,15 +751,13 @@ msgid "Aline is one of the iconic person in life who can say she loves what she
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_feature_grid
-msgid "All these icons are licensed under creative commons so that you can use them."
+#: model:ir.ui.view,arch_db:website.s_features_grid
+msgid "All these icons are completely free for commercial use."
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.s_faq_collapse
-msgid "Although this Website may be linked to other websites, we are not, directly or\n"
-" indirectly, implying any approval, association, sponsorship, endorsement, or\n"
-" affiliation with any linked website, unless specifically stated herein."
+msgid "Although this Website may be linked to other websites, we are not, directly or indirectly, implying any approval, association, sponsorship, endorsement, or affiliation with any linked website, unless specifically stated herein."
msgstr ""
#. module: website
@@ -579,18 +766,20 @@ msgid "An error occured while rendering the template"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
-msgid "Analyze the efficiency of your marketing campaigns by using trackable UTM trackers (campaigns, medium, sources). Create trackers and follow clicks from the Promote menu of your website. Those trackers can be used in Google Analytics or in Odoo reports where you can see the opportunities and sales revenue generated thanks to your links."
+#: model:ir.actions.client,name:website.backend_dashboard
+#: model:ir.ui.menu,name:website.menu_website_google_analytics
+msgid "Analytics"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_title
-msgid "And a great subtitle too"
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "Analyze the efficiency of your marketing campaigns by using trackable UTM trackers (campaigns, medium, sources). Create trackers and follow clicks from the Promote menu of your website. Those trackers can be used in Google Analytics or in Odoo reports where you can see the opportunities and sales revenue generated thanks to your links."
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.view_website_form
-msgid "Apply"
+#: model:ir.actions.act_window,name:website.action_website_add_features
+#: model:ir.ui.menu,name:website.menu_website_add_features
+msgid "Apps"
msgstr ""
#. module: website
@@ -604,6 +793,11 @@ msgid "Arch Filename"
msgstr ""
#. module: website
+#: model:ir.model.fields,help:website.field_res_config_settings__specific_user_account
+msgid "Are newly created user accounts website specific"
+msgstr ""
+
+#. module: website
#. openerp-web
#: code:addons/website/static/src/xml/website.xml:60
#, python-format
@@ -626,6 +820,18 @@ msgid "Back"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.theme_customize
+msgid "Background"
+msgstr ""
+
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.editor.xml:39
+#, python-format
+msgid "Background colors"
+msgstr ""
+
+#. module: website
#: model:ir.model.fields,field_description:website.field_website_page__arch_base
msgid "Base View Architecture"
msgstr ""
@@ -646,6 +852,32 @@ msgid "Big"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.theme_customize
+msgid "Body"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Border"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Bordered"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Bottom"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+#: model:ir.ui.view,arch_db:website.theme_customize
+msgid "Boxed"
+msgstr ""
+
+#. module: website
#: model:ir.model.fields,field_description:website.field_res_config_settings__cdn_url
#: model:ir.model.fields,field_description:website.field_website__cdn_url
msgid "CDN Base URL"
@@ -659,21 +891,25 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/backend/dashboard.js:101
+#: code:addons/website/static/src/js/backend/dashboard.js:103
#: code:addons/website/static/src/xml/website.xml:27
#: model:ir.ui.view,arch_db:website.500
-#: model:ir.ui.view,arch_db:website.view_website_form
#, python-format
msgid "Cancel"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_feature_grid
-msgid "Change Background"
+#: model:ir.ui.view,arch_db:website.s_cover
+msgid "Catchy Headline"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_feature_grid
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Center"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_features_grid
msgid "Change Icons"
msgstr ""
@@ -689,10 +925,38 @@ msgid "Child Menus"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_big_picture
-msgid "Choose a vibrant image and write an inspiring paragraph\n"
-" about it. It does not have to be long, but it should\n"
-" reinforce your image."
+#: model:ir.ui.view,arch_db:website.theme_customize
+msgid "Choose a pattern"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_picture
+msgid "Choose a vibrant image and write an inspiring paragraph about it.<br/> It does not have to be long, but it should reinforce your image."
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.theme_customize
+msgid "Choose an image"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.theme_customize
+msgid "Choose the theme colors"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.theme_customize
+msgid "Choose your colors"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.theme_customize
+msgid "Choose your fonts"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.theme_customize
+msgid "Choose your layout"
msgstr ""
#. module: website
@@ -701,12 +965,26 @@ msgid "Circle"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_feature_grid
-msgid "Click on the icon to adapt it to your feature"
+#: model:ir.ui.view,arch_db:website.s_carousel
+msgid "Clever Slogan"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_banner
+#. openerp-web
+#: code:addons/website/static/src/js/tours/customize.js:15
+#, python-format
+msgid "Click here to choose your main branding color.<br/>It will recompute the palette with suggested matching colors."
+msgstr ""
+
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.seo.xml:146
+#, python-format
+msgid "Click to choose more images"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.default_homepage
msgid "Click to customize this text"
msgstr ""
@@ -721,24 +999,32 @@ msgid "Client Secret"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.edit_website_pages
+#: model:ir.ui.view,arch_db:website.one_page_line
msgid "Clone this page"
msgstr ""
#. module: website
#. openerp-web
#: code:addons/website/static/src/xml/website.gallery.xml:51
+#: model:ir.ui.view,arch_db:website.500
+#: model:ir.ui.view,arch_db:website.show_website_info
#, python-format
msgid "Close"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.theme_customize
+msgid "Colors"
+msgstr ""
+
+#. module: website
#: model:ir.model,name:website.model_res_company
msgid "Companies"
msgstr ""
#. module: website
#: model:ir.model.fields,field_description:website.field_website__company_id
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
msgid "Company"
msgstr ""
@@ -748,6 +1034,11 @@ msgid "Company name"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.s_company_team
+msgid "Company team"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.s_comparisons
msgid "Complete CRM for any size team"
msgstr ""
@@ -759,7 +1050,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/editor/snippets.options.js:24
+#: code:addons/website/static/src/js/editor/snippets.options.js:44
#, python-format
msgid "Confirmation"
msgstr ""
@@ -771,6 +1062,7 @@ msgstr ""
#. module: website
#: model:ir.model,name:website.model_res_partner
+#: model:ir.ui.view,arch_db:website.s_tabs
msgid "Contact"
msgstr ""
@@ -784,10 +1076,11 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.contactus
#: model:ir.ui.view,arch_db:website.contactus_page_ir_ui_view
+#: model:ir.ui.view,arch_db:website.default_homepage
#: model:ir.ui.view,arch_db:website.footer_custom
-#: model:ir.ui.view,arch_db:website.s_banner
-#: model:ir.ui.view,arch_db:website.s_big_message
+#: model:ir.ui.view,arch_db:website.s_carousel
#: model:ir.ui.view,arch_db:website.s_comparisons
+#: model:ir.ui.view,arch_db:website.s_cover
#: model:website.menu,name:website.menu_contactus
#: model:website.page,arch_db:website.contactus_page
msgid "Contact us"
@@ -797,35 +1090,34 @@ msgstr ""
#: model:ir.ui.view,arch_db:website.contactus
#: model:ir.ui.view,arch_db:website.contactus_page_ir_ui_view
#: model:website.page,arch_db:website.contactus_page
-msgid "Contact us about anything related to our company or services."
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.s_big_picture
-msgid "Contact us »"
+msgid "Contact us about anything related to our company or services.<br/>\n"
+" We'll do our best to get back to you as soon as possible."
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.user_navbar
-msgid "Content"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+#: model:ir.model.fields,field_description:website.field_res_config_settings__cdn_activated
+#: model:ir.model.fields,field_description:website.field_website__cdn_activated
msgid "Content Delivery Network (CDN)"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/content.js:424
+#: code:addons/website/static/src/js/menu/content.js:442
#: code:addons/website/static/src/xml/website.xml:26
#, python-format
msgid "Continue"
msgstr ""
#. module: website
+#: model:ir.model.fields,field_description:website.field_res_config_settings__website_country_group_ids
+#: model:ir.model.fields,field_description:website.field_website__country_group_ids
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "Country Groups"
+msgstr ""
+
+#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/content.js:366
+#: code:addons/website/static/src/js/menu/content.js:384
#, python-format
msgid "Create Menu"
msgstr ""
@@ -841,16 +1133,6 @@ msgid "Create a"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
-msgid "Create a Google Project and Get a Key"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
-msgid "Create several versions of your website pages"
-msgstr ""
-
-#. module: website
#: model:ir.model.fields,field_description:website.field_website__create_uid
#: model:ir.model.fields,field_description:website.field_website_menu__create_uid
#: model:ir.model.fields,field_description:website.field_website_page__create_uid
@@ -867,7 +1149,15 @@ msgid "Created on"
msgstr ""
#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.seo.xml:143
+#, python-format
+msgid "Custom"
+msgstr ""
+
+#. module: website
#: model:ir.model.fields,field_description:website.field_res_config_settings__auth_signup_uninvited
+#: model:ir.model.fields,field_description:website.field_website__auth_signup_uninvited
msgid "Customer Account"
msgstr ""
@@ -890,19 +1180,31 @@ msgstr ""
#. module: website
#. openerp-web
+#: code:addons/website/static/src/js/widgets/theme.js:33
+#, python-format
+msgid "Customize this theme"
+msgstr ""
+
+#. module: website
+#. openerp-web
#: code:addons/website/static/src/js/menu/edit.js:75
#, python-format
msgid "DRAG BUILDING BLOCKS HERE"
msgstr ""
#. module: website
-#: model:ir.actions.client,name:website.backend_dashboard
-#: model:ir.ui.menu,name:website.menu_dashboard
-msgid "Dashboard"
+#: model:ir.ui.view,arch_db:website.theme_customize
+msgid "Dark"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Dashed"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Default"
msgstr ""
@@ -928,6 +1230,11 @@ msgid "Default language code"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.theme_customize
+msgid "Default theme colors"
+msgstr ""
+
+#. module: website
#. openerp-web
#: code:addons/website/static/src/xml/website.seo.xml:41
#, python-format
@@ -935,27 +1242,32 @@ msgid "Define Keywords"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_feature_grid
+#: model:ir.ui.view,arch_db:website.s_features_grid
msgid "Delete Blocks"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/content.js:59
-#: code:addons/website/static/src/js/menu/content.js:797
+#: code:addons/website/static/src/js/menu/content.js:60
+#: code:addons/website/static/src/js/menu/content.js:958
#, python-format
msgid "Delete Page"
msgstr ""
#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.contentMenu.xml:17
+#, python-format
+msgid "Delete menu"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.s_three_columns
-msgid "Delete the above image or replace it with a picture\n"
-" that illustrates your message. Click on the picture to\n"
-" change it's <em>rounded corner</em> style."
+msgid "Delete the above image or replace it with a picture that illustrates your message. Click on the picture to change it's <em>rounded corner</em> style."
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.edit_website_pages
+#: model:ir.ui.view,arch_db:website.one_page_line
msgid "Delete this page"
msgstr ""
@@ -980,19 +1292,29 @@ msgid "Description"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.s_tabs
+msgid "Details"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Disable autoplay"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/content.js:46
-#: code:addons/website/static/src/js/menu/seo.js:343
+#: code:addons/website/static/src/js/menu/content.js:47
+#: code:addons/website/static/src/js/menu/seo.js:427
#, python-format
msgid "Discard"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.s_image_text
+msgid "Discover more"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.external_snippets
msgid "Discussion Group"
msgstr ""
@@ -1000,26 +1322,68 @@ msgstr ""
#. module: website
#: model:ir.model.fields,field_description:website.field_website__display_name
#: model:ir.model.fields,field_description:website.field_website_menu__display_name
+#: model:ir.model.fields,field_description:website.field_website_multi_mixin__display_name
#: model:ir.model.fields,field_description:website.field_website_page__display_name
#: model:ir.model.fields,field_description:website.field_website_published_mixin__display_name
+#: model:ir.model.fields,field_description:website.field_website_published_multi_mixin__display_name
#: model:ir.model.fields,field_description:website.field_website_redirect__display_name
#: model:ir.model.fields,field_description:website.field_website_seo_metadata__display_name
msgid "Display Name"
msgstr ""
#. module: website
+#: code:addons/website/models/ir_qweb_fields.py:16
+#, python-format
+msgid "Display the badges"
+msgstr ""
+
+#. module: website
+#: code:addons/website/models/ir_qweb_fields.py:15
+#, python-format
+msgid "Display the biography"
+msgstr ""
+
+#. module: website
+#: code:addons/website/models/ir_qweb_fields.py:14
+#, python-format
+msgid "Display the website description"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "Display this website for users from these country groups"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "Display this website when users visit this domain"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_banner
+msgid "Do something"
+msgstr ""
+
+#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/editor/snippets.options.js:90
+#: code:addons/website/static/src/js/editor/snippets.options.js:110
#, python-format
msgid "Do you want to edit the company data ?"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
#: model:ir.ui.view,arch_db:website.view_website_form
msgid "Domain"
msgstr ""
#. module: website
+#: code:addons/website/models/ir_ui_view.py:231
+#, python-format
+msgid "Domain Based"
+msgstr ""
+
+#. module: website
#. openerp-web
#: code:addons/website/static/src/xml/website.xml:35
#, python-format
@@ -1027,8 +1391,23 @@ msgid "Don't forget to update all links referring to this page."
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Dotted"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Double"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_features_grid
+msgid "Double click an icon to replace it with one of your choice."
+msgstr ""
+
+#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.contentMenu.xml:45
+#: code:addons/website/static/src/xml/website.contentMenu.xml:47
#, python-format
msgid "Drag a menu to the right to create a sub-menu"
msgstr ""
@@ -1048,13 +1427,20 @@ msgid "Drag the <i>Cover</i> block and drop it in your page."
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_feature_grid
+#. openerp-web
+#: code:addons/website/static/src/xml/website.contentMenu.xml:7
+#, python-format
+msgid "Dropdown menu"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_features_grid
msgid "Duplicate"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_feature_grid
-msgid "Duplicate blocks to add more features."
+#: model:ir.ui.view,arch_db:website.s_features_grid
+msgid "Duplicate blocks and columns to add more features."
msgstr ""
#. module: website
@@ -1064,19 +1450,24 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/content.js:453
+#: code:addons/website/static/src/js/menu/content.js:471
#: model:ir.ui.view,arch_db:website.user_navbar
#, python-format
msgid "Edit Menu"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.s_features_grid
+msgid "Edit Styles"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.user_navbar
msgid "Edit Top Menu"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.edit_website_pages
+#: model:ir.ui.view,arch_db:website.one_page_line
msgid "Edit code in backend"
msgstr ""
@@ -1088,7 +1479,14 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:28
+#: code:addons/website/static/src/xml/website.contentMenu.xml:16
+#, python-format
+msgid "Edit menu"
+msgstr ""
+
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:32
#, python-format
msgid "Edit my Analytics Client ID"
msgstr ""
@@ -1100,7 +1498,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/editor/snippets.options.js:35
+#: code:addons/website/static/src/js/editor/snippets.options.js:55
#, python-format
msgid "Edit the menu"
msgstr ""
@@ -1116,8 +1514,14 @@ msgid "Email support"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_comparisons
-msgid "Enterprise package"
+#: model:ir.model.fields,field_description:website.field_res_config_settings__has_google_analytics_dashboard
+#: model:ir.model.fields,field_description:website.field_website__has_google_analytics_dashboard
+msgid "Embedded Google Analytics"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Equal height"
msgstr ""
#. module: website
@@ -1127,7 +1531,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.facebook_page.xml:19
+#: code:addons/website/static/src/xml/website.facebook_page.xml:22
#, python-format
msgid "Events"
msgstr ""
@@ -1138,9 +1542,8 @@ msgid "Expert"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_well
-msgid "Explain the benefits you offer. Don't write about products or\n"
-" services here, write about solutions."
+#: model:ir.ui.view,arch_db:website.s_alert
+msgid "Explain the benefits you offer. <br/>Don't write about products or services here, write about solutions."
msgstr ""
#. module: website
@@ -1150,24 +1553,25 @@ msgid "External ID"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Extra-Large"
-msgstr ""
-
-#. module: website
+#: model:ir.model.fields,field_description:website.field_res_config_settings__social_facebook
#: model:ir.model.fields,field_description:website.field_website__social_facebook
msgid "Facebook Account"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/editor/snippets.options.js:493
+#: code:addons/website/static/src/js/editor/snippets.options.js:505
#, python-format
msgid "Facebook Page"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Fade"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Fast"
msgstr ""
@@ -1187,7 +1591,7 @@ msgid "Feature Three"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_panel
+#: model:ir.ui.view,arch_db:website.s_card
msgid "Feature Title"
msgstr ""
@@ -1202,6 +1606,11 @@ msgid "First Feature"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.s_features_grid
+msgid "First list of Features"
+msgstr ""
+
+#. module: website
#: model:ir.model.fields,help:website.field_ir_ui_view__first_page_id
#: model:ir.model.fields,help:website.field_website_page__first_page_id
msgid "First page linked to this view"
@@ -1230,6 +1639,21 @@ msgid "Follow all the"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "Follow your website traffic in Odoo."
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.theme_customize
+msgid "Fonts"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "Force your user to create an account per website"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.s_company_team
msgid "Founder and chief visionary, Tony is the driving force behind Company. He loves\n"
" to keep his hands full by participating in the development of the software,\n"
@@ -1237,18 +1661,13 @@ msgid "Founder and chief visionary, Tony is the driving force behind Company. He
msgstr ""
#. module: website
-#: selection:res.config.settings,auth_signup_uninvited:0
-msgid "Free sign up (B2C)"
+#: selection:website,auth_signup_uninvited:0
+msgid "Free sign up"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_feature_grid
-msgid "From the main container, you can change the background to highlight features."
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.s_faq_collapse
-msgid "General Terms and Conditions / Service Policies"
+#: model:ir.ui.view,arch_db:website.theme_customize
+msgid "Full"
msgstr ""
#. module: website
@@ -1263,26 +1682,27 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/seo.js:340
+#: code:addons/website/static/src/js/menu/seo.js:424
#, python-format
msgid "Get this page efficiently referenced in search engines to attract more visitors."
msgstr ""
#. module: website
+#: model:ir.model.fields,field_description:website.field_res_config_settings__social_github
#: model:ir.model.fields,field_description:website.field_website__social_github
msgid "GitHub Account"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/content.js:50
+#: code:addons/website/static/src/js/menu/content.js:51
#, python-format
msgid "Go To Page"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/editor/snippets.options.js:27
+#: code:addons/website/static/src/js/editor/snippets.options.js:47
#, python-format
msgid "Go to Link"
msgstr ""
@@ -1294,12 +1714,17 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:93
+#: code:addons/website/static/src/xml/website.backend.xml:106
#, python-format
msgid "Go to Website"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "Go to website"
+msgstr ""
+
+#. module: website
#. openerp-web
#: code:addons/website/static/src/js/tours/banner.js:46
#, python-format
@@ -1307,9 +1732,15 @@ msgid "Good Job! You created your first page. Let's check how this page looks li
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.s_carousel
+msgid "Good copy starts with understanding how your product or service helps your customers. Simple words communicate better than big words and pompous language."
+msgstr ""
+
+#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/backend/dashboard.js:84
+#: code:addons/website/static/src/js/backend/dashboard.js:86
#: model:ir.model.fields,field_description:website.field_res_config_settings__has_google_analytics
+#: model:ir.model.fields,field_description:website.field_website__has_google_analytics
#, python-format
msgid "Google Analytics"
msgstr ""
@@ -1321,13 +1752,8 @@ msgid "Google Analytics Key"
msgstr ""
#. module: website
-#: model:ir.model.fields,field_description:website.field_res_config_settings__has_google_analytics_dashboard
-msgid "Google Analytics in Dashboard"
-msgstr ""
-
-#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:48
+#: code:addons/website/static/src/xml/website.backend.xml:51
#, python-format
msgid "Google Analytics initialization failed. Maybe this domain is not whitelisted in your Google Analytics project for this client ID."
msgstr ""
@@ -1346,22 +1772,25 @@ msgstr ""
#. module: website
#: model:ir.model.fields,field_description:website.field_res_config_settings__has_google_maps
+#: model:ir.model.fields,field_description:website.field_website__has_google_maps
#: model:ir.ui.view,arch_db:website.company_description
msgid "Google Maps"
msgstr ""
#. module: website
#: model:ir.model.fields,field_description:website.field_res_config_settings__google_maps_api_key
+#: model:ir.model.fields,field_description:website.field_website__google_maps_api_key
msgid "Google Maps API Key"
msgstr ""
#. module: website
+#: model:ir.model.fields,field_description:website.field_res_config_settings__social_googleplus
#: model:ir.model.fields,field_description:website.field_website__social_googleplus
msgid "Google+ Account"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_feature_grid
+#: model:ir.ui.view,arch_db:website.s_features_grid
msgid "Great Value"
msgstr ""
@@ -1399,35 +1828,51 @@ msgid "HTTP routing"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_cover
-msgid "Headline"
+#: model:ir.ui.view,arch_db:website.theme_customize
+msgid "Hamburger"
+msgstr ""
+
+#. module: website
+#: model:ir.model.fields,field_description:website.field_website_page__header_color
+msgid "Header Color"
+msgstr ""
+
+#. module: website
+#: model:ir.model.fields,field_description:website.field_website_page__header_overlay
+msgid "Header Overlay"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.facebook_page.xml:37
+#: code:addons/website/static/src/xml/website.facebook_page.xml:42
#, python-format
msgid "Hide Cover Photo"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.pageProperties.xml:114
+#: code:addons/website/static/src/xml/website.pageProperties.xml:112
#, python-format
msgid "Hide this page from search results"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.contentMenu.xml:54
+#: code:addons/website/static/src/xml/website.contentMenu.xml:56
#, python-format
msgid "Hint: Simply type '#' to create a container menu"
msgstr ""
#. module: website
+#. openerp-web
+#: code:addons/website/models/website.py:178
+#: code:addons/website/static/src/xml/website.contentMenu.xml:13
#: model:ir.ui.view,arch_db:website.500
#: model:ir.ui.view,arch_db:website.footer_custom
+#: model:ir.ui.view,arch_db:website.one_page_line
+#: model:ir.ui.view,arch_db:website.s_tabs
#: model:website.menu,name:website.menu_homepage
+#, python-format
msgid "Home"
msgstr ""
@@ -1443,17 +1888,20 @@ msgid "Homepage"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.default_homepage
+msgid "Homepage of"
+msgstr ""
+
+#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:58
-#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+#: code:addons/website/static/src/xml/website.backend.xml:63
#, python-format
msgid "How to get my Client ID"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:53
-#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+#: code:addons/website/static/src/xml/website.backend.xml:57
#, python-format
msgid "How to get my Tracking ID"
msgstr ""
@@ -1461,8 +1909,10 @@ msgstr ""
#. module: website
#: model:ir.model.fields,field_description:website.field_website__id
#: model:ir.model.fields,field_description:website.field_website_menu__id
+#: model:ir.model.fields,field_description:website.field_website_multi_mixin__id
#: model:ir.model.fields,field_description:website.field_website_page__id
#: model:ir.model.fields,field_description:website.field_website_published_mixin__id
+#: model:ir.model.fields,field_description:website.field_website_published_multi_mixin__id
#: model:ir.model.fields,field_description:website.field_website_redirect__id
#: model:ir.model.fields,field_description:website.field_website_seo_metadata__id
msgid "ID"
@@ -1479,6 +1929,16 @@ msgid "ID of the view defined in xml file"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Icon"
+msgstr ""
+
+#. module: website
+#: model:ir.model.fields,help:website.field_website__specific_user_account
+msgid "If True, new accounts will be associated to the current website"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.500
msgid "If this error is caused by a change of yours in the templates, you have the possibility to reset one or more templates to their <strong>factory settings</strong>."
msgstr ""
@@ -1498,6 +1958,13 @@ msgstr ""
#. module: website
#. openerp-web
+#: code:addons/website/static/src/xml/website.seo.xml:135
+#, python-format
+msgid "Image for Social Share"
+msgstr ""
+
+#. module: website
+#. openerp-web
#: code:addons/website/static/src/xml/website.seo.xml:68
#, python-format
msgid "In description"
@@ -1519,7 +1986,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.pageProperties.xml:112
+#: code:addons/website/static/src/xml/website.pageProperties.xml:110
#: model:ir.ui.view,arch_db:website.index_management
#, python-format
msgid "Indexed"
@@ -1556,8 +2023,13 @@ msgid "Installed Modules"
msgstr ""
#. module: website
+#: model:ir.model.fields,help:website.field_website__theme_id
+msgid "Installed theme"
+msgstr ""
+
+#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.facebook_page.xml:57
+#: code:addons/website/static/src/xml/website.facebook_page.xml:62
#, python-format
msgid "Invalid Facebook Page Url"
msgstr ""
@@ -1581,6 +2053,13 @@ msgid "Is Visible"
msgstr ""
#. module: website
+#: model:ir.model.fields,field_description:website.field_website_page__is_published
+#: model:ir.model.fields,field_description:website.field_website_published_mixin__is_published
+#: model:ir.model.fields,field_description:website.field_website_published_multi_mixin__is_published
+msgid "Is published"
+msgstr ""
+
+#. module: website
#. openerp-web
#: code:addons/website/static/src/xml/website.pageProperties.xml:23
#, python-format
@@ -1589,17 +2068,18 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/content/website_root.js:255
+#: code:addons/website/static/src/js/content/website_root.js:254
#, python-format
msgid "It might be possible to edit the relevant items or fix the issue in <a href=\"%s\">the classic Odoo interface</a>"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_button
+#: model:ir.ui.view,arch_db:website.s_call_to_action
msgid "Join us and make your company a better place."
msgstr ""
#. module: website
+#: model:ir.model.fields,field_description:website.field_ir_attachment__key
#: model:ir.model.fields,field_description:website.field_website_page__key
msgid "Key"
msgstr ""
@@ -1630,8 +2110,10 @@ msgstr ""
#. module: website
#: model:ir.model.fields,field_description:website.field_website____last_update
#: model:ir.model.fields,field_description:website.field_website_menu____last_update
+#: model:ir.model.fields,field_description:website.field_website_multi_mixin____last_update
#: model:ir.model.fields,field_description:website.field_website_page____last_update
#: model:ir.model.fields,field_description:website.field_website_published_mixin____last_update
+#: model:ir.model.fields,field_description:website.field_website_published_multi_mixin____last_update
#: model:ir.model.fields,field_description:website.field_website_redirect____last_update
#: model:ir.model.fields,field_description:website.field_website_seo_metadata____last_update
msgid "Last Modified on"
@@ -1639,7 +2121,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:67
+#: code:addons/website/static/src/xml/website.backend.xml:72
#, python-format
msgid "Last Month"
msgstr ""
@@ -1662,19 +2144,30 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:66
+#: code:addons/website/static/src/xml/website.backend.xml:71
#, python-format
msgid "Last Week"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:68
+#: code:addons/website/static/src/xml/website.backend.xml:73
#, python-format
msgid "Last Year"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.theme_customize
+msgid "Layout"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_text_image
+#: model:ir.ui.view,arch_db:website.s_three_columns
+msgid "Learn more"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Left"
msgstr ""
@@ -1699,40 +2192,46 @@ msgid "Let's start designing."
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.theme_customize
+msgid "Light"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.s_comparisons
msgid "Limited customization"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Line-On-Sides"
+msgstr ""
+
+#. module: website
#: model:ir.model.fields,field_description:website.field_res_config_settings__module_website_links
msgid "Link Trackers"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:36
+#: code:addons/website/static/src/xml/website.backend.xml:40
#, python-format
msgid "Link my Analytics Account"
msgstr ""
#. module: website
+#: model:ir.model.fields,field_description:website.field_res_config_settings__social_linkedin
#: model:ir.model.fields,field_description:website.field_website__social_linkedin
msgid "LinkedIn Account"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.s_faq_collapse
-msgid "Links to other websites"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.s_feature_grid
-msgid "List of Features"
+msgid "Links to other Websites"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/seo.js:82
+#: code:addons/website/static/src/js/menu/seo.js:83
#, python-format
msgid "Loading..."
msgstr ""
@@ -1748,12 +2247,19 @@ msgid "Main Menu"
msgstr ""
#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.editor.xml:31
+#, python-format
+msgid "Main colors"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.user_navbar
msgid "Manage Pages"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.edit_website_pages
+#: model:ir.ui.view,arch_db:website.list_website_pages
msgid "Manage Your Pages"
msgstr ""
@@ -1763,7 +2269,12 @@ msgid "Manage Your Website Pages"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.edit_website_pages
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "Manage multiple websites"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.one_page_line
msgid "Manage this page"
msgstr ""
@@ -1789,21 +2300,28 @@ msgid "Meet the Executive Team"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:249
+#: code:addons/website/models/website.py:330
#: model:ir.model.fields,field_description:website.field_website_menu__name
+#: model:ir.ui.view,arch_db:website.theme_customize
+#: model:ir.ui.view,arch_db:website.user_navbar
#, python-format
msgid "Menu"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/content.js:380
+#: code:addons/website/static/src/js/menu/content.js:398
#, python-format
msgid "Menu Label"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:251
+#: model:ir.ui.view,arch_db:website.theme_customize
+msgid "Menu text"
+msgstr ""
+
+#. module: website
+#: code:addons/website/models/website.py:332
#: model:ir.ui.menu,name:website.menu_website_menu_list
#, python-format
msgid "Menus"
@@ -1811,7 +2329,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.facebook_page.xml:22
+#: code:addons/website/static/src/xml/website.facebook_page.xml:26
#, python-format
msgid "Messages"
msgstr ""
@@ -1829,6 +2347,11 @@ msgid "Mich loves taking on challenges. With his multi-year experience as Commer
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Middle"
+msgstr ""
+
+#. module: website
#. openerp-web
#: code:addons/website/static/src/js/menu/mobile_view.js:54
#, python-format
@@ -1888,6 +2411,18 @@ msgid "Moved temporarily (302)"
msgstr ""
#. module: website
+#: model:ir.model.fields,field_description:website.field_res_users__has_group_multi_website
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "Multi-Websites"
+msgstr ""
+
+#. module: website
+#: model:ir.model.fields,field_description:website.field_res_config_settings__group_multi_website
+#: model:res.groups,name:website.group_multi_website
+msgid "Multi-website"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.layout
msgid "My Website"
msgstr ""
@@ -1895,7 +2430,7 @@ msgstr ""
#. module: website
#. openerp-web
#: code:addons/website/static/src/xml/website.pageProperties.xml:44
-#: model:ir.ui.view,arch_db:website.edit_website_pages
+#: model:ir.ui.view,arch_db:website.list_website_pages
#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
#, python-format
msgid "Name"
@@ -1920,12 +2455,23 @@ msgid "New Window"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.user_navbar
+msgid "New page"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.external_snippets
msgid "Newsletter"
msgstr ""
#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.gallery.xml:27
+#: code:addons/website/static/src/xml/website.gallery.xml:31
#: model:ir.ui.view,arch_db:website.kanban_contain
+#: model:ir.ui.view,arch_db:website.s_carousel
+#: model:ir.ui.view,arch_db:website.s_quotes_carousel
+#, python-format
msgid "Next"
msgstr ""
@@ -1940,18 +2486,13 @@ msgid "No support"
msgstr ""
#. module: website
-#: model:ir.actions.act_window,help:website.action_module_theme
-#: model:ir.actions.act_window,help:website.action_module_website
-msgid "No website module found!"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
msgid "No-scroll"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
+#: model:ir.ui.view,arch_db:website.theme_customize
msgid "None"
msgstr ""
@@ -1993,34 +2534,28 @@ msgid "Odoo - Sample 3 for three columns"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_big_picture
-msgid "Odoo CMS - a big picture"
+#: model:ir.ui.view,arch_db:website.show_website_info
+msgid "Odoo Version"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_image_floating
-msgid "Odoo CMS- Sample image floating"
+#: model:ir.ui.view,arch_db:website.s_quotes_carousel
+msgid "Odoo provides essential platform for our project management. Things are better organized and more visible with it."
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.show_website_info
-msgid "Odoo Version"
+#: model:ir.ui.view,arch_db:website.s_picture
+msgid "Odoo • A picture with a caption"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.s_image_text
-msgid "Odoo image and text block"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.s_parallax_slider
-msgid "Odoo provides essential platform for our project management.\n"
-" Things are better organized and more visible with it."
+msgid "Odoo • Image and Text"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.s_text_image
-msgid "Odoo text and image block"
+msgid "Odoo • Text and Image"
msgstr ""
#. module: website
@@ -2031,8 +2566,8 @@ msgid "On Website"
msgstr ""
#. module: website
-#: selection:res.config.settings,auth_signup_uninvited:0
-msgid "On invitation (B2B)"
+#: selection:website,auth_signup_uninvited:0
+msgid "On invitation"
msgstr ""
#. module: website
@@ -2061,7 +2596,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.facebook_page.xml:26
+#: code:addons/website/static/src/xml/website.facebook_page.xml:31
#, python-format
msgid "Options"
msgstr ""
@@ -2077,21 +2612,11 @@ msgid "Other Info"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_comparisons
-msgid "Our Offers"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.footer_custom
msgid "Our Products &amp; Services"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_references
-msgid "Our References"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.aboutus
#: model:ir.ui.view,arch_db:website.aboutus_page_ir_ui_view
#: model:website.page,arch_db:website.aboutus_page
@@ -2103,7 +2628,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:website.aboutus_page_ir_ui_view
#: model:website.page,arch_db:website.aboutus_page
msgid "Our products are designed for small to medium size companies willing to optimize\n"
-" their performance."
+" their performance."
msgstr ""
#. module: website
@@ -2113,8 +2638,13 @@ msgid "Our products are designed for small to medium size companies willing to o
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:214
-#: code:addons/website/models/website.py:283
+#: model:ir.ui.menu,name:website.menu_dashboard
+msgid "Overview"
+msgstr ""
+
+#. module: website
+#: code:addons/website/models/website.py:300
+#: code:addons/website/models/website.py:364
#: model:ir.model,name:website.model_website_page
#: model:ir.model.fields,field_description:website.field_ir_ui_view__page_ids
#: model:ir.model.fields,field_description:website.field_website_page__page_ids
@@ -2123,13 +2653,13 @@ msgid "Page"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:221
+#: code:addons/website/models/website.py:307
#, python-format
msgid "Page <b>%s</b> contains a link to this page"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:290
+#: code:addons/website/models/website.py:371
#, python-format
msgid "Page <b>%s</b> is calling this file"
msgstr ""
@@ -2148,13 +2678,18 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/content.js:67
+#: code:addons/website/static/src/js/menu/content.js:68
#: model:ir.ui.view,arch_db:website.user_navbar
#, python-format
msgid "Page Properties"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.website_pages_tree_view
+msgid "Page Published"
+msgstr ""
+
+#. module: website
#. openerp-web
#: code:addons/website/static/src/js/menu/new_content.js:43
#: code:addons/website/static/src/xml/website.seo.xml:14
@@ -2172,20 +2707,15 @@ msgid "Page URL"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:216
-#: code:addons/website/models/website.py:285
+#: code:addons/website/models/website.py:302
+#: code:addons/website/models/website.py:366
#: model:ir.ui.menu,name:website.menu_website_pages_list
+#: model:ir.ui.view,arch_db:website.user_navbar
#, python-format
msgid "Pages"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_panel
-msgid "Panels are a great tool to compare offers or to emphasize on\n"
-" key features. To compare products, use the inside columns."
-msgstr ""
-
-#. module: website
#: model:ir.model.fields,field_description:website.field_website_menu__parent_id
msgid "Parent Menu"
msgstr ""
@@ -2202,42 +2732,53 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.facebook_page.xml:58
+#: code:addons/website/static/src/xml/website.facebook_page.xml:63
#, python-format
msgid "Please enter valid facebook page URL for preview"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.theme_customize
-msgid "Please install a theme in order to customize your website."
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.kanban_contain
msgid "Prev"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.facebook_page.xml:52
+#: code:addons/website/static/src/xml/website.facebook_page.xml:57
#: code:addons/website/static/src/xml/website.seo.xml:28
+#: code:addons/website/static/src/xml/website.seo.xml:151
#, python-format
msgid "Preview"
msgstr ""
#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.gallery.xml:23
+#: code:addons/website/static/src/xml/website.gallery.xml:30
+#: model:ir.ui.view,arch_db:website.s_carousel
+#: model:ir.ui.view,arch_db:website.s_quotes_carousel
+#, python-format
+msgid "Previous"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.s_comparisons
msgid "Professional"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.s_tabs
+msgid "Profile"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.user_navbar
msgid "Promote"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/seo.js:339
+#: code:addons/website/static/src/js/menu/seo.js:423
#, python-format
msgid "Promote Page"
msgstr ""
@@ -2260,13 +2801,20 @@ msgstr ""
#. module: website
#. openerp-web
#: code:addons/website/static/src/xml/website.pageProperties.xml:45
-#: code:addons/website/static/src/xml/website.pageProperties.xml:126
+#: code:addons/website/static/src/xml/website.pageProperties.xml:122
#, python-format
msgid "Publish"
msgstr ""
#. module: website
#. openerp-web
+#: code:addons/website/static/src/xml/website.pageProperties.xml:152
+#, python-format
+msgid "Publish date"
+msgstr ""
+
+#. module: website
+#. openerp-web
#: code:addons/website/static/src/js/tours/banner.js:42
#, python-format
msgid "Publish your page by clicking on the <b>Save</b> button."
@@ -2283,7 +2831,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.pageProperties.xml:137
+#: code:addons/website/static/src/xml/website.pageProperties.xml:146
#: model:ir.model.fields,field_description:website.field_website_page__date_publish
#, python-format
msgid "Publishing Date"
@@ -2295,13 +2843,23 @@ msgid "QWeb"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.s_rating
+msgid "Quality"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_btn
+msgid "Read more"
+msgstr ""
+
+#. module: website
#: model:ir.model.fields,field_description:website.field_website_redirect__url_from
msgid "Redirect From"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.pageProperties.xml:66
+#: code:addons/website/static/src/xml/website.pageProperties.xml:68
#, python-format
msgid "Redirect Old URL"
msgstr ""
@@ -2323,6 +2881,17 @@ msgid "Redirects"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.s_references
+msgid "References"
+msgstr ""
+
+#. module: website
+#: model:ir.model.fields,field_description:website.field_res_partner__website_id
+#: model:ir.model.fields,field_description:website.field_res_users__website_id
+msgid "Registration Website"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.website_pages_form_view
msgid "Related Menu Items"
msgstr ""
@@ -2339,7 +2908,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:68
+#: code:addons/website/static/src/xml/website.xml:69
#, python-format
msgid "Rename Page To:"
msgstr ""
@@ -2355,17 +2924,34 @@ msgid "Reset templates"
msgstr ""
#. module: website
+#: model:ir.model.fields,help:website.field_website_multi_mixin__website_id
+#: model:ir.model.fields,help:website.field_website_page__website_id
+#: model:ir.model.fields,help:website.field_website_published_multi_mixin__website_id
+msgid "Restrict publishing to this website."
+msgstr ""
+
+#. module: website
#: model:res.groups,name:website.group_website_publisher
msgid "Restricted Editor"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.s_tabs
+msgid "Review"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Right"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Rounded"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Rounded corners"
msgstr ""
@@ -2375,20 +2961,30 @@ msgid "SEO metadata"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_feature_grid
-msgid "Sample images"
+#: model:ir.ui.menu,name:website.menu_website_dashboard
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_features_grid
+msgid "Sample Icons"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/backend/dashboard.js:91
-#: code:addons/website/static/src/js/menu/content.js:45
-#: code:addons/website/static/src/js/menu/seo.js:342
+#: code:addons/website/static/src/js/backend/dashboard.js:93
+#: code:addons/website/static/src/js/menu/content.js:46
+#: code:addons/website/static/src/js/menu/seo.js:426
#, python-format
msgid "Save"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.website_search_box
+msgid "Search"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.menu_search
msgid "Search Menus"
msgstr ""
@@ -2409,30 +3005,37 @@ msgid "Second Feature"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_feature_grid
-msgid "Second List"
+#: model:ir.ui.view,arch_db:website.s_features_grid
+msgid "Second list of Features"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
-msgid "See Google Analytics data on your Website Dashboard"
+#: model:ir.ui.view,arch_db:website.s_image_text
+msgid "Section Subtitle"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/content.js:423
+#: code:addons/website/static/src/js/menu/content.js:441
#, python-format
msgid "Select a Menu"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_feature_grid
+#. openerp-web
+#: code:addons/website/static/src/xml/website.seo.xml:136
+#, python-format
+msgid "Select an image to use in social share."
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_features_grid
msgid "Select and delete blocks to remove some features."
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_big_message
-msgid "Sell Online. Easily."
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "Select the Website to Configure"
msgstr ""
#. module: website
@@ -2452,16 +3055,42 @@ msgstr ""
#. module: website
#: model:ir.actions.act_window,name:website.action_website_configuration
#: model:ir.ui.menu,name:website.menu_website_website_settings
-#: model:ir.ui.view,arch_db:website.user_navbar
msgid "Settings"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "Settings on this page will apply to this website"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Shadow"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Shadows"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.s_share
+msgid "Share"
+msgstr ""
+
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.pageProperties.xml:132
+#, python-format
+msgid "Share this page"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_tabs
+msgid "Shipping"
+msgstr ""
+
+#. module: website
#: model:ir.model.fields,help:website.field_website__auto_redirect_lang
msgid "Should users be redirected to their browser's language"
msgstr ""
@@ -2474,14 +3103,14 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.facebook_page.xml:44
+#: code:addons/website/static/src/xml/website.facebook_page.xml:49
#, python-format
msgid "Show Friend's Faces"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.pageProperties.xml:90
+#: code:addons/website/static/src/xml/website.pageProperties.xml:92
#, python-format
msgid "Show in Top Menu"
msgstr ""
@@ -2492,8 +3121,20 @@ msgid "Show your address on a map in the"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_banner
-msgid "Slider Odoo Image"
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Size"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Slide"
+msgstr ""
+
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.gallery.xml:17
+#, python-format
+msgid "Slide image"
msgstr ""
#. module: website
@@ -2512,47 +3153,79 @@ msgid "Small"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.view_website_form
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Small Caps"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
msgid "Social Media"
msgstr ""
#. module: website
-#: code:addons/website/controllers/main.py:219
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Solid"
+msgstr ""
+
+#. module: website
+#: code:addons/website/controllers/main.py:224
#, python-format
msgid "Sort by Name"
msgstr ""
#. module: website
-#: code:addons/website/controllers/main.py:218
+#: code:addons/website/controllers/main.py:223
#, python-format
msgid "Sort by Url"
msgstr ""
#. module: website
+#: model:ir.model.fields,field_description:website.field_res_config_settings__specific_user_account
+#: model:ir.model.fields,field_description:website.field_website__specific_user_account
+msgid "Specific User Account"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Square"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.s_comparisons
+msgid "Start now"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.s_image_text
#: model:ir.ui.view,arch_db:website.s_text_image
-msgid "Start with the customer – find out what they want\n"
-" and give it to them."
+msgid "Start with the customer – find out what they want and give it to them."
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_comparisons
-msgid "Starter package"
+#: model:ir.ui.view,arch_db:website.s_carousel
+msgid "Start your journey"
+msgstr ""
+
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.editor.xml:53
+#, python-format
+msgid "State colors"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/editor/snippets.options.js:50
+#: code:addons/website/static/src/js/editor/snippets.options.js:70
#, python-format
msgid "Stay on this page"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.s_carousel
+msgid "Storytelling is powerful.<br/> It draws readers in and engages them."
+msgstr ""
+
+#. module: website
#. openerp-web
#: code:addons/website/static/src/xml/website.seo.xml:58
#, python-format
@@ -2572,35 +3245,35 @@ msgid "Tabs"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.show_website_info
-msgid "Technical name:"
+#: model:ir.model.fields,help:website.field_ir_attachment__key
+msgid "Technical field used to resolve multiple attachments in a multi-website environment."
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_feature_grid
-msgid "Tell features the visitor would like to know, not what you'd like to say."
+#: model:ir.ui.view,arch_db:website.show_website_info
+msgid "Technical name:"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.s_features
-msgid "Tell what's the value for the<br/>customer for this feature."
+msgid "Tell what's the value for the <br/>customer for this feature."
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:233
-#: code:addons/website/models/website.py:303
+#: code:addons/website/models/website.py:316
+#: code:addons/website/models/website.py:383
#, python-format
msgid "Template"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:239
+#: code:addons/website/models/website.py:322
#, python-format
msgid "Template <b>%s (id:%s)</b> contains a link to this page"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:309
+#: code:addons/website/models/website.py:389
#, python-format
msgid "Template <b>%s (id:%s)</b> is calling this file"
msgstr ""
@@ -2611,8 +3284,8 @@ msgid "Template fallback"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:235
-#: code:addons/website/models/website.py:305
+#: code:addons/website/models/website.py:318
+#: code:addons/website/models/website.py:385
#, python-format
msgid "Templates"
msgstr ""
@@ -2623,6 +3296,18 @@ msgid "Terms of service"
msgstr ""
#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.editor.xml:45
+#, python-format
+msgid "Text colors"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "The company this website belongs to"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.http_error_debug
msgid "The error occured while rendering the template"
msgstr ""
@@ -2635,6 +3320,7 @@ msgstr ""
#. module: website
#: model:ir.model.fields,help:website.field_website_page__website_url
#: model:ir.model.fields,help:website.field_website_published_mixin__website_url
+#: model:ir.model.fields,help:website.field_website_published_multi_mixin__website_url
msgid "The full URL to access the document through the website."
msgstr ""
@@ -2661,32 +3347,35 @@ msgid "The selected templates will be reset to their factory settings."
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.edit_website_pages
+#: model:ir.model.fields,field_description:website.field_website__theme_id
+msgid "Theme"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.list_website_pages
msgid "There are currently no pages for your website."
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:35
+#: code:addons/website/static/src/xml/website.backend.xml:39
#, python-format
msgid "There is no data currently available."
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.s_faq_collapse
-msgid "These terms of service (\"Terms\", \"Agreement\") are an agreement between the website\n"
-" (\"Website operator\", \"us\", \"we\" or \"our\") and you (\"User\", \"you\" or \"your\")."
+msgid "These terms of service (\"Terms\", \"Agreement\") are an agreement between the website (\"Website operator\", \"us\", \"we\" or \"our\") and you (\"User\", \"you\" or \"your\"). This Agreement sets forth the general terms and conditions of your use of this website and any of its products or services (collectively, \"Website\" or \"Services\")."
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_features
-msgid "Third Feature"
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Thin"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_faq_collapse
-msgid "This Agreement sets forth the general terms and conditions of your use of this website\n"
-" and any of its products or services (collectively, \"Website\" or \"Services\")."
+#: model:ir.ui.view,arch_db:website.s_features
+msgid "Third Feature"
msgstr ""
#. module: website
@@ -2702,12 +3391,17 @@ msgid "This field is used to set/get locales for user"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.s_banner
+msgid "This is a simple hero unit, a simple jumbotron-style component <br/>for calling extra attention to featured content or information."
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.page_404
msgid "This page does not exist, but you can create it as you are administrator of this site."
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:254
+#: code:addons/website/models/website.py:335
#, python-format
msgid "This page is in the menu <b>%s</b>"
msgstr ""
@@ -2719,17 +3413,19 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.facebook_page.xml:16
+#: code:addons/website/static/src/xml/website.facebook_page.xml:18
#, python-format
msgid "Timeline"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.theme_customize
+msgid "Title"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.s_three_columns
-msgid "To add a fourth column, reduce the size of these\n"
-" three columns using the right icon of each block.\n"
-" Then, duplicate one of the column to create a new\n"
-" one as a copy."
+msgid "To add a fourth column, reduce the size of these three columns using the right icon of each block. Then, duplicate one of the column to create a new one as a copy."
msgstr ""
#. module: website
@@ -2738,14 +3434,30 @@ msgid "Tony Fred, CEO"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Top"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.theme_customize
+msgid "Top Bar"
+msgstr ""
+
+#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/content.js:418
+#: code:addons/website/static/src/js/menu/content.js:436
#: model:website.menu,name:website.main_menu
#, python-format
msgid "Top Menu"
msgstr ""
#. module: website
+#: code:addons/website/models/website.py:172
+#, python-format
+msgid "Top Menu for website %s"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.http_error_debug
msgid "Traceback"
msgstr ""
@@ -2773,6 +3485,17 @@ msgid "Transform the picture (click twice to reset transformation)"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Transparent"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_features_grid
+msgid "Turn every feature into a benefit for your reader."
+msgstr ""
+
+#. module: website
+#: model:ir.model.fields,field_description:website.field_res_config_settings__social_twitter
#: model:ir.model.fields,field_description:website.field_website__social_twitter
msgid "Twitter Account"
msgstr ""
@@ -2784,7 +3507,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.pageProperties.xml:80
+#: code:addons/website/static/src/xml/website.pageProperties.xml:82
#, python-format
msgid "Type"
msgstr ""
@@ -2796,7 +3519,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:52
+#: code:addons/website/static/src/xml/website.backend.xml:55
#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
#: model:ir.ui.view,arch_db:website.view_website_form
#, python-format
@@ -2810,8 +3533,8 @@ msgid "URL matching those filters will be rewritten using the CDN Base URL"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_comparisons
-msgid "Ultimate package"
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Underlined"
msgstr ""
#. module: website
@@ -2840,18 +3563,13 @@ msgstr ""
#. module: website
#: model:ir.model.fields,field_description:website.field_website_menu__url
-#: model:ir.ui.view,arch_db:website.edit_website_pages
+#: model:ir.ui.view,arch_db:website.list_website_pages
msgid "Url"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_faq_collapse
-msgid "Use Of Cookies"
-msgstr ""
-
-#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.facebook_page.xml:30
+#: code:addons/website/static/src/xml/website.facebook_page.xml:35
#, python-format
msgid "Use Small Header"
msgstr ""
@@ -2862,11 +3580,6 @@ msgid "Use a CDN to optimize the availability of your website's content"
msgstr ""
#. module: website
-#: model:ir.model.fields,field_description:website.field_res_config_settings__cdn_activated
-msgid "Use a Content Delivery Network (CDN)"
-msgstr ""
-
-#. module: website
#. openerp-web
#: code:addons/website/static/src/xml/website.pageProperties.xml:101
#, python-format
@@ -2874,6 +3587,22 @@ msgid "Use as Homepage"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.s_faq_collapse
+msgid "Use of Cookies"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_carousel
+msgid "Use this snippet to presents your content in a slideshow-like format.<br/> Don't write about products or services here, write about solutions."
+msgstr ""
+
+#. module: website
+#: model:ir.model.fields,help:website.field_res_config_settings__website_country_group_ids
+#: model:ir.model.fields,help:website.field_website__country_group_ids
+msgid "Used when multiple websites have the same domain."
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.robots
msgid "User-agent: *\n"
"Sitemap:"
@@ -2886,6 +3615,11 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Value"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Very Fast"
msgstr ""
@@ -2927,23 +3661,31 @@ msgstr ""
#. module: website
#: model:ir.model.fields,field_description:website.field_website_page__website_published
#: model:ir.model.fields,field_description:website.field_website_published_mixin__website_published
-msgid "Visible in Website"
+#: model:ir.model.fields,field_description:website.field_website_published_multi_mixin__website_published
+msgid "Visible on current website"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:25
+#: code:addons/website/static/src/xml/website.backend.xml:29
#, python-format
msgid "Visits"
msgstr ""
#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.facebook_page.xml:60
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.aboutus
#: model:ir.ui.view,arch_db:website.aboutus_page_ir_ui_view
#: model:website.page,arch_db:website.aboutus_page
msgid "We are a team of passionate people whose goal is to improve everyone's\n"
-" life through disruptive products. We build great products to solve your\n"
-" business problems."
+" life through disruptive products. We build great products to solve your\n"
+" business problems."
msgstr ""
#. module: website
@@ -2961,18 +3703,14 @@ msgid "We found these ones:"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.contactus
-#: model:ir.ui.view,arch_db:website.contactus_page_ir_ui_view
-#: model:website.page,arch_db:website.contactus_page
-msgid "We'll do our best to get back to you as soon as possible."
-msgstr ""
-
-#. module: website
#: model:ir.actions.act_url,name:website.action_website
#: model:ir.model,name:website.model_website
+#: model:ir.model.fields,field_description:website.field_ir_attachment__website_id
#: model:ir.model.fields,field_description:website.field_ir_ui_view__website_id
#: model:ir.model.fields,field_description:website.field_website_menu__website_id
+#: model:ir.model.fields,field_description:website.field_website_multi_mixin__website_id
#: model:ir.model.fields,field_description:website.field_website_page__website_id
+#: model:ir.model.fields,field_description:website.field_website_published_multi_mixin__website_id
#: model:ir.model.fields,field_description:website.field_website_redirect__website_id
#: model:ir.ui.menu,name:website.menu_website_configuration
#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
@@ -2981,11 +3719,12 @@ msgid "Website"
msgstr ""
#. module: website
-#: model:ir.actions.act_window,name:website.action_module_website
-msgid "Website Apps"
+#: model:ir.model.fields,field_description:website.field_res_config_settings__website_company_id
+msgid "Website Company"
msgstr ""
#. module: website
+#: model:ir.model.fields,field_description:website.field_res_config_settings__website_domain
#: model:ir.model.fields,field_description:website.field_website__domain
msgid "Website Domain"
msgstr ""
@@ -3001,11 +3740,6 @@ msgid "Website Favicon"
msgstr ""
#. module: website
-#: model:ir.actions.act_url,name:website.action_website_homepage
-msgid "Website Homepage"
-msgstr ""
-
-#. module: website
#: model:ir.actions.act_window,name:website.action_website_menu
#: model:ir.model,name:website.model_website_menu
msgid "Website Menu"
@@ -3066,11 +3800,6 @@ msgid "Website Settings"
msgstr ""
#. module: website
-#: model:ir.actions.act_window,name:website.action_module_theme
-msgid "Website Theme"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.res_config_settings_view_form
msgid "Website Title"
msgstr ""
@@ -3079,6 +3808,7 @@ msgstr ""
#: model:ir.model.fields,field_description:website.field_ir_attachment__website_url
#: model:ir.model.fields,field_description:website.field_website_page__website_url
#: model:ir.model.fields,field_description:website.field_website_published_mixin__website_url
+#: model:ir.model.fields,field_description:website.field_website_published_multi_mixin__website_url
msgid "Website URL"
msgstr ""
@@ -3089,9 +3819,7 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.s_faq_collapse
-msgid "Website may use cookies to personalize and facilitate maximum navigation of the\n"
-" User by this site. The User may configure his / her browser to notify and\n"
-" reject the installation of the cookies sent by us."
+msgid "Website may use cookies to personalize and facilitate maximum navigation of the User by this site. The User may configure his / her browser to notify and reject the installation of the cookies sent by us."
msgstr ""
#. module: website
@@ -3121,12 +3849,21 @@ msgid "Website meta title"
msgstr ""
#. module: website
+#: model:ir.model.fields,field_description:website.field_ir_ui_view__website_meta_og_img
+#: model:ir.model.fields,field_description:website.field_website_page__website_meta_og_img
+#: model:ir.model.fields,field_description:website.field_website_seo_metadata__website_meta_og_img
+msgid "Website opengraph image"
+msgstr ""
+
+#. module: website
#: model:ir.actions.server,name:website.ir_actions_server_website_dashboard
+#: model:ir.actions.server,name:website.ir_actions_server_website_google_analytics
msgid "Website: Dashboard"
msgstr ""
#. module: website
-#: model:ir.model.fields,field_description:website.field_website_page__website_ids
+#: model:ir.actions.act_window,name:website.action_website_list
+#: model:ir.ui.menu,name:website.menu_website_websites_list
#: model:ir.ui.view,arch_db:website.view_website_tree
msgid "Websites"
msgstr ""
@@ -3145,122 +3882,106 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.editor.xml:10
+#: code:addons/website/static/src/xml/website.editor.xml:9
#, python-format
msgid "What do you want to do?"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_cover
-msgid "With a great subtitle"
+#. openerp-web
+#: code:addons/website/static/src/xml/website.pageProperties.xml:134
+#, python-format
+msgid "When enabled, this page will be shared between all the websites. This change is not reversible."
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_parallax_slider
-msgid "Write a quote here from one of your customers. Quotes are a\n"
-" great way to build confidence in your products or services."
+#: model:ir.ui.view,arch_db:website.s_quotes_carousel
+#: model:ir.ui.view,arch_db:website.s_tabs
+msgid "Write a quote here from one of your customers. Quotes are a great way to build confidence in your products or services."
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.s_image_text
#: model:ir.ui.view,arch_db:website.s_text_image
-msgid "Write one or two paragraphs describing your product or\n"
-" services.<br/>To be successful your content needs to be\n"
-" useful to your readers."
+msgid "Write one or two paragraphs describing your product or services. <br/>To be successful your content needs to be useful to your readers."
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_image_text
-msgid "Write one or two paragraphs describing your product,\n"
-" services or a specific feature. To be successful\n"
-" your content needs to be useful to your readers."
+#: model:ir.ui.view,arch_db:website.s_cover
+msgid "Write one or two paragraphs describing your product, services or a specific feature.<br/> To be successful your content needs to be useful to your readers."
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_cover
-msgid "Write one or two paragraphs describing your product, services or a specific feature. To be successful your content needs to be useful to your readers."
+#: model:ir.ui.view,arch_db:website.s_features
+msgid "Write what the customer would like to know, <br/>not what you want to show."
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_big_message
-msgid "Write one sentence to convince visitor about your message."
+#: model:ir.ui.view,arch_db:website.s_features_grid
+msgid "You can edit colors and background to highlight features."
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_features
-msgid "Write what the customer would like to know,<br/>not what you want to show."
+#: code:addons/website/models/res_users.py:42
+#: sql_constraint:res.users:0
+#, python-format
+msgid "You can not have two users with the same login!"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:47
+#: code:addons/website/static/src/xml/website.backend.xml:50
#, python-format
msgid "You do not seem to have access to this Analytics Account."
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/seo.js:543
+#: code:addons/website/static/src/js/menu/seo.js:636
#, python-format
msgid "You have hidden this page from search results. It won't be indexed by search engines."
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:46
+#: code:addons/website/static/src/xml/website.backend.xml:49
#, python-format
msgid "You need to log in to your Google Account before:"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.s_faq_collapse
-msgid "You should carefully review the legal statements and other conditions of use of\n"
-" any website which you access through a link from this Website. Your linking to\n"
-" any other off-site pages or other websites is at your own risk."
-msgstr ""
-
-#. module: website
-#: model:ir.actions.act_window,help:website.action_module_theme
-#: model:ir.actions.act_window,help:website.action_module_website
-msgid "You should try other search criteria."
+msgid "You should carefully review the legal statements and other conditions of use of any website which you access through a link from this Website. Your linking to any other off-site pages or other websites is at your own risk."
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:56
+#: code:addons/website/static/src/xml/website.backend.xml:60
#, python-format
msgid "Your Client ID:"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_banner
-msgid "Your Slide Title"
-msgstr ""
-
-#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:51
+#: code:addons/website/static/src/xml/website.backend.xml:54
#, python-format
msgid "Your Tracking ID:"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_title
-msgid "Your Website Title"
-msgstr ""
-
-#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.editor.xml:11
+#: code:addons/website/static/src/xml/website.editor.xml:10
#, python-format
msgid "Your current changes will be saved automatically."
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.edit_website_pages
+#: model:ir.ui.view,arch_db:website.list_website_pages
msgid "Your search '"
msgstr ""
#. module: website
+#: model:ir.model.fields,field_description:website.field_res_config_settings__social_youtube
#: model:ir.model.fields,field_description:website.field_website__social_youtube
msgid "Youtube Account"
msgstr ""
@@ -3279,7 +4000,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:70
+#: code:addons/website/static/src/xml/website.xml:71
#, python-format
msgid "e.g. About Us"
msgstr ""
@@ -3298,39 +4019,16 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:28
+#: code:addons/website/static/src/xml/website.seo.xml:151
#, python-format
-msgid "how your page will be listed on Google"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.view_website_form
-msgid "https://plus.google.com/+Odooapps"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.view_website_form
-msgid "https://twitter.com/Odoo"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.view_website_form
-msgid "https://www.facebook.com/odoo"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.view_website_form
-msgid "https://www.linkedin.com/company/odoo"
+msgid "how your page will be displayed on social media"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.view_website_form
-msgid "https://www.youtube.com/user/OpenERPonline"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.view_website_form
-msgid "https://youraccount.github.io"
+#. openerp-web
+#: code:addons/website/static/src/xml/website.seo.xml:28
+#, python-format
+msgid "how your page will be listed on Google"
msgstr ""
#. module: website
@@ -3354,6 +4052,16 @@ msgid "ir.qweb"
msgstr ""
#. module: website
+#: model:ir.model,name:website.model_ir_qweb_field_contact
+msgid "ir.qweb.field.contact"
+msgstr ""
+
+#. module: website
+#: model:ir.model,name:website.model_ir_rule
+msgid "ir.rule"
+msgstr ""
+
+#. module: website
#: model:ir.model,name:website.model_ir_ui_view
msgid "ir.ui.view"
msgstr ""
@@ -3374,6 +4082,11 @@ msgid "page"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "px"
+msgstr ""
+
+#. module: website
#: model:ir.model,name:website.model_res_config_settings
msgid "res.config.settings"
msgstr ""
@@ -3396,22 +4109,27 @@ msgid "url"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_comparisons
-msgid "user / month (billed annually)"
-msgstr ""
-
-#. module: website
#: model:ir.model.fields,field_description:website.field_res_config_settings__website_id
#: model:ir.ui.view,arch_db:website.menu_search
msgid "website"
msgstr ""
#. module: website
+#: model:ir.model,name:website.model_website_multi_mixin
+msgid "website.multi.mixin"
+msgstr ""
+
+#. module: website
#: model:ir.model,name:website.model_website_published_mixin
msgid "website.published.mixin"
msgstr ""
#. module: website
+#: model:ir.model,name:website.model_website_published_multi_mixin
+msgid "website.published.multi.mixin"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.brand_promotion
msgid "with"
msgstr ""
@@ -3421,3 +4139,8 @@ msgstr ""
msgid "yes"
msgstr ""
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_tabs
+msgid "— Jane DOE, CEO of <b>MyCompany</b>"
+msgstr ""
+
diff --git a/addons/website_blog/i18n/website_blog.pot b/addons/website_blog/i18n/website_blog.pot
index 6ab77d996ae..50ea788278c 100644
--- a/addons/website_blog/i18n/website_blog.pot
+++ b/addons/website_blog/i18n/website_blog.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -36,6 +36,56 @@ msgid "(Un)archiving a blog automatically (un)archives its posts. Do you want to
msgstr ""
#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.s_latest_posts_options
+msgid "1 post"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.s_latest_posts_options
+msgid "10 posts"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.s_latest_posts_options
+msgid "2 posts"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.s_latest_posts_options
+msgid "3 posts"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.s_latest_posts_options
+msgid "4 posts"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.s_latest_posts_options
+msgid "5 posts"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.s_latest_posts_options
+msgid "6 posts"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.s_latest_posts_options
+msgid "7 posts"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.s_latest_posts_options
+msgid "8 posts"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.s_latest_posts_options
+msgid "9 posts"
+msgstr ""
+
+#. module: website_blog
#. openerp-web
#: code:addons/website_blog/static/src/js/website.tour.blog.js:53
#, python-format
@@ -64,6 +114,11 @@ msgid "<b>Write your story here.</b> Use the top toolbar to style your text: add
msgstr ""
#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.latest_blogs
+msgid "<span class=\"fa fa-folder-open\"/> In"
+msgstr ""
+
+#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
msgid "A new post"
msgstr ""
@@ -91,6 +146,18 @@ msgid "Active"
msgstr ""
#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.s_latest_posts_options
+msgid "All blogs"
+msgstr ""
+
+#. module: website_blog
+#. openerp-web
+#: code:addons/website_blog/static/src/js/s_latest_posts_frontend.js:59
+#, python-format
+msgid "An error occured with this latest posts block. If the problem persists, please consider deleting it and adding a new one"
+msgstr ""
+
+#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.blog_blog_view_search
#: model:ir.ui.view,arch_db:website_blog.view_blog_post_search
msgid "Archived"
@@ -124,7 +191,6 @@ msgstr ""
#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_post__blog_id
-#: model:ir.ui.menu,name:website_blog.menu_website_blog_root
#: model:ir.ui.view,arch_db:website_blog.blog_blog_view_search
#: model:ir.ui.view,arch_db:website_blog.view_blog_blog_form
#: model:ir.ui.view,arch_db:website_blog.view_blog_post_search
@@ -170,7 +236,6 @@ msgstr ""
#: code:addons/website_blog/models/website.py:24
#: code:addons/website_blog/models/website.py:49
#: model:ir.actions.act_window,name:website_blog.action_blog_post
-#: model:ir.ui.menu,name:website_blog.menu_page
#: model:ir.ui.view,arch_db:website_blog.view_blog_post_list
#, python-format
msgid "Blog Posts"
@@ -200,7 +265,9 @@ msgstr ""
#. module: website_blog
#: model:ir.actions.act_window,name:website_blog.action_blog_blog
#: model:ir.model,name:website_blog.model_blog_blog
-#: model:ir.ui.menu,name:website_blog.menu_blog
+#: model:ir.ui.menu,name:website_blog.menu_blog_global
+#: model:ir.ui.menu,name:website_blog.menu_website_blog_root
+#: model:ir.ui.menu,name:website_blog.menu_website_blog_root_global
#: model:ir.ui.view,arch_db:website_blog.view_blog_blog_list
msgid "Blogs"
msgstr ""
@@ -224,6 +291,11 @@ msgid "Change Cover"
msgstr ""
#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.s_latest_posts_options
+msgid "Choose a blog"
+msgstr ""
+
+#. module: website_blog
#. openerp-web
#: code:addons/website_blog/static/src/js/website.tour.blog.js:35
#, python-format
@@ -250,6 +322,11 @@ msgid "Click on <b>Save</b> to set the picture as cover."
msgstr ""
#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.latest_blogs
+msgid "Close"
+msgstr ""
+
+#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_post__content
#: model:ir.ui.view,arch_db:website_blog.view_blog_post_search
msgid "Content"
@@ -295,6 +372,13 @@ msgid "Duplicate"
msgstr ""
#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.blog_post_complete
+#: model:ir.ui.view,arch_db:website_blog.blog_post_short
+#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_follow_us
+msgid "Facebook"
+msgstr ""
+
+#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.website_blog
msgid "Filter Color"
msgstr ""
@@ -333,6 +417,18 @@ msgid "Get in touch with us"
msgstr ""
#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_follow_us
+msgid "Github"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.blog_post_complete
+#: model:ir.ui.view,arch_db:website_blog.blog_post_short
+#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_follow_us
+msgid "Google Plus"
+msgstr ""
+
+#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.website_blog
msgid "Green"
msgstr ""
@@ -374,17 +470,17 @@ msgid "If checked, some messages have a delivery error."
msgstr ""
#. module: website_blog
-#: model:ir.ui.view,arch_db:website_blog.latest_blogs
-msgid "In"
-msgstr ""
-
-#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_blog__message_is_follower
#: model:ir.model.fields,field_description:website_blog.field_blog_post__message_is_follower
msgid "Is Follower"
msgstr ""
#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_post__is_published
+msgid "Is published"
+msgstr ""
+
+#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_post__write_uid
#: model:ir.ui.view,arch_db:website_blog.view_blog_post_search
msgid "Last Contributor"
@@ -415,10 +511,19 @@ msgstr ""
#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.latest_blogs
+#: model:ir.ui.view,arch_db:website_blog.s_latest_posts
+#: model:ir.ui.view,arch_db:website_blog.s_latest_posts_big_picture
msgid "Latest Posts"
msgstr ""
#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.blog_post_complete
+#: model:ir.ui.view,arch_db:website_blog.blog_post_short
+#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_follow_us
+msgid "LinkedIn"
+msgstr ""
+
+#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.website_blog
msgid "Low"
msgstr ""
@@ -465,11 +570,23 @@ msgid "New Blog Post"
msgstr ""
#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_history
+msgid "Next year"
+msgstr ""
+
+#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.website_blog
msgid "No Cover"
msgstr ""
#. module: website_blog
+#. openerp-web
+#: code:addons/website_blog/static/src/js/s_latest_posts_frontend.js:44
+#, python-format
+msgid "No blog post was found. Make sure your posts are published."
+msgstr ""
+
+#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.blog_post_short
msgid "No blog post yet."
msgstr ""
@@ -514,6 +631,11 @@ msgid "Number of messages with delivery error"
msgstr ""
#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.s_latest_posts_options
+msgid "Number of posts"
+msgstr ""
+
+#. module: website_blog
#: model:ir.model.fields,help:website_blog.field_blog_blog__message_unread_counter
#: model:ir.model.fields,help:website_blog.field_blog_post__message_unread_counter
msgid "Number of unread messages"
@@ -583,11 +705,22 @@ msgid "Purple"
msgstr ""
#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_follow_us
+msgid "RSS"
+msgstr ""
+
+#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_post__ranking
msgid "Ranking"
msgstr ""
#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.s_latest_posts_big_picture_template
+#: model:ir.ui.view,arch_db:website_blog.s_latest_posts_list_template
+msgid "Read More"
+msgstr ""
+
+#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.opt_blog_post_complete_read_next
msgid "Read Next <span class=\"fa fa-long-arrow-right\"/>"
msgstr ""
@@ -598,6 +731,12 @@ msgid "Red"
msgstr ""
#. module: website_blog
+#: model:ir.model.fields,help:website_blog.field_blog_blog__website_id
+#: model:ir.model.fields,help:website_blog.field_blog_post__website_id
+msgid "Restrict publishing to this website."
+msgstr ""
+
+#. module: website_blog
#. openerp-web
#: code:addons/website_blog/static/src/js/website.tour.blog.js:15
#, python-format
@@ -623,7 +762,7 @@ msgstr ""
#. module: website_blog
#. openerp-web
-#: code:addons/website_blog/models/website_blog.py:137
+#: code:addons/website_blog/models/website_blog.py:138
#: code:addons/website_blog/static/src/js/website.tour.blog.js:52
#, python-format
msgid "Start writing here..."
@@ -651,7 +790,7 @@ msgid "Subtitle"
msgstr ""
#. module: website_blog
-#: model:ir.ui.menu,name:website_blog.menu_website_blog_tag_category
+#: model:ir.ui.menu,name:website_blog.menu_website_blog_tag_category_global
#: model:ir.ui.view,arch_db:website_blog.blog_tag_category_tree
msgid "Tag Categories"
msgstr ""
@@ -689,7 +828,7 @@ msgstr ""
#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_post__tag_ids
#: model:ir.model.fields,field_description:website_blog.field_blog_tag_category__tag_ids
-#: model:ir.ui.menu,name:website_blog.menu_blog_tag
+#: model:ir.ui.menu,name:website_blog.menu_blog_tag_global
#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_tags
msgid "Tags"
msgstr ""
@@ -731,6 +870,18 @@ msgid "Title"
msgstr ""
#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.blog_post_complete
+msgid "To blog content"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.blog_post_complete
+#: model:ir.ui.view,arch_db:website_blog.blog_post_short
+#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_follow_us
+msgid "Twitter"
+msgstr ""
+
+#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_status
msgid "Unpublished"
msgstr ""
@@ -766,11 +917,13 @@ msgstr ""
#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_post__website_published
-msgid "Visible in Website"
+msgid "Visible on current website"
msgstr ""
#. module: website_blog
#: model:ir.model,name:website_blog.model_website
+#: model:ir.model.fields,field_description:website_blog.field_blog_blog__website_id
+#: model:ir.model.fields,field_description:website_blog.field_blog_post__website_id
msgid "Website"
msgstr ""
@@ -818,6 +971,13 @@ msgid "Website meta title"
msgstr ""
#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_blog__website_meta_og_img
+#: model:ir.model.fields,field_description:website_blog.field_blog_post__website_meta_og_img
+#: model:ir.model.fields,field_description:website_blog.field_blog_tag__website_meta_og_img
+msgid "Website opengraph image"
+msgstr ""
+
+#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.website_blog
msgid "White"
msgstr ""
@@ -847,6 +1007,11 @@ msgid "You should <strong>add a banner on the top</strong> as it is a frequent l
msgstr ""
#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_follow_us
+msgid "Youtube"
+msgstr ""
+
+#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
msgid "blog. Click here to access the blog :"
msgstr ""
@@ -864,14 +1029,14 @@ msgid "comments"
msgstr ""
#. module: website_blog
-#: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
-msgid "has been published on the"
+#: model:ir.ui.view,arch_db:website_blog.blog_post_short
+#: model:ir.ui.view,arch_db:website_blog.latest_blogs
+msgid "float-right"
msgstr ""
#. module: website_blog
-#: model:ir.ui.view,arch_db:website_blog.blog_post_short
-#: model:ir.ui.view,arch_db:website_blog.latest_blogs
-msgid "pull-right"
+#: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
+msgid "has been published on the"
msgstr ""
#. module: website_blog
diff --git a/addons/website_crm/i18n/website_crm.pot b/addons/website_crm/i18n/website_crm.pot
index c24dd340a5f..6a1e264783d 100644
--- a/addons/website_crm/i18n/website_crm.pot
+++ b/addons/website_crm/i18n/website_crm.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:10+0000\n"
-"PO-Revision-Date: 2018-03-22 14:10+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -22,12 +22,6 @@ msgid "&amp;times;"
msgstr ""
#. module: website_crm
-#: model:ir.ui.view,arch_db:website_crm.contactus_form
-msgid "<span class=\"btn btn-primary btn-lg o_website_form_send\">Send</span>\n"
-" <span id=\"o_website_form_result\"/>"
-msgstr ""
-
-#. module: website_crm
#: model:ir.ui.view,arch_db:website_crm.res_config_settings_view_form
msgid "Add a contact form in the"
msgstr ""
@@ -49,12 +43,18 @@ msgstr ""
#. module: website_crm
#: model:ir.model.fields,field_description:website_crm.field_res_config_settings__crm_default_team_id
-msgid "Default Sales Channel"
+msgid "Default Sales Team"
+msgstr ""
+
+#. module: website_crm
+#: model:ir.model.fields,help:website_crm.field_res_config_settings__crm_default_team_id
+#: model:ir.model.fields,help:website_crm.field_website__crm_default_team_id
+msgid "Default Sales Team for new leads created through the Contact Us form."
msgstr ""
#. module: website_crm
#: model:ir.model.fields,field_description:website_crm.field_website__crm_default_team_id
-msgid "Default Sales Channels"
+msgid "Default Sales Teams"
msgstr ""
#. module: website_crm
@@ -64,12 +64,6 @@ msgid "Default Salesperson"
msgstr ""
#. module: website_crm
-#: model:ir.model.fields,help:website_crm.field_res_config_settings__crm_default_team_id
-#: model:ir.model.fields,help:website_crm.field_website__crm_default_team_id
-msgid "Default sales channel for new leads created through the Contact Us form."
-msgstr ""
-
-#. module: website_crm
#: model:ir.model.fields,help:website_crm.field_res_config_settings__crm_default_user_id
#: model:ir.model.fields,help:website_crm.field_website__crm_default_user_id
msgid "Default salesperson for new leads created through the Contact Us form."
@@ -103,7 +97,12 @@ msgstr ""
#. module: website_crm
#: model:ir.ui.view,arch_db:website_crm.res_config_settings_view_form
-msgid "Sales Channel"
+msgid "Please set a Sales Team for the website. Otherwise you can't follow related events."
+msgstr ""
+
+#. module: website_crm
+#: model:ir.ui.view,arch_db:website_crm.res_config_settings_view_form
+msgid "Sales Team"
msgstr ""
#. module: website_crm
@@ -113,6 +112,11 @@ msgstr ""
#. module: website_crm
#: model:ir.ui.view,arch_db:website_crm.contactus_form
+msgid "Send"
+msgstr ""
+
+#. module: website_crm
+#: model:ir.ui.view,arch_db:website_crm.contactus_form
msgid "Subject"
msgstr ""
diff --git a/addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot b/addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot
index e60adfb496b..f3b7ea1222b 100644
--- a/addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot
+++ b/addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,40 +16,6 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_crm_partner_assign
-#: model:mail.template,body_html:website_crm_partner_assign.email_template_lead_forward_mail
-msgid "\n"
-"<p>Hello,</p>\n"
-"\n"
-"\n"
-"<p>We have been contacted by those prospects that are in your region. Thus, the following leads have been assigned to ${ctx['partner_id'].name}:</p>\n"
-"\n"
-"<ol>\n"
-"% for lead in ctx['partner_leads']:\n"
-" <li><a href=\"${lead.lead_link}\">${lead.lead_id.name or 'Subject Undefined'}</a>, ${lead.lead_id.partner_name or lead.lead_id.contact_name or 'Contact Name Undefined'}, ${lead.lead_id.country_id and lead.lead_id.country_id.name or 'Country Undefined' }, ${lead.lead_id.email_from or 'Email Undefined'}, ${lead.lead_id.phone or ''} </li><br/>\n"
-"% endfor\n"
-"</ol>\n"
-"\n"
-"% if ctx.get('partner_in_portal'):\n"
-"<p>Please connect to your <a href=\"${object.get_portal_url()}\">Partner Portal</a> to get details. On each lead are two buttons on the top left corner that you should press after having contacted the lead: \"I'm interested\" & \"I'm not interested\".</p>\n"
-"% else:\n"
-"<p>\n"
-" You do not have yet a portal access to our database. Please contact \n"
-" ${ctx['partner_id'].user_id and ctx['partner_id'].user_id.email and 'your account manager %s (%s)' % (ctx['partner_id'].user_id.name,ctx['partner_id'].user_id.email) or 'us'}.\n"
-"</p>\n"
-"% endif\n"
-"<p>The lead will be sent to another partner if you do not contact the lead before 20 days.</p>\n"
-"\n"
-"<p>Thanks,</p>\n"
-"\n"
-"${ctx['partner_id'].user_id and ctx['partner_id'].user_id.signature | safe or ''}\n"
-"\n"
-"% if not ctx['partner_id'].user_id:\n"
-"PS: It looks like you do not have an account manager assigned to you, please contact us.\n"
-"% endif\n"
-" "
-msgstr ""
-
-#. module: website_crm_partner_assign
#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign__nbr_cases
msgid "# of Cases"
msgstr ""
@@ -119,6 +85,106 @@ msgid "<strong>Message and communication history</strong>"
msgstr ""
#. module: website_crm_partner_assign
+#: model:mail.template,body_html:website_crm_partner_assign.email_template_lead_forward_mail
+msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your leads</span><br/>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" t-att-alt=\"'%s' % company.name\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr>\n"
+" <td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div>\n"
+" Hello,<br/>\n"
+" We have been contacted by those prospects that are in your region. Thus, the following leads have been assigned to ${ctx['partner_id'].name}:<br/>\n"
+" <ol>\n"
+" % for lead in ctx['partner_leads']:\n"
+" <li><a href=\"${lead.lead_link}\">${lead.lead_id.name or 'Subject Undefined'}</a>, ${lead.lead_id.partner_name or lead.lead_id.contact_name or 'Contact Name Undefined'}, ${lead.lead_id.country_id and lead.lead_id.country_id.name or 'Country Undefined' }, ${lead.lead_id.email_from or 'Email Undefined'}, ${lead.lead_id.phone or ''} </li><br/>\n"
+" % endfor\n"
+" </ol>\n"
+" % if ctx.get('partner_in_portal'):\n"
+" Please connect to your <a href=\"${object.get_portal_url()}\">Partner Portal</a> to get details. On each lead are two buttons on the top left corner that you should press after having contacted the lead: \"I'm interested\" &amp; \"I'm not interested\".<br/>\n"
+" % else:\n"
+" You do not have yet a portal access to our database. Please contact\n"
+" ${ctx['partner_id'].user_id and ctx['partner_id'].user_id.email and 'your account manager %s (%s)' % (ctx['partner_id'].user_id.name,ctx['partner_id'].user_id.email) or 'us'}.<br/>\n"
+" % endif\n"
+" The lead will be sent to another partner if you do not contact the lead before 20 days.<br/><br/>\n"
+" Thank you,<br/>\n"
+" ${ctx['partner_id'].user_id and ctx['partner_id'].user_id.signature | safe or ''}\n"
+" <br/>\n"
+" % if not ctx['partner_id'].user_id:\n"
+" PS: It looks like you do not have an account manager assigned to you, please contact us.\n"
+" % endif\n"
+" </div>\n"
+" </td>\n"
+" </tr>\n"
+" <tr>\n"
+" <td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" ${user.company_id.phone}\n"
+" % if user.company_id.phone and (user.company_id.email or user.company_id.website)\n"
+" |\n"
+" % endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a>\n"
+" % endif\n"
+" % if user.company_id.email and user.company_id.website\n"
+" |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">\n"
+" ${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=website\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_crm_partner_assign
#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_partner_report_assign__activation
#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner__activation
#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_users__activation
@@ -136,6 +202,11 @@ msgid "Active"
msgstr ""
#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
+msgid "Add an opportunity"
+msgstr ""
+
+#. module: website_crm_partner_assign
#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
msgid "Address"
@@ -171,11 +242,6 @@ msgid "Assign salesman of assigned partner"
msgstr ""
#. module: website_crm_partner_assign
-#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead__date_assign
-msgid "Assignation Date"
-msgstr ""
-
-#. module: website_crm_partner_assign
#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead__partner_assigned_id
#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation__partner_assigned_id
#: model:ir.ui.view,arch_db:website_crm_partner_assign.crm_lead_partner_filter
@@ -231,6 +297,14 @@ msgid "City"
msgstr ""
#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.ref_country
+msgid "Close"
+msgstr ""
+
+#. module: website_crm_partner_assign
#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign__date_closed
msgid "Close Date"
msgstr ""
@@ -551,6 +625,11 @@ msgid "Invoice Account Date"
msgstr ""
#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade__is_published
+msgid "Is published"
+msgstr ""
+
+#. module: website_crm_partner_assign
#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation____last_update
#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_forward_to_partner____last_update
#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign____last_update
@@ -831,6 +910,11 @@ msgid "Partner Assignation"
msgstr ""
#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead__date_assign
+msgid "Partner Assignation Date"
+msgstr ""
+
+#. module: website_crm_partner_assign
#: model:ir.actions.act_window,name:website_crm_partner_assign.res_partner_grade_action
#: model:ir.ui.menu,name:website_crm_partner_assign.menu_res_partner_grade_action
#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_partner_grade_form
@@ -925,6 +1009,36 @@ msgid "Rating"
msgstr ""
#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+msgid "Rating: #{lead.priority} on 3"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Rating: #{opportunity.priority} on 4"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Rating: 0 on 3"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Rating: 1 on 3"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Rating: 2 on 3"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Rating: 3 on 3"
+msgstr ""
+
+#. module: website_crm_partner_assign
#: model:ir.ui.view,arch_db:website_crm_partner_assign.references_block
msgid "References"
msgstr ""
@@ -942,7 +1056,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_lead_assign_filter
#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_partner_assign_filter
-msgid "Sales Channel"
+msgid "Sales Team"
msgstr ""
#. module: website_crm_partner_assign
@@ -1097,7 +1211,7 @@ msgstr ""
#. module: website_crm_partner_assign
#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade__website_published
-msgid "Visible in Website"
+msgid "Visible on current website"
msgstr ""
#. module: website_crm_partner_assign
@@ -1163,6 +1277,11 @@ msgid "e.g. Gold Partner"
msgstr ""
#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.index
+msgid "float-left"
+msgstr ""
+
+#. module: website_crm_partner_assign
#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
msgid "on"
msgstr ""
@@ -1174,11 +1293,6 @@ msgstr ""
#. module: website_crm_partner_assign
#: model:ir.ui.view,arch_db:website_crm_partner_assign.index
-msgid "pull-left"
-msgstr ""
-
-#. module: website_crm_partner_assign
-#: model:ir.ui.view,arch_db:website_crm_partner_assign.index
msgid "reference(s)"
msgstr ""
diff --git a/addons/website_customer/i18n/website_customer.pot b/addons/website_customer/i18n/website_customer.pot
index fa580622438..d7a5f736292 100644
--- a/addons/website_customer/i18n/website_customer.pot
+++ b/addons/website_customer/i18n/website_customer.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -53,6 +53,11 @@ msgid "Class"
msgstr ""
#. module: website_customer
+#: model:ir.ui.view,arch_db:website_customer.opt_country
+msgid "Close"
+msgstr ""
+
+#. module: website_customer
#: model:ir.model,name:website_customer.model_res_partner
msgid "Contact"
msgstr ""
@@ -88,6 +93,11 @@ msgid "Implemented By"
msgstr ""
#. module: website_customer
+#: model:ir.model.fields,field_description:website_customer.field_res_partner_tag__is_published
+msgid "Is published"
+msgstr ""
+
+#. module: website_customer
#: model:ir.model.fields,field_description:website_customer.field_res_partner_tag____last_update
msgid "Last Modified on"
msgstr ""
@@ -171,7 +181,7 @@ msgstr ""
#. module: website_customer
#: model:ir.model.fields,field_description:website_customer.field_res_partner_tag__website_published
-msgid "Visible in Website"
+msgid "Visible on current website"
msgstr ""
#. module: website_customer
diff --git a/addons/website_event/i18n/website_event.pot b/addons/website_event/i18n/website_event.pot
index 2c2facd3f8c..b480753b9d8 100644
--- a/addons/website_event/i18n/website_event.pot
+++ b/addons/website_event/i18n/website_event.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:06+0000\n"
+"PO-Revision-Date: 2018-08-24 09:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -58,24 +58,30 @@ msgid "<br/>\n"
msgstr ""
#. module: website_event
+#: model:ir.ui.view,arch_db:website_event.registration_template
+msgid "<em><i class=\"fa fa-plus-circle\" role=\"img\" aria-label=\"Create\" title=\"Create\"/>\n"
+" Configure and Launch Event Registration</em>"
+msgstr ""
+
+#. module: website_event
#: model:ir.ui.view,arch_db:website_event.event_description_full
msgid "<i class=\"fa fa-clock-o\"/> From"
msgstr ""
#. module: website_event
-#: model:ir.ui.view,arch_db:website_event.registration_complete
-msgid "<i class=\"fa fa-fw fa-arrow-right\"/>Add to Google Calendar"
+#: model:ir.ui.view,arch_db:website_event.event_right_country_event
+msgid "<i class=\"fa fa-flag fa-5x\"/>\n"
+" Events from Your Country"
msgstr ""
#. module: website_event
#: model:ir.ui.view,arch_db:website_event.registration_complete
-msgid "<i class=\"fa fa-fw fa-arrow-right\"/>Add to iCal/Outlook"
+msgid "<i class=\"fa fa-fw fa-arrow-right\"/>Add to Google Calendar"
msgstr ""
#. module: website_event
-#: model:ir.ui.view,arch_db:website_event.registration_template
-msgid "<i class=\"fa fa-plus-circle\"/>\n"
-" <em>Configure and Launch Event Registration</em>"
+#: model:ir.ui.view,arch_db:website_event.registration_complete
+msgid "<i class=\"fa fa-fw fa-arrow-right\"/>Add to iCal/Outlook"
msgstr ""
#. module: website_event
@@ -226,6 +232,11 @@ msgstr ""
#. module: website_event
#: model:ir.ui.view,arch_db:website_event.registration_attendee_details
+msgid "Close"
+msgstr ""
+
+#. module: website_event
+#: model:ir.ui.view,arch_db:website_event.registration_attendee_details
msgid "Continue"
msgstr ""
@@ -336,11 +347,6 @@ msgid "Events"
msgstr ""
#. module: website_event
-#: model:ir.ui.view,arch_db:website_event.event_right_country_event
-msgid "Events from Your Country"
-msgstr ""
-
-#. module: website_event
#: model:ir.ui.view,arch_db:website_event.country_events
msgid "Events in visitor's country"
msgstr ""
@@ -357,7 +363,12 @@ msgid "Find out what people see and say about this event,\n"
msgstr ""
#. module: website_event
-#: code:addons/website_event/models/event.py:73
+#: model:ir.ui.view,arch_db:website_event.event_description_full
+msgid "Google Maps"
+msgstr ""
+
+#. module: website_event
+#: code:addons/website_event/models/event.py:70
#, python-format
msgid "Introduction"
msgstr ""
@@ -368,7 +379,12 @@ msgid "Is Participating"
msgstr ""
#. module: website_event
-#: code:addons/website_event/models/event.py:74
+#: model:ir.model.fields,field_description:website_event.field_event_event__is_published
+msgid "Is published"
+msgstr ""
+
+#. module: website_event
+#: code:addons/website_event/models/event.py:71
#, python-format
msgid "Location"
msgstr ""
@@ -385,7 +401,7 @@ msgstr ""
#. module: website_event
#. openerp-web
-#: code:addons/website_event/controllers/main.py:191
+#: code:addons/website_event/controllers/main.py:200
#: code:addons/website_event/static/src/js/website_event.editor.js:29
#: model:ir.ui.view,arch_db:website_event.content_new_event
#, python-format
@@ -393,25 +409,25 @@ msgid "New Event"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:40
+#: code:addons/website_event/controllers/main.py:39
#, python-format
msgid "Next Events"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:49
+#: code:addons/website_event/controllers/main.py:48
#, python-format
msgid "Next Week"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:57
+#: code:addons/website_event/controllers/main.py:56
#, python-format
msgid "Next month"
msgstr ""
#. module: website_event
-#: code:addons/website_event/models/event.py:152
+#: code:addons/website_event/models/event.py:150
#, python-format
msgid "No date has been specified for the event, no file will be generated."
msgstr ""
@@ -427,12 +443,6 @@ msgid "Odoo"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:61
-#, python-format
-msgid "Old Events"
-msgstr ""
-
-#. module: website_event
#. openerp-web
#: code:addons/website_event/static/src/js/website.tour.event.js:33
#, python-format
@@ -471,6 +481,12 @@ msgid "Participating"
msgstr ""
#. module: website_event
+#: code:addons/website_event/controllers/main.py:60
+#, python-format
+msgid "Past Events"
+msgstr ""
+
+#. module: website_event
#: model:ir.ui.view,arch_db:website_event.registration_complete
msgid "Phone"
msgstr ""
@@ -513,7 +529,7 @@ msgid "Reference"
msgstr ""
#. module: website_event
-#: code:addons/website_event/models/event.py:75
+#: code:addons/website_event/models/event.py:72
#, python-format
msgid "Register"
msgstr ""
@@ -529,6 +545,11 @@ msgid "Registration for this event is now closed"
msgstr ""
#. module: website_event
+#: model:ir.model.fields,help:website_event.field_event_event__website_id
+msgid "Restrict publishing to this website."
+msgstr ""
+
+#. module: website_event
#: model:ir.ui.view,arch_db:website_event.404
msgid "Return to the event list."
msgstr ""
@@ -559,13 +580,13 @@ msgid "The full URL to access the document through the website."
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:45
+#: code:addons/website_event/controllers/main.py:44
#, python-format
msgid "This Week"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:53
+#: code:addons/website_event/controllers/main.py:52
#, python-format
msgid "This month"
msgstr ""
@@ -576,7 +597,7 @@ msgid "Ticket Type #"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:41
+#: code:addons/website_event/controllers/main.py:40
#, python-format
msgid "Today"
msgstr ""
@@ -588,7 +609,7 @@ msgstr ""
#. module: website_event
#: model:ir.model.fields,field_description:website_event.field_event_event__website_published
-msgid "Visible in Website"
+msgid "Visible on current website"
msgstr ""
#. module: website_event
@@ -602,6 +623,11 @@ msgid "We are glad to confirm your registration to our event"
msgstr ""
#. module: website_event
+#: model:ir.model.fields,field_description:website_event.field_event_event__website_id
+msgid "Website"
+msgstr ""
+
+#. module: website_event
#: model:ir.actions.act_url,name:website_event.action_open_website
msgid "Website Home"
msgstr ""
@@ -632,6 +658,11 @@ msgid "Website meta title"
msgstr ""
#. module: website_event
+#: model:ir.model.fields,field_description:website_event.field_event_event__website_meta_og_img
+msgid "Website opengraph image"
+msgstr ""
+
+#. module: website_event
#: model:ir.ui.view,arch_db:website_event.event_description_full
msgid "When"
msgstr ""
diff --git a/addons/website_event_sale/i18n/website_event_sale.pot b/addons/website_event_sale/i18n/website_event_sale.pot
index 3a8864f8fed..9fd0f89b702 100644
--- a/addons/website_event_sale/i18n/website_event_sale.pot
+++ b/addons/website_event_sale/i18n/website_event_sale.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -36,6 +36,11 @@ msgid "Event Tickets"
msgstr ""
#. module: website_event_sale
+#: model:ir.ui.view,arch_db:website_event_sale.registration_complete_inherit_website_event_sale
+msgid "N/A"
+msgstr ""
+
+#. module: website_event_sale
#: model:ir.ui.view,arch_db:website_event_sale.index
msgid "Only"
msgstr ""
@@ -62,6 +67,11 @@ msgid "Remaining"
msgstr ""
#. module: website_event_sale
+#: model:ir.model,name:website_event_sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: website_event_sale
#: model:ir.ui.view,arch_db:website_event_sale.index
msgid "Sold Out"
msgstr ""
@@ -85,6 +95,11 @@ msgid "The ticket doesn't match with this product."
msgstr ""
#. module: website_event_sale
+#: model:ir.ui.view,arch_db:website_event_sale.registration_complete_inherit_website_event_sale
+msgid "Ticket"
+msgstr ""
+
+#. module: website_event_sale
#: model:ir.model,name:website_event_sale.model_website
msgid "Website"
msgstr ""
diff --git a/addons/website_event_track/i18n/website_event_track.pot b/addons/website_event_track/i18n/website_event_track.pot
index 5db1634c3e0..b98a4890153 100644
--- a/addons/website_event_track/i18n/website_event_track.pot
+++ b/addons/website_event_track/i18n/website_event_track.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -282,6 +282,11 @@ msgid "Documents"
msgstr ""
#. module: website_event_track
+#: model:ir.ui.view,arch_db:website_event_track.view_event_track_kanban
+msgid "Dropdown menu"
+msgstr ""
+
+#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_track__duration
msgid "Duration"
msgstr ""
@@ -495,6 +500,11 @@ msgid "Is Follower"
msgstr ""
#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__is_published
+msgid "Is published"
+msgstr ""
+
+#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_track__kanban_state
msgid "Kanban State"
msgstr ""
@@ -1064,7 +1074,7 @@ msgstr ""
#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_track__website_published
-msgid "Visible in Website"
+msgid "Visible on current website"
msgstr ""
#. module: website_event_track
@@ -1119,6 +1129,11 @@ msgid "Website meta title"
msgstr ""
#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__website_meta_og_img
+msgid "Website opengraph image"
+msgstr ""
+
+#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.event_track_proposal
msgid "Your Email"
msgstr ""
diff --git a/addons/website_form/i18n/website_form.pot b/addons/website_form/i18n/website_form.pot
index 7eeda007081..8ee53c1c4cc 100644
--- a/addons/website_form/i18n/website_form.pot
+++ b/addons/website_form/i18n/website_form.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -75,6 +75,14 @@ msgid "Enable writing metadata on form submit."
msgstr ""
#. module: website_form
+#. openerp-web
+#: code:addons/website_form/static/src/xml/website_form.xml:14
+#: code:addons/website_form/static/src/xml/website_form.xml:21
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: website_form
#: model:ir.model.fields,field_description:website_form.field_ir_model__website_form_default_field_id
msgid "Field for custom form data"
msgstr ""
@@ -121,6 +129,13 @@ msgstr ""
#. openerp-web
#: code:addons/website_form/static/src/xml/website_form.xml:7
#, python-format
+msgid "Success"
+msgstr ""
+
+#. module: website_form
+#. openerp-web
+#: code:addons/website_form/static/src/xml/website_form.xml:7
+#, python-format
msgid "The form has been sent successfully."
msgstr ""
diff --git a/addons/website_forum/i18n/website_forum.pot b/addons/website_forum/i18n/website_forum.pot
index e8cb342fe75..bacc92ac46a 100644
--- a/addons/website_forum/i18n/website_forum.pot
+++ b/addons/website_forum/i18n/website_forum.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,47 +16,6 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_forum
-#: model:mail.template,body_html:website_forum.validation_email
-msgid "\n"
-"<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n"
-" <tbody><tr>\n"
-" <td valign=\"center\" width=\"200\" style=\"padding:0px 10px 5px 5px; font-size: 12px\">\n"
-" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\">\n"
-" </td>\n"
-" </tr></tbody>\n"
-" </table>\n"
-"</div>\n"
-"<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n"
-" <tbody><tr>\n"
-" <td valign=\"top\" style=\"width:600px; padding:0px 10px 5px 5px;\">\n"
-" <div>\n"
-" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:0px auto;padding:0\">\n"
-" </div>\n"
-" </td>\n"
-" </tr></tbody>\n"
-" </table>\n"
-"</div>\n"
-"<div style=\"padding:0px; width:600px; max-width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px ;text-align:justify; margin:0 auto; border-collapse:collapse; background:inherit; color:inherit\">\n"
-" <tbody><tr>\n"
-" <td style=\"padding:0px 10px 5px 5px;font-size: 14px;\">\n"
-" <p>Dear ${object.name},</p>\n"
-" <p>You have been invited to validate your email in order to get access to\n"
-" \"${object.company_id.name}\" Q/A Forums.</p>\n"
-" <p>To validate your email, please click on the following link:</p>\n"
-" <a style=\"margin-left: 15px; padding:5px 10px; border-radius: 3px; background-color:#875A7B; text-align:center; text-decoration:none; color:#F7FBFD;\" href=\"${ctx.get('token_url')}\">\n"
-" Validate my account for \"${object.company_id.name}\" Q/A Forums\n"
-" </a>\n"
-" <p>Thanks for your participation!</p>\n"
-" </td>\n"
-" </tr></tbody>\n"
-" </table>\n"
-"</div>"
-msgstr ""
-
-#. module: website_forum
#. openerp-web
#: code:addons/website_forum/static/src/js/website_forum.js:24
#, python-format
@@ -70,7 +29,7 @@ msgstr ""
#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.tag
-msgid "&amp;nbsp;&amp;nbsp;<i class=\"fa fa-times\"/>&amp;nbsp;&amp;nbsp;"
+msgid "&amp;nbsp;&amp;nbsp;<i class=\"fa fa-times\" title=\"Close\" role=\"img\" aria-label=\"Close\"/>&amp;nbsp;&amp;nbsp;"
msgstr ""
#. module: website_forum
@@ -242,6 +201,21 @@ msgid "<b>[Answer]</b>"
msgstr ""
#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.header
+msgid "<i class=\"fa fa-arrow-right\"/> Back to"
+msgstr ""
+
+#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.header
+msgid "<i class=\"fa fa-arrow-right\"/> Read Guidelines"
+msgstr ""
+
+#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.user_detail_full
+msgid "<i class=\"fa fa-arrow-right\"/>Edit Your Profile"
+msgstr ""
+
+#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.badge
msgid "<i class=\"text-muted\"> awarded users</i>"
msgstr ""
@@ -265,15 +239,7 @@ msgstr ""
#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.header
-msgid "<span class=\"caret\"/>\n"
-" <span class=\"sr-only\">Select Post</span>"
-msgstr ""
-
-#. module: website_forum
-#: model:ir.ui.view,arch_db:website_forum.header
-msgid "<span class=\"sr-only\">Toggle navigation</span>\n"
-" <span class=\"icon-bar\"/>\n"
-" <span class=\"icon-bar\"/>"
+msgid "<span class=\"sr-only\">Select Post</span>"
msgstr ""
#. module: website_forum
@@ -314,6 +280,101 @@ msgid "<span>By </span>"
msgstr ""
#. module: website_forum
+#: model:mail.template,body_html:website_forum.validation_email
+msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr>\n"
+" <td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Forum</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">\n"
+" ${object.company_id.name} Forum validation\n"
+" </span>\n"
+" </td>\n"
+" <td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td>\n"
+" </tr>\n"
+" <tr>\n"
+" <td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr>\n"
+" <td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+" Hello ${object.name},<br/><br/>\n"
+" You have been invited to validate your email in order to get access to \"${object.company_id.name}\" Q/A Forums.\n"
+" To validate your email, please click on the following link:\n"
+" <div style=\"margin: 16px 0px 16px 0px;\">\n"
+" <a href=\"${ctx.get('token_url')}\" style=\"background-color: #875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:13px;\">\n"
+" Validate my account\n"
+" </a>\n"
+" </div>\n"
+" Thanks for your participation!\n"
+" </p>\n"
+" </td>\n"
+" </tr>\n"
+" <tr>\n"
+" <td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\" font-family: 'Verdana Regular'; color: #454748; min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr>\n"
+" <td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td>\n"
+" <td valign=\"middle\" align=\"right\" style=\"opacity: 0.7;\">\n"
+" ${user.company_id.phone}\n"
+" % if user.company_id.email:\n"
+" | <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">\n"
+" ${user.company_id.email}\n"
+" </a>\n"
+" % endif\n"
+" % if user.company_id.website:\n"
+" | <a href=\"${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">\n"
+" ${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=forum\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.forum_post_template_new_answer
msgid "A new answer on"
msgstr ""
@@ -398,7 +459,7 @@ msgid "After posting the user will be proposed to share its question or answer o
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/controllers/main.py:196
+#: code:addons/website_forum/controllers/main.py:201
#: model:ir.ui.view,arch_db:website_forum.forum_index
#, python-format
msgid "All"
@@ -410,7 +471,12 @@ msgid "Allow Bump"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:511
+#: model:ir.ui.view,arch_db:website_forum.display_post_question_block
+msgid "Answer"
+msgstr ""
+
+#. module: website_forum
+#: code:addons/website_forum/models/forum.py:520
#: model:mail.message.subtype,description:website_forum.mt_answer_edit
#: model:mail.message.subtype,name:website_forum.mt_answer_edit
#, python-format
@@ -489,6 +555,7 @@ msgstr ""
#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_post__child_ids
+#: model:ir.ui.view,arch_db:website_forum.display_post_question_block
#: model:ir.ui.view,arch_db:website_forum.user_detail_full
#: model:ir.ui.view,arch_db:website_forum.view_forum_post_form
#: model:ir.ui.view,arch_db:website_forum.view_forum_post_search
@@ -589,19 +656,23 @@ msgid "Autobiographer"
msgstr ""
#. module: website_forum
-#: model:ir.ui.view,arch_db:website_forum.new_question
-msgid "Avoid unnecessary introductions (Hi,... Please... Thanks...),"
+#: model:ir.ui.view,arch_db:website_forum.edit_profile
+#: model:ir.ui.view,arch_db:website_forum.forum_user_tooltip
+#: model:ir.ui.view,arch_db:website_forum.post_answers
+#: model:ir.ui.view,arch_db:website_forum.user_detail_full
+#: model:ir.ui.view,arch_db:website_forum.users
+msgid "Avatar"
msgstr ""
#. module: website_forum
-#: model:ir.ui.view,arch_db:website_forum.header
-msgid "Back to"
+#: model:ir.ui.view,arch_db:website_forum.new_question
+msgid "Avoid unnecessary introductions (Hi,... Please... Thanks...),"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/controllers/main.py:336
-#: code:addons/website_forum/controllers/main.py:338
-#: code:addons/website_forum/controllers/main.py:407
+#: code:addons/website_forum/controllers/main.py:341
+#: code:addons/website_forum/controllers/main.py:343
+#: code:addons/website_forum/controllers/main.py:412
#, python-format
msgid "Bad Request"
msgstr ""
@@ -627,6 +698,17 @@ msgid "Biography"
msgstr ""
#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.badge
+msgid "Bronwe badge"
+msgstr ""
+
+#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.badge
+#: model:ir.ui.view,arch_db:website_forum.user_badges
+msgid "Bronze badge"
+msgstr ""
+
+#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_res_users__bronze_badge
msgid "Bronze badges count"
msgstr ""
@@ -740,6 +822,11 @@ msgid "City"
msgstr ""
#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.edit_profile
+msgid "Clear"
+msgstr ""
+
+#. module: website_forum
#. openerp-web
#: code:addons/website_forum/static/src/js/website_tour_forum.js:24
#, python-format
@@ -748,7 +835,7 @@ msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:71
+#: code:addons/website_forum/static/src/js/website_tour_forum.js:73
#, python-format
msgid "Click here to accept this answer."
msgstr ""
@@ -770,7 +857,7 @@ msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:64
+#: code:addons/website_forum/static/src/js/website_tour_forum.js:65
#, python-format
msgid "Click to post your answer."
msgstr ""
@@ -783,11 +870,9 @@ msgid "Click to post your question."
msgstr ""
#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/xml/website_forum_share_templates.xml:46
#: selection:forum.post,state:0
+#: model:ir.ui.view,arch_db:website_forum.header
#: model:ir.ui.view,arch_db:website_forum.post_description_full
-#, python-format
msgid "Close"
msgstr ""
@@ -1007,6 +1092,7 @@ msgstr ""
#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.post_answers
+#: model:ir.ui.view,arch_db:website_forum.post_comment
#: model:ir.ui.view,arch_db:website_forum.post_description_full
msgid "Delete"
msgstr ""
@@ -1052,6 +1138,8 @@ msgstr ""
#. module: website_forum
#: selection:forum.forum,default_post_type:0
#: selection:forum.post,post_type:0
+#: model:ir.ui.view,arch_db:website_forum.display_post_question_block
+#: model:ir.ui.view,arch_db:website_forum.post_description_full
msgid "Discussion"
msgstr ""
@@ -1081,6 +1169,7 @@ msgstr ""
#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.edit_post
+#: model:ir.ui.view,arch_db:website_forum.edit_profile
#: model:ir.ui.view,arch_db:website_forum.post_answers
#: model:ir.ui.view,arch_db:website_forum.post_description_full
msgid "Edit"
@@ -1097,11 +1186,6 @@ msgid "Edit Your Previous Answer"
msgstr ""
#. module: website_forum
-#: model:ir.ui.view,arch_db:website_forum.user_detail_full
-msgid "Edit Your Profile"
-msgstr ""
-
-#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_forum__karma_edit_all
msgid "Edit all posts"
msgstr ""
@@ -1160,6 +1244,11 @@ msgid "Enter a name for your new forum."
msgstr ""
#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.display_post_question_block
+msgid "External link"
+msgstr ""
+
+#. module: website_forum
#: model:gamification.badge,name:website_forum.badge_q_3
#: model:gamification.challenge,name:website_forum.challenge_famous_question
msgid "Famous Question"
@@ -1205,6 +1294,11 @@ msgid "Favourite Questions"
msgstr ""
#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.tag
+msgid "Filter"
+msgstr ""
+
+#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.forum_index
msgid "Filter on"
msgstr ""
@@ -1302,6 +1396,8 @@ msgstr ""
#: model:ir.model.fields,field_description:website_forum.field_forum_post_vote__forum_id
#: model:ir.model.fields,field_description:website_forum.field_forum_tag__forum_id
#: model:ir.ui.menu,name:website_forum.menu_website_forum
+#: model:ir.ui.menu,name:website_forum.menu_website_forum_global
+#: model:ir.ui.view,arch_db:website_forum.forum_all
#: model:ir.ui.view,arch_db:website_forum.forum_view_search
#: model:ir.ui.view,arch_db:website_forum.view_forum_forum_form
#: model:ir.ui.view,arch_db:website_forum.view_forum_post_search
@@ -1349,7 +1445,7 @@ msgstr ""
#. module: website_forum
#: model:ir.actions.act_window,name:website_forum.action_forum_forum
-#: model:ir.ui.menu,name:website_forum.menu_forum
+#: model:ir.ui.menu,name:website_forum.menu_forum_global
#: model:ir.ui.view,arch_db:website_forum.view_forum_forum_list
#: model:website.menu,name:website_forum.menu_website_forums
msgid "Forums"
@@ -1378,6 +1474,12 @@ msgid "Give your question title."
msgstr ""
#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.badge
+#: model:ir.ui.view,arch_db:website_forum.user_badges
+msgid "Gold badge"
+msgstr ""
+
+#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_res_users__gold_badge
msgid "Gold badges count"
msgstr ""
@@ -1570,8 +1672,8 @@ msgid "It appears your email has not been verified."
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:882
-#: code:addons/website_forum/models/forum.py:902
+#: code:addons/website_forum/models/forum.py:889
+#: code:addons/website_forum/models/forum.py:909
#, python-format
msgid "It is not allowed to vote for its own post."
msgstr ""
@@ -1669,6 +1771,8 @@ msgstr ""
#. module: website_forum
#: selection:forum.forum,default_post_type:0
+#: model:ir.ui.view,arch_db:website_forum.display_post_question_block
+#: model:ir.ui.view,arch_db:website_forum.post_description_full
msgid "Link"
msgstr ""
@@ -1680,6 +1784,7 @@ msgstr ""
#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.close_post
+#: model:ir.ui.view,arch_db:website_forum.moderation_queue
msgid "Mark as offensive"
msgstr ""
@@ -1729,7 +1834,7 @@ msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/xml/website_forum_share_templates.xml:48
+#: code:addons/website_forum/static/src/xml/website_forum_share_templates.xml:47
#, python-format
msgid "Move this question to the top of the list by sharing it on social networks."
msgstr ""
@@ -1746,6 +1851,12 @@ msgid "Name"
msgstr ""
#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.user_votes
+#: model:ir.ui.view,arch_db:website_forum.vote
+msgid "Negative vote"
+msgstr ""
+
+#. module: website_forum
#: model:mail.message.subtype,description:website_forum.mt_answer_new
#: model:mail.message.subtype,name:website_forum.mt_answer_new
#: model:mail.message.subtype,name:website_forum.mt_forum_answer_new
@@ -1813,7 +1924,7 @@ msgid "Nofollow links"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:501
+#: code:addons/website_forum/models/forum.py:510
#, python-format
msgid "Not enough karma to retag."
msgstr ""
@@ -1980,6 +2091,12 @@ msgid "Popular Question (500)"
msgstr ""
#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.user_votes
+#: model:ir.ui.view,arch_db:website_forum.vote
+msgid "Positive vote"
+msgstr ""
+
+#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_post_vote__post_id
#: model:ir.ui.view,arch_db:website_forum.new_link
#: model:ir.ui.view,arch_db:website_forum.post_comment
@@ -2040,7 +2157,7 @@ msgid "Posted 100 comments"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:438
+#: code:addons/website_forum/models/forum.py:447
#, python-format
msgid "Posting answer on a [Deleted] or [Closed] question is not possible."
msgstr ""
@@ -2072,7 +2189,7 @@ msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:58
+#: code:addons/website_forum/static/src/js/website_tour_forum.js:59
#, python-format
msgid "Put your answer here."
msgstr ""
@@ -2088,11 +2205,13 @@ msgstr ""
#: selection:forum.forum,default_post_type:0
#: selection:forum.post,post_type:0
#: model:ir.model.fields,field_description:website_forum.field_forum_post__parent_id
+#: model:ir.ui.view,arch_db:website_forum.display_post_question_block
+#: model:ir.ui.view,arch_db:website_forum.post_description_full
msgid "Question"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:514
+#: code:addons/website_forum/models/forum.py:523
#: model:mail.message.subtype,description:website_forum.mt_question_edit
#: model:mail.message.subtype,name:website_forum.mt_question_edit
#, python-format
@@ -2130,7 +2249,7 @@ msgid "Question set as favorite by 5 users"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/controllers/main.py:338
+#: code:addons/website_forum/controllers/main.py:343
#, python-format
msgid "Question should not be empty."
msgstr ""
@@ -2169,7 +2288,7 @@ msgid "Questions"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:532
+#: code:addons/website_forum/models/forum.py:541
#, python-format
msgid "Re: %s"
msgstr ""
@@ -2180,11 +2299,6 @@ msgid "Reactivate"
msgstr ""
#. module: website_forum
-#: model:ir.ui.view,arch_db:website_forum.header
-msgid "Read Guidelines"
-msgstr ""
-
-#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.edit_profile
msgid "Real name"
msgstr ""
@@ -2215,6 +2329,11 @@ msgid "Redirect to external link"
msgstr ""
#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.moderation_queue
+msgid "Refuse"
+msgstr ""
+
+#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.post_description_full
msgid "Reject <i class=\"fa fa-times\"/>"
msgstr ""
@@ -2248,6 +2367,12 @@ msgid "Reply to own question"
msgstr ""
#. module: website_forum
+#: model:ir.model.fields,help:website_forum.field_forum_forum__website_id
+#: model:ir.model.fields,help:website_forum.field_forum_post__website_id
+msgid "Restrict publishing to this website."
+msgstr ""
+
+#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.404
#: model:ir.ui.view,arch_db:website_forum.private_profile
msgid "Return to the question list."
@@ -2312,6 +2437,11 @@ msgid "Self-Learner"
msgstr ""
#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.post_answers
+msgid "Send answer"
+msgstr ""
+
+#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.new_question
msgid "Set a clear, explicit and concise question title\n"
" (check"
@@ -2347,6 +2477,12 @@ msgid "Sharing Options"
msgstr ""
#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.badge
+#: model:ir.ui.view,arch_db:website_forum.user_badges
+msgid "Silver badge"
+msgstr ""
+
+#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_res_users__silver_badge
msgid "Silver badges count"
msgstr ""
@@ -2434,7 +2570,7 @@ msgstr ""
#. module: website_forum
#: model:ir.actions.act_window,name:website_forum.forum_tag_action
-#: model:ir.ui.menu,name:website_forum.menu_forum_tag
+#: model:ir.ui.menu,name:website_forum.menu_forum_tag_global
#: model:ir.ui.view,arch_db:website_forum.forum_tag_view_form
#: model:ir.ui.view,arch_db:website_forum.forum_tag_view_list
#: model:ir.ui.view,arch_db:website_forum.view_forum_post_search
@@ -2481,7 +2617,7 @@ msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/xml/website_forum_share_templates.xml:9
+#: code:addons/website_forum/static/src/xml/website_forum_share_templates.xml:6
#, python-format
msgid "Thanks for posting!"
msgstr ""
@@ -2539,7 +2675,7 @@ msgid "This formula is used in order to sort by relevance. The variable 'votes'
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:409
+#: code:addons/website_forum/models/forum.py:410
#, python-format
msgid "This forum does not allow %s"
msgstr ""
@@ -2590,8 +2726,8 @@ msgid "Title must not be empty"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/controllers/main.py:336
-#: code:addons/website_forum/controllers/main.py:407
+#: code:addons/website_forum/controllers/main.py:341
+#: code:addons/website_forum/controllers/main.py:412
#, python-format
msgid "Title should not be empty."
msgstr ""
@@ -2608,6 +2744,11 @@ msgid "To prevent your question from being flagged and possibly removed, avoid a
msgstr ""
#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.post_description_full
+msgid "Toggle favorite status"
+msgstr ""
+
+#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_post__vote_count
msgid "Total Votes"
msgstr ""
@@ -2726,6 +2867,11 @@ msgid "Users can answer only once per question. Contributors can edit answers an
msgstr ""
#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.moderation_queue
+msgid "Validate"
+msgstr ""
+
+#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.forum_post_template_validation
msgid "Validate question"
msgstr ""
@@ -2779,6 +2925,8 @@ msgid "We keep a high level of quality in showcased posts, around 20% of the sub
msgstr ""
#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum__website_id
+#: model:ir.model.fields,field_description:website_forum.field_forum_post__website_id
#: model:ir.ui.view,arch_db:website_forum.edit_profile
msgid "Website"
msgstr ""
@@ -2824,6 +2972,13 @@ msgid "Website meta title"
msgstr ""
#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum__website_meta_og_img
+#: model:ir.model.fields,field_description:website_forum.field_forum_post__website_meta_og_img
+#: model:ir.model.fields,field_description:website_forum.field_forum_tag__website_meta_og_img
+msgid "Website opengraph image"
+msgstr ""
+
+#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_forum__welcome_message
msgid "Welcome Message"
msgstr ""
@@ -2874,7 +3029,7 @@ msgid "You cannot choose %s as default post since the forum does not allow it."
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:428
+#: code:addons/website_forum/models/forum.py:437
#, python-format
msgid "You cannot create recursive forum posts."
msgstr ""
@@ -2885,7 +3040,7 @@ msgid "You cannot post an empty answer"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:946
+#: code:addons/website_forum/models/forum.py:953
#, python-format
msgid "You don't have enough karma to create a new Tag."
msgstr ""
diff --git a/addons/website_forum_doc/i18n/website_forum_doc.pot b/addons/website_forum_doc/i18n/website_forum_doc.pot
index 2b35874c8ef..4de2fcbc77f 100644
--- a/addons/website_forum_doc/i18n/website_forum_doc.pot
+++ b/addons/website_forum_doc/i18n/website_forum_doc.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -52,6 +52,11 @@ msgid "Children Table Of Content"
msgstr ""
#. module: website_forum_doc
+#: model:ir.ui.view,arch_db:website_forum_doc.forum_question_doc
+msgid "Close"
+msgstr ""
+
+#. module: website_forum_doc
#: model:ir.model.fields,field_description:website_forum_doc.field_forum_post__color
msgid "Color Index"
msgstr ""
@@ -121,6 +126,11 @@ msgstr ""
#. module: website_forum_doc
#: model:ir.ui.view,arch_db:website_forum_doc.view_forum_post_kanban
+msgid "Dropdown menu"
+msgstr ""
+
+#. module: website_forum_doc
+#: model:ir.ui.view,arch_db:website_forum_doc.view_forum_post_kanban
msgid "Edit Post"
msgstr ""
@@ -355,6 +365,11 @@ msgid "Website meta title"
msgstr ""
#. module: website_forum_doc
+#: model:ir.model.fields,field_description:website_forum_doc.field_forum_documentation_toc__website_meta_og_img
+msgid "Website opengraph image"
+msgstr ""
+
+#. module: website_forum_doc
#: model:ir.ui.view,arch_db:website_forum_doc.promote_question
msgid "What report should I use to compute probabilities per stage?"
msgstr ""
diff --git a/addons/website_hr/i18n/website_hr.pot b/addons/website_hr/i18n/website_hr.pot
index 670c618f556..74d64b6d049 100644
--- a/addons/website_hr/i18n/website_hr.pot
+++ b/addons/website_hr/i18n/website_hr.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,16 @@ msgstr ""
#. module: website_hr
#: model:ir.model,name:website_hr.model_hr_employee
+#: model:ir.ui.view,arch_db:website_hr.aboutus
msgid "Employee"
msgstr ""
#. module: website_hr
+#: model:ir.model.fields,field_description:website_hr.field_hr_employee__is_published
+msgid "Is published"
+msgstr ""
+
+#. module: website_hr
#: model:ir.ui.view,arch_db:website_hr.aboutus
msgid "Our Team"
msgstr ""
@@ -31,13 +37,23 @@ msgid "Public Info"
msgstr ""
#. module: website_hr
+#: model:ir.model.fields,help:website_hr.field_hr_employee__website_id
+msgid "Restrict publishing to this website."
+msgstr ""
+
+#. module: website_hr
#: model:ir.model.fields,help:website_hr.field_hr_employee__website_url
msgid "The full URL to access the document through the website."
msgstr ""
#. module: website_hr
#: model:ir.model.fields,field_description:website_hr.field_hr_employee__website_published
-msgid "Visible in Website"
+msgid "Visible on current website"
+msgstr ""
+
+#. module: website_hr
+#: model:ir.model.fields,field_description:website_hr.field_hr_employee__website_id
+msgid "Website"
msgstr ""
#. module: website_hr
diff --git a/addons/website_hr_recruitment/i18n/website_hr_recruitment.pot b/addons/website_hr_recruitment/i18n/website_hr_recruitment.pot
index 918e074654a..01dc7326a01 100644
--- a/addons/website_hr_recruitment/i18n/website_hr_recruitment.pot
+++ b/addons/website_hr_recruitment/i18n/website_hr_recruitment.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,69 +21,66 @@ msgid "$15k"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
-msgid "1/5"
-msgstr ""
-
-#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
msgid "10 / 40 people"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
-msgid "2/5"
-msgstr ""
-
-#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
msgid "3 months"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
-msgid "3/5"
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "50% YoY"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
-msgid "4/5"
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "<span class=\"fa fa-2x fa-calendar\"/>\n"
+" Sponsored Events"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
-msgid "5/5"
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "<span class=\"fa fa-2x fa-car\"/>\n"
+" Save on commute"
msgstr ""
#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
-msgid "50% YoY"
+msgid "<span class=\"fa fa-2x fa-check-circle\"/>\n"
+" Discount Programs"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
-msgid "<i class=\"fa fa-bolt\"/> Bolts"
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "<span class=\"fa fa-2x fa-coffee\"/>\n"
+" Eat &amp; Drink"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
-msgid "<i class=\"fa fa-heart\"/> Hearts"
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "<span class=\"fa fa-2x fa-futbol-o\"/>\n"
+" Sport Activity"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
-msgid "<i class=\"fa fa-star\"/> Stars"
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "<span class=\"fa fa-2x fa-heart\"/>\n"
+" Benefits"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
-msgid "<i class=\"fa fa-tasks\"/> Bar"
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "<span class=\"fa fa-2x fa-map-marker\"/>\n"
+" Prime location"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.apply
-msgid "<span class=\"btn btn-primary btn-lg o_website_form_send\">Submit</span>\n"
-" <span id=\"o_website_form_result\"/>"
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "<span class=\"fa fa-2x fa-sun-o\"/>\n"
+" PTOs"
msgstr ""
#. module: website_hr_recruitment
@@ -157,11 +154,6 @@ msgstr ""
#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
-msgid "Benefits"
-msgstr ""
-
-#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
msgid "Brand-name product and services in categories like travel, electronics, health, fitness, cellular, and more"
msgstr ""
@@ -204,16 +196,6 @@ msgstr ""
#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
-msgid "Discount Programs"
-msgstr ""
-
-#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
-msgid "Eat &amp; Drink"
-msgstr ""
-
-#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
msgid "Full sales cycle"
msgstr ""
@@ -234,6 +216,11 @@ msgid "In the meantime,"
msgstr ""
#. module: website_hr_recruitment
+#: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_job__is_published
+msgid "Is published"
+msgstr ""
+
+#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.apply
msgid "Job Application Form"
msgstr ""
@@ -255,12 +242,11 @@ msgstr ""
#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
-#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating
msgid "Job Security:"
msgstr ""
#. module: website_hr_recruitment
-#: code:addons/website_hr_recruitment/controllers/main.py:76
+#: code:addons/website_hr_recruitment/controllers/main.py:77
#, python-format
msgid "Job Title"
msgstr ""
@@ -326,11 +312,6 @@ msgstr ""
#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
-msgid "PTOs"
-msgstr ""
-
-#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
msgid "Peet's and Philz coffee provided all day to order and pantry snacks"
msgstr ""
@@ -351,22 +332,12 @@ msgstr ""
#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
-msgid "Prime location"
-msgstr ""
-
-#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
msgid "Profitable"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
-msgid "Rating type"
-msgstr ""
-
-#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
-msgid "Rating value"
+#: model:ir.model.fields,help:website_hr_recruitment.field_hr_job__website_id
+msgid "Restrict publishing to this website."
msgstr ""
#. module: website_hr_recruitment
@@ -380,11 +351,6 @@ msgid "Sales Cycle:"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
-msgid "Save on commute"
-msgstr ""
-
-#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.apply
msgid "Short Introduction"
msgstr ""
@@ -404,13 +370,8 @@ msgid "Source of Applicants"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
-msgid "Sponsored Events"
-msgstr ""
-
-#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
-msgid "Sport Activity"
+#: model:ir.ui.view,arch_db:website_hr_recruitment.apply
+msgid "Submit"
msgstr ""
#. module: website_hr_recruitment
@@ -460,7 +421,12 @@ msgstr ""
#. module: website_hr_recruitment
#: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_job__website_published
-msgid "Visible in Website"
+msgid "Visible on current website"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_job__website_id
+msgid "Website"
msgstr ""
#. module: website_hr_recruitment
@@ -499,6 +465,11 @@ msgid "Website meta title"
msgstr ""
#. module: website_hr_recruitment
+#: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_job__website_meta_og_img
+msgid "Website opengraph image"
+msgstr ""
+
+#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
msgid "What people say about us?"
msgstr ""
diff --git a/addons/website_links/i18n/website_links.pot b/addons/website_links/i18n/website_links.pot
index 98abdf7f035..60e4779c211 100644
--- a/addons/website_links/i18n/website_links.pot
+++ b/addons/website_links/i18n/website_links.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -78,7 +78,7 @@ msgstr ""
#. module: website_links
#: model:ir.ui.view,arch_db:website_links.create_shorten_url
-msgid "Campaign <i class=\"fa fa-info-circle\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Defines the context of your link. It might be an event you want to promote or a special promotion.\"/>"
+msgid "Campaign <i class=\"fa fa-info-circle\" data-toggle=\"tooltip\" data-placement=\"top\" role=\"img\" aria-label=\"Tooltip info\" title=\"Defines the context of your link. It might be an event you want to promote or a special promotion.\"/>"
msgstr ""
#. module: website_links
@@ -90,6 +90,14 @@ msgstr ""
#. module: website_links
#. openerp-web
+#: code:addons/website_links/static/src/xml/recent_link.xml:26
+#: model:ir.ui.view,arch_db:website_links.graphs
+#, python-format
+msgid "Edit code"
+msgstr ""
+
+#. module: website_links
+#. openerp-web
#: code:addons/website_links/static/src/js/website_links.js:356
#, python-format
msgid "Generating link..."
@@ -101,6 +109,13 @@ msgid "Get tracked link"
msgstr ""
#. module: website_links
+#. openerp-web
+#: code:addons/website_links/static/src/xml/recent_link.xml:13
+#, python-format
+msgid "Icon"
+msgstr ""
+
+#. module: website_links
#: model:ir.ui.view,arch_db:website_links.graphs
msgid "Last Month"
msgstr ""
@@ -118,7 +133,7 @@ msgstr ""
#. module: website_links
#: model:ir.ui.view,arch_db:website_links.create_shorten_url
-msgid "Medium <i class=\"fa fa-info-circle\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Defines the medium used to share your link. It might be an email, or a Facebook Ads for instance.\"/>"
+msgid "Medium <i class=\"fa fa-info-circle\" data-toggle=\"tooltip\" data-placement=\"top\" role=\"img\" aria-label=\"Tooltip info\" title=\"Defines the medium used to share your link. It might be an email, or a Facebook Ads for instance.\"/>"
msgstr ""
#. module: website_links
@@ -143,7 +158,7 @@ msgstr ""
#. module: website_links
#: model:ir.ui.view,arch_db:website_links.create_shorten_url
-msgid "Source <i class=\"fa fa-info-circle\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Defines the source from which your traffic will come from, Facebook or Twitter for instance.\"/>"
+msgid "Source <i class=\"fa fa-info-circle\" data-toggle=\"tooltip\" data-placement=\"top\" role=\"img\" aria-label=\"Tooltip info\" title=\"Defines the source from which your traffic will come from, Facebook or Twitter for instance.\"/>"
msgstr ""
#. module: website_links
diff --git a/addons/website_livechat/i18n/website_livechat.pot b/addons/website_livechat/i18n/website_livechat.pot
index e681d742d73..080c8accbae 100644
--- a/addons/website_livechat/i18n/website_livechat.pot
+++ b/addons/website_livechat/i18n/website_livechat.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,12 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_livechat
+#: model:ir.ui.view,arch_db:website_livechat.res_config_settings_view_form
+msgid "<span class=\"o_form_label\">Live Chat</span>\n"
+" <span class=\"fa fa-lg fa-globe\" title=\"Values set here are website-specific.\" groups=\"website.group_multi_website\"/>"
+msgstr ""
+
+#. module: website_livechat
#: model:ir.ui.view,arch_db:website_livechat.channel_page
msgid "<span>Livechat Channel</span>"
msgstr ""
@@ -31,8 +37,13 @@ msgid "Description of the channel displayed on the website page"
msgstr ""
#. module: website_livechat
-#: model:ir.ui.view,arch_db:website_livechat.res_config_settings_view_form
-msgid "Live Chat"
+#: model:ir.ui.view,arch_db:website_livechat.channel_page
+msgid "Happy face"
+msgstr ""
+
+#. module: website_livechat
+#: model:ir.model.fields,field_description:website_livechat.field_im_livechat_channel__is_published
+msgid "Is published"
msgstr ""
#. module: website_livechat
@@ -57,6 +68,16 @@ msgstr ""
#. module: website_livechat
#: model:ir.ui.view,arch_db:website_livechat.channel_page
+msgid "Neutral face"
+msgstr ""
+
+#. module: website_livechat
+#: model:ir.ui.view,arch_db:website_livechat.channel_page
+msgid "Sad face"
+msgstr ""
+
+#. module: website_livechat
+#: model:ir.ui.view,arch_db:website_livechat.channel_page
msgid "Statistics"
msgstr ""
@@ -87,7 +108,7 @@ msgstr ""
#. module: website_livechat
#: model:ir.model.fields,field_description:website_livechat.field_im_livechat_channel__website_published
-msgid "Visible in Website"
+msgid "Visible on current website"
msgstr ""
#. module: website_livechat
diff --git a/addons/website_mail_channel/i18n/website_mail_channel.pot b/addons/website_mail_channel/i18n/website_mail_channel.pot
index 26e1462f2ff..7a4855e6756 100644
--- a/addons/website_mail_channel/i18n/website_mail_channel.pot
+++ b/addons/website_mail_channel/i18n/website_mail_channel.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,25 +16,21 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
-msgid "<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be subscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-envelope-o\"/> send mail"
msgstr ""
#. module: website_mail_channel
-#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
-msgid "<?xml version=\"1.0\"?>\n"
-"<data><p>Hello,</p>\n"
-"<p>You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong></p>\n"
-"<p>To confirm, please visit the following link:</p>\n"
-"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
-"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
-"</data>"
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-file-o\"/> archives"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "<i class=\"fa fa-times\"/> unsubscribe"
msgstr ""
#. module: website_mail_channel
@@ -43,6 +39,170 @@ msgid "<span class=\"oe_snippet_thumbnail_title\">Discussion Group</span>"
msgstr ""
#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
+msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be subscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
+msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Channel</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">${object.name}</span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${user.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+" <div style=\"margin: 0px; padding: 0px;\">\n"
+" Hello,<br/><br/>\n"
+" You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong>.\n"
+" <br/><br/>\n"
+" To confirm, please visit the following link: <strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong>.\n"
+" <br/><br/>\n"
+" If this was a mistake or you did not requested this action, please ignore this message.\n"
+" % if user.signature:\n"
+" <br/>\n"
+" ${user.signature | safe}\n"
+" % endif\n"
+" </div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${user.company_id.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" % if user.company_id.phone\n"
+" ${user.company_id.phone} |\n"
+" %endif\n"
+" % if user.company_id.email\n"
+" <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a> |\n"
+" % endif\n"
+" % if user.company_id.website\n"
+" <a href=\"'%s' % ${user.company_id.website}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.website}\n"
+" </a>\n"
+" % endif\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=mail\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+" "
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:17
#, python-format
@@ -61,6 +221,12 @@ msgstr ""
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
+#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
+msgid "Avatar"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "Browse archives"
msgstr ""
@@ -82,6 +248,16 @@ msgid "Change Discussion List"
msgstr ""
#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
+msgid "Confirm subscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
+msgid "Confirm unsubscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:18
#, python-format
@@ -99,18 +275,19 @@ msgid "Follow-Ups"
msgstr ""
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.invalid_token_subscription
-msgid "Invalid or expired confirmation link."
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
+msgid "Group"
msgstr ""
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.footer_mailing_list
-msgid "Mailing List"
+#: model:ir.ui.view,arch_db:website_mail_channel.invalid_token_subscription
+msgid "Invalid or expired confirmation link."
msgstr ""
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
#: model:ir.ui.view,arch_db:website_mail_channel.group_messages
+#: model:website.menu,name:website_mail_channel.menu_mailing_list
msgid "Mailing Lists"
msgstr ""
@@ -122,7 +299,7 @@ msgstr ""
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-msgid "Need to unsubscribe? It's right here! <span class=\"fa fa-2x fa-arrow-down pull-right\"/>"
+msgid "Need to unsubscribe? It's right here! <span class=\"fa fa-2x fa-arrow-down float-right\" role=\"img\" aria-label=\"\" title=\"Read this !\"/>"
msgstr ""
#. module: website_mail_channel
@@ -131,16 +308,6 @@ msgid "Outgoing Mails"
msgstr ""
#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
-msgid "Please confirm subscription to ${object.name}"
-msgstr ""
-
-#. module: website_mail_channel
-#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
-msgid "Please confirm unsubscription to ${object.name}"
-msgstr ""
-
-#. module: website_mail_channel
#: code:addons/website_mail_channel/models/mail_mail.py:21
#, python-format
msgid "Post to"
@@ -191,12 +358,6 @@ msgid "a confirmation email has been sent."
msgstr ""
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "archives"
-msgstr ""
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.group_message
msgid "attachments"
msgstr ""
@@ -224,7 +385,7 @@ msgstr ""
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
msgid "members<br/>\n"
-" <i class=\"fa fa-fw fa-envelope-o\"/>"
+" <i class=\"fa fa-fw fa-envelope-o\" role=\"img\" aria-label=\"Traffic\" title=\"Traffic\"/>"
msgstr ""
#. module: website_mail_channel
@@ -243,12 +404,6 @@ msgid "replies"
msgstr ""
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "send mail"
-msgstr ""
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.messages_short
msgid "show"
msgstr ""
@@ -264,12 +419,6 @@ msgid "to the mailing list."
msgstr ""
#. module: website_mail_channel
-#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
-#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
-msgid "unsubscribe"
-msgstr ""
-
-#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
msgid "unsubscribed"
msgstr ""
diff --git a/addons/website_mass_mailing/i18n/website_mass_mailing.pot b/addons/website_mass_mailing/i18n/website_mass_mailing.pot
index d514a8884aa..b2f80335eac 100644
--- a/addons/website_mass_mailing/i18n/website_mass_mailing.pot
+++ b/addons/website_mass_mailing/i18n/website_mass_mailing.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -45,11 +45,6 @@ msgid "Change Newsletter"
msgstr ""
#. module: website_mass_mailing
-#: model:ir.ui.view,arch_db:website_mass_mailing.unsubscribe
-msgid "Choose your mailing subscriptions."
-msgstr ""
-
-#. module: website_mass_mailing
#: model:ir.ui.view,arch_db:website_mass_mailing.s_mail_block_footer_social
#: model:ir.ui.view,arch_db:website_mass_mailing.s_mail_block_footer_social_left
msgid "Contact"
@@ -61,19 +56,28 @@ msgid "Encourage to subscribe to mailing lists with a popup"
msgstr ""
#. module: website_mass_mailing
+#: model:ir.ui.view,arch_db:website_mass_mailing.social_links
+msgid "Facebook"
+msgstr ""
+
+#. module: website_mass_mailing
+#: model:ir.ui.view,arch_db:website_mass_mailing.social_links
+msgid "Google Plus"
+msgstr ""
+
+#. module: website_mass_mailing
#: model:ir.ui.view,arch_db:website_mass_mailing.s_newsletter_subscribe_popup
msgid "Here To Edit Dialog Content"
msgstr ""
#. module: website_mass_mailing
-#: model:ir.model,name:website_mass_mailing.model_mail_mass_mailing_list
-msgid "Mailing List"
+#: model:ir.ui.view,arch_db:website_mass_mailing.social_links
+msgid "LinkedIn"
msgstr ""
#. module: website_mass_mailing
-#: model:ir.ui.view,arch_db:website_mass_mailing.unsubscribe
-#: model:ir.ui.view,arch_db:website_mass_mailing.unsubscribed
-msgid "Mailing Subscriptions"
+#: model:ir.model,name:website_mass_mailing.model_mail_mass_mailing_list
+msgid "Mailing List"
msgstr ""
#. module: website_mass_mailing
@@ -110,6 +114,11 @@ msgid "This adds a new Newsletter Popup snippet to drag & drop on your website p
msgstr ""
#. module: website_mass_mailing
+#: model:ir.ui.view,arch_db:website_mass_mailing.social_links
+msgid "Twitter"
+msgstr ""
+
+#. module: website_mass_mailing
#. openerp-web
#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js:83
#, python-format
@@ -143,30 +152,6 @@ msgid "Website Popup Redirect URL"
msgstr ""
#. module: website_mass_mailing
-#: model:ir.ui.view,arch_db:website_mass_mailing.unsubscribe
-msgid "You are not subscribed to any of our mailing list."
-msgstr ""
-
-#. module: website_mass_mailing
-#: model:ir.ui.view,arch_db:website_mass_mailing.unsubscribed
-msgid "You have been successfully <strong>unsubscribed</strong>!"
-msgstr ""
-
-#. module: website_mass_mailing
-#. openerp-web
-#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.js:168
-#, python-format
-msgid "Your changes have been saved."
-msgstr ""
-
-#. module: website_mass_mailing
-#. openerp-web
-#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.js:171
-#, python-format
-msgid "Your changes have not been saved, try again later."
-msgstr ""
-
-#. module: website_mass_mailing
#: model:ir.model,name:website_mass_mailing.model_res_config_settings
msgid "res.config.settings"
msgstr ""
diff --git a/addons/website_membership/i18n/website_membership.pot b/addons/website_membership/i18n/website_membership.pot
index a0440199ca5..5dc7f7539cf 100644
--- a/addons/website_membership/i18n/website_membership.pot
+++ b/addons/website_membership/i18n/website_membership.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,6 +32,11 @@ msgid "Associations"
msgstr ""
#. module: website_membership
+#: model:ir.ui.view,arch_db:website_membership.opt_index_google_map
+msgid "Close"
+msgstr ""
+
+#. module: website_membership
#: model:ir.ui.view,arch_db:website_membership.index
msgid "Find a business partner"
msgstr ""
@@ -48,8 +53,8 @@ msgid "Location"
msgstr ""
#. module: website_membership
-#: model:ir.ui.view,arch_db:website_membership.footer_custom
#: model:ir.ui.view,arch_db:website_membership.index
+#: model:website.menu,name:website_membership.menu_members
msgid "Members"
msgstr ""
@@ -69,12 +74,12 @@ msgid "World Map"
msgstr ""
#. module: website_membership
-#: model:ir.model,name:website_membership.model_membership_membership_line
-msgid "membership.membership_line"
+#: model:ir.ui.view,arch_db:website_membership.index
+msgid "float-left"
msgstr ""
#. module: website_membership
-#: model:ir.ui.view,arch_db:website_membership.index
-msgid "pull-left"
+#: model:ir.model,name:website_membership.model_membership_membership_line
+msgid "membership.membership_line"
msgstr ""
diff --git a/addons/website_partner/i18n/website_partner.pot b/addons/website_partner/i18n/website_partner.pot
index bd5425ac760..829db1887e1 100644
--- a/addons/website_partner/i18n/website_partner.pot
+++ b/addons/website_partner/i18n/website_partner.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,18 +21,26 @@ msgid "Contact"
msgstr ""
#. module: website_partner
+#: model:ir.model.fields,field_description:website_partner.field_res_partner__is_published
+#: model:ir.model.fields,field_description:website_partner.field_res_users__is_published
+msgid "Is published"
+msgstr ""
+
+#. module: website_partner
#: model:ir.ui.view,arch_db:website_partner.partner_detail
msgid "Short Description for List View"
msgstr ""
#. module: website_partner
+#: model:ir.model.fields,help:website_partner.field_res_partner__website_url
#: model:ir.model.fields,help:website_partner.field_res_users__website_url
msgid "The full URL to access the document through the website."
msgstr ""
#. module: website_partner
+#: model:ir.model.fields,field_description:website_partner.field_res_partner__website_published
#: model:ir.model.fields,field_description:website_partner.field_res_users__website_published
-msgid "Visible in Website"
+msgid "Visible on current website"
msgstr ""
#. module: website_partner
@@ -48,22 +56,32 @@ msgid "Website Partner Short Description"
msgstr ""
#. module: website_partner
+#: model:ir.model.fields,field_description:website_partner.field_res_partner__website_url
#: model:ir.model.fields,field_description:website_partner.field_res_users__website_url
msgid "Website URL"
msgstr ""
#. module: website_partner
+#: model:ir.model.fields,field_description:website_partner.field_res_partner__website_meta_description
#: model:ir.model.fields,field_description:website_partner.field_res_users__website_meta_description
msgid "Website meta description"
msgstr ""
#. module: website_partner
+#: model:ir.model.fields,field_description:website_partner.field_res_partner__website_meta_keywords
#: model:ir.model.fields,field_description:website_partner.field_res_users__website_meta_keywords
msgid "Website meta keywords"
msgstr ""
#. module: website_partner
+#: model:ir.model.fields,field_description:website_partner.field_res_partner__website_meta_title
#: model:ir.model.fields,field_description:website_partner.field_res_users__website_meta_title
msgid "Website meta title"
msgstr ""
+#. module: website_partner
+#: model:ir.model.fields,field_description:website_partner.field_res_partner__website_meta_og_img
+#: model:ir.model.fields,field_description:website_partner.field_res_users__website_meta_og_img
+msgid "Website opengraph image"
+msgstr ""
+
diff --git a/addons/website_rating/i18n/website_rating.pot b/addons/website_rating/i18n/website_rating.pot
index b59342123b4..00d4b05517e 100644
--- a/addons/website_rating/i18n/website_rating.pot
+++ b/addons/website_rating/i18n/website_rating.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -31,6 +31,27 @@ msgstr ""
#. module: website_rating
#. openerp-web
+#: code:addons/website_rating/static/src/xml/website_mail.xml:69
+#, python-format
+msgid "Five stars on five"
+msgstr ""
+
+#. module: website_rating
+#. openerp-web
+#: code:addons/website_rating/static/src/xml/website_mail.xml:68
+#, python-format
+msgid "Four stars on five"
+msgstr ""
+
+#. module: website_rating
+#. openerp-web
+#: code:addons/website_rating/static/src/xml/website_mail.xml:13
+#, python-format
+msgid "Half a star"
+msgstr ""
+
+#. module: website_rating
+#. openerp-web
#: code:addons/website_rating/static/src/js/website_mail.js:43
#, python-format
msgid "I don't like it"
@@ -70,6 +91,20 @@ msgid "Message"
msgstr ""
#. module: website_rating
+#. openerp-web
+#: code:addons/website_rating/static/src/xml/website_mail.xml:10
+#, python-format
+msgid "One star"
+msgstr ""
+
+#. module: website_rating
+#. openerp-web
+#: code:addons/website_rating/static/src/xml/website_mail.xml:65
+#, python-format
+msgid "One star on five"
+msgstr ""
+
+#. module: website_rating
#: model:ir.model.fields,field_description:website_rating.field_rating_rating__website_published
msgid "Published"
msgstr ""
@@ -87,6 +122,20 @@ msgid "Remove selection"
msgstr ""
#. module: website_rating
+#. openerp-web
+#: code:addons/website_rating/static/src/xml/website_mail.xml:67
+#, python-format
+msgid "Three stars on five"
+msgstr ""
+
+#. module: website_rating
+#. openerp-web
+#: code:addons/website_rating/static/src/xml/website_mail.xml:66
+#, python-format
+msgid "Two stars on five"
+msgstr ""
+
+#. module: website_rating
#: model:ir.model.fields,help:website_rating.field_rating_rating__website_published
msgid "Visible on the website as a comment"
msgstr ""
diff --git a/addons/website_sale/i18n/website_sale.pot b/addons/website_sale/i18n/website_sale.pot
index 98077edd586..bc247e47819 100644
--- a/addons/website_sale/i18n/website_sale.pot
+++ b/addons/website_sale/i18n/website_sale.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:12+0000\n"
-"PO-Revision-Date: 2018-08-02 09:12+0000\n"
+"POT-Creation-Date: 2018-08-24 09:04+0000\n"
+"PO-Revision-Date: 2018-08-24 09:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.option_collapse_categories_recursive
+msgid "#{'Unfold' if categ.id in parent_category_ids else 'Fold'}"
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.confirmation
#: model:ir.ui.view,arch_db:website_sale.payment
msgid "&amp; Shipping"
@@ -42,39 +47,107 @@ msgstr ""
#. module: website_sale
#: model:mail.template,body_html:website_sale.mail_template_sale_cart_recovery
msgid "<?xml version=\"1.0\"?>\n"
-"<div style=\"margin:auto;width:100%;\">\n"
-" <img src=\"/web/image/res.company/${user.company_id.id}/logo\" style=\"height: auto; width: 80px; margin-top:30px;\" alt=\"${user.company_id.name}\"/>\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" % set company = object.company_id or object.user_id.company_id or user.company_id\n"
+" <span style=\"font-size: 10px;\">Your Cart</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">\n"
+" ${object.name}\n"
+" </span>\n"
+" </td><td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${company.name}\"/>\n"
+" </td></tr>\n"
+" <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
" <h1 style=\"color:#A9A9A9;\">THERE'S SOMETHING IN YOUR CART.</h1>\n"
-" <p>Would you like to complete your purchase?</p><br/><br/>\n"
+" Would you like to complete your purchase?<br/><br/>\n"
" % if object.order_line:\n"
-" % for line in object.order_line:\n"
-" <hr/>\n"
-" <table width=\"100%\">\n"
-" <tr>\n"
-" <td style=\"padding: 10px; width:150px;\">\n"
-" <img src=\"/web/image/product.product/${line.product_id.id}/image\" height=\"100px\" width=\"100px\"/>\n"
-" </td>\n"
-" <td>\n"
-" <strong>${line.product_id.display_name}</strong><br/>${line.name}\n"
-" </td>\n"
-" <td width=\"100px\" align=\"right\">\n"
-" ${(line.product_uom_qty) | int} ${(line.product_uom.name)}\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" % endfor\n"
-" <hr/>\n"
+" % for line in object.order_line:\n"
+" <hr/>\n"
+" <table width=\"100%\">\n"
+" <tr>\n"
+" <td style=\"padding: 10px; width:150px;\">\n"
+" <img src=\"/web/image/product.product/${line.product_id.id}/image\" height=\"100px\" width=\"100px\" alt=\"Product image\"/>\n"
+" </td>\n"
+" <td>\n"
+" <strong>${line.product_id.display_name}</strong><br/>${line.name}\n"
+" </td>\n"
+" <td width=\"100px\" align=\"right\">\n"
+" ${(line.product_uom_qty) | int} ${(line.product_uom.name)}\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" % endfor\n"
+" <hr/>\n"
+" % endif\n"
+" <div style=\"text-align: center; margin: 16px 0px 16px 0px; font-size: 14px;\">\n"
+" <a href=\"/shop/cart?access_token=${object.access_token}\" target=\"_blank\" style=\"background-color: #875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:13px;\">\n"
+" Resume order\n"
+" </a>\n"
+" </div>\n"
+" <div style=\"text-align: center;\"><strong>Thank you for shopping with ${user.company_id.name}!</strong></div>\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align:center;\">\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\" align=\"left\">\n"
+" ${company.name}\n"
+" </td></tr>\n"
+" <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+" ${company.phone}\n"
+" % if company.email\n"
+" | <a href=\"'mailto:%s' % ${company.email}\" style=\"text-decoration:none; color: #454748;\">${company.email}</a>\n"
+" % endif\n"
+" % if company.website\n"
+" | <a href=\"'%s' % ${company.website}\" style=\"text-decoration:none; color: #454748;\">${company.website}</a>\n"
" % endif\n"
-" <br/><br/>\n"
-" <center>\n"
-" <a href=\"/shop/cart?access_token=${object.access_token}\" target=\"_blank\" style=\"background-color: #1abc9c; padding: 20px; text-decoration: none; color: #fff; border-radius: 5px; font-size: 16px;\" class=\"o_default_snippet_text\">Resume order</a><br/><br/><br/>\n"
-" <p><b>Thank you for shopping with ${user.company_id.name}!</b></p>\n"
-" </center>\n"
-" </div>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+" <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+" Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=website\" style=\"color: #875A7B;\">Odoo</a>\n"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
" "
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.payment_confirmation_status
+msgid "<b>Communication: </b>"
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.confirmation
#: model:ir.ui.view,arch_db:website_sale.payment
msgid "<b>Shipping: </b>"
@@ -87,7 +160,7 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.payment
-msgid "<i class=\"fa fa-arrow-right\" aria-hidden=\"true\"/> Add payment acquirers"
+msgid "<i class=\"fa fa-arrow-right\"/> Add payment acquirers"
msgstr ""
#. module: website_sale
@@ -96,13 +169,26 @@ msgid "<i class=\"fa fa-check\"/> Ship to this address"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.address
+msgid "<i class=\"fa fa-chevron-left\"/>\n"
+" <span>Back</span>"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.checkout
+msgid "<i class=\"fa fa-chevron-left\"/>\n"
+" <span>Return to Cart</span>"
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.payment
msgid "<i class=\"fa fa-edit\"/> Edit"
msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.checkout
-msgid "<i class=\"fa fa-plus-square\" aria-hidden=\"true\"/> Add an address"
+msgid "<i class=\"fa fa-plus-square\"/>\n"
+" <span>Add an address</span>"
msgstr ""
#. module: website_sale
@@ -127,7 +213,7 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.terms
-msgid "<small class=\"text-muted pull-right\">Source: https://termsfeed.com/blog/sample-terms-and-conditions-template</small>"
+msgid "<small class=\"text-muted float-right\">Source: https://termsfeed.com/blog/sample-terms-and-conditions-template</small>"
msgstr ""
#. module: website_sale
@@ -143,12 +229,6 @@ msgid "<span class=\"\">Process Checkout</span>\n"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.product
-msgid "<span class=\"fa fa-chevron-left\" aria-hidden=\"true\"/>\n"
-" <span class=\"sr-only\">Previous</span>"
-msgstr ""
-
-#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.cart
msgid "<span class=\"fa fa-chevron-left\"/>\n"
" <span class=\"\">Continue Shopping</span>"
@@ -157,28 +237,33 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.cart
msgid "<span class=\"fa fa-chevron-left\"/>\n"
-" Continue<span class=\"hidden-xs\"> Shopping</span>"
+" Continue<span class=\"d-none d-md-inline\"> Shopping</span>"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.address
-msgid "<span class=\"fa fa-chevron-left\"/> Back"
+#: model:ir.ui.view,arch_db:website_sale.extra_info
+msgid "<span class=\"fa fa-chevron-left\"/> Previous"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.extra_info
-msgid "<span class=\"fa fa-chevron-left\"/> Previous"
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "<span class=\"o_form_label\">Abandoned Carts</span>"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
-msgid "<span class=\"fa fa-chevron-left\"/> Return to Cart"
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "<span class=\"o_form_label\">Assignation</span>"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.product
-msgid "<span class=\"fa fa-chevron-right\" aria-hidden=\"true\"/>\n"
-" <span class=\"sr-only\">Next</span>"
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "<span class=\"o_form_label\">Invoicing Policy</span>"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.checkout
+msgid "<span>Confirm</span>\n"
+" <i class=\"fa fa-chevron-right\"/>"
msgstr ""
#. module: website_sale
@@ -188,7 +273,8 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.address
-msgid "<span>Next </span><span class=\"fa fa-chevron-right\"/>"
+msgid "<span>Next</span>\n"
+" <i class=\"fa fa-chevron-right\"/>"
msgstr ""
#. module: website_sale
@@ -203,8 +289,7 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.sort
-msgid "<span>Sort by</span>\n"
-" <span class=\"caret\"/>"
+msgid "<span>Sort by</span>"
msgstr ""
#. module: website_sale
@@ -254,13 +339,8 @@ msgid "A product can be either a physical product or a service that you sell to
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "A rounding per line is advised if your prices are tax-included. That way, the sum of line subtotals equals the total with taxes."
-msgstr ""
-
-#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:65
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:37
#, python-format
msgid "AT A GLANCE"
msgstr ""
@@ -288,10 +368,16 @@ msgstr ""
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_res_config_settings__cart_abandoned_delay
+#: model:ir.model.fields,field_description:website_sale.field_website__cart_abandoned_delay
msgid "Abandoned Delay"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Abandoned carts are all carts for which no transaction has been confirmed while the customer has filled in their address. You can find them in *Website > Orders > Abandoned Carts*. From there you can send a recovery email to stimulate the customers to resume their order."
+msgstr ""
+
+#. module: website_sale
#: model:ir.model.fields,help:website_sale.field_product_product__accessory_product_ids
#: model:ir.model.fields,help:website_sale.field_product_template__accessory_product_ids
msgid "Accessories show up when the customer reviews the cart before paying (cross-sell strategy, e.g. for computers: mouse, keyboard, etc.). An algorithm figures out a list of accessories based on all the products added to cart."
@@ -304,6 +390,17 @@ msgid "Accessory Products"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_website_sale_payment_acquirer_onboarding_wizard__acc_number
+msgid "Account Number"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.cart_lines
+#: model:ir.ui.view,arch_db:website_sale.product_quantity
+msgid "Add one"
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.product
msgid "Add to Cart"
msgstr ""
@@ -357,21 +454,11 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "Apply right VAT rates for digital products sold in EU"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
msgid "Apply specific prices per country, discounts, etc."
msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "Assignation"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
msgid "Assignation of online orders"
msgstr ""
@@ -387,21 +474,21 @@ msgid "Attributes"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_res_config_settings__automatic_invoice
-msgid "Automatic Invoice"
-msgstr ""
-
-#. module: website_sale
#. openerp-web
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:91
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:92
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:93
#, python-format
msgid "Average Order"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_website_sale_payment_acquirer_onboarding_wizard__journal_name
+msgid "Bank Name"
+msgstr ""
+
+#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:106
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:103
#, python-format
msgid "Best Sellers"
msgstr ""
@@ -423,11 +510,6 @@ msgid "Boost your sales with two kinds of discount programs: promotions and coup
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_sale_order__can_directly_mark_as_paid
-msgid "Can be directly marked as paid"
-msgstr ""
-
-#. module: website_sale
#. openerp-web
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:14
#, python-format
@@ -441,12 +523,13 @@ msgstr ""
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_res_config_settings__cart_recovery_mail_template
+#: model:ir.model.fields,field_description:website_sale.field_website__cart_recovery_mail_template_id
msgid "Cart Recovery Email"
msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "Cart are considered abandoned after"
+msgid "Cart is abandoned after"
msgstr ""
#. module: website_sale
@@ -456,15 +539,15 @@ msgstr ""
#. module: website_sale
#. openerp-web
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:82
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:83
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:84
#, python-format
msgid "Carts"
msgstr ""
#. module: website_sale
-#: model:ir.ui.menu,name:website_sale.menu_catalog
-msgid "Catalog"
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Carts are flagged as abandoned after this delay."
msgstr ""
#. module: website_sale
@@ -478,6 +561,11 @@ msgid "Catalog price: Low to High"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.product_template_form_view
+msgid "Categories"
+msgstr ""
+
+#. module: website_sale
#: model:ir.actions.act_window,help:website_sale.product_public_category_action
msgid "Categories are used to browse your products through the\n"
" touchscreen interface."
@@ -490,14 +578,13 @@ msgid "Categories can be published on the Shop page (online catalog grid) to hel
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_sale_order__can_directly_mark_as_paid
-msgid "Checked if the sales order can directly be marked as paid, i.e. if the quotation\n"
-" is sent or confirmed and if the payment acquire is of the type transfer or manual"
+#: model:ir.model.fields,field_description:website_sale.field_product_public_category__child_id
+msgid "Children Categories"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_product_public_category__child_id
-msgid "Children Categories"
+#: model:ir.actions.act_window,name:website_sale.action_open_website_sale_onboarding_payment_acquirer_wizard
+msgid "Choose a payment method"
msgstr ""
#. module: website_sale
@@ -517,13 +604,6 @@ msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:38
-#, python-format
-msgid "Click here to set an image describing your product."
-msgstr ""
-
-#. module: website_sale
-#. openerp-web
#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:28
#, python-format
msgid "Click on <em>Continue</em> to create the product."
@@ -531,7 +611,7 @@ msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:60
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:63
#, python-format
msgid "Click on this button so your customers can see it."
msgstr ""
@@ -542,6 +622,11 @@ msgid "Color"
msgstr ""
#. module: website_sale
+#: model:ir.model,name:website_sale.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.address
msgid "Company Name"
msgstr ""
@@ -582,11 +667,6 @@ msgid "Compute shipping costs on orders"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
-msgid "Confirm <span class=\"fa fa-chevron-right\"/>"
-msgstr ""
-
-#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
msgid "Confirm Order"
msgstr ""
@@ -604,11 +684,12 @@ msgid "Confirm orders when you get paid."
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "Confirmation Email"
+#: model:ir.ui.view,arch_db:website_sale.sale_report_view_search_website
+msgid "Confirmed"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.sale_report_view_search_website
#: model:ir.ui.view,arch_db:website_sale.view_sales_order_filter_ecommerce
msgid "Confirmed Orders"
msgstr ""
@@ -620,8 +701,8 @@ msgstr ""
#. module: website_sale
#. openerp-web
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:95
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:96
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:97
#, python-format
msgid "Conversion"
msgstr ""
@@ -646,6 +727,7 @@ msgstr ""
#: model:ir.model.fields,field_description:website_sale.field_product_image__create_uid
#: model:ir.model.fields,field_description:website_sale.field_product_public_category__create_uid
#: model:ir.model.fields,field_description:website_sale.field_product_style__create_uid
+#: model:ir.model.fields,field_description:website_sale.field_website_sale_payment_acquirer_onboarding_wizard__create_uid
msgid "Created by"
msgstr ""
@@ -653,6 +735,7 @@ msgstr ""
#: model:ir.model.fields,field_description:website_sale.field_product_image__create_date
#: model:ir.model.fields,field_description:website_sale.field_product_public_category__create_date
#: model:ir.model.fields,field_description:website_sale.field_product_style__create_date
+#: model:ir.model.fields,field_description:website_sale.field_website_sale_payment_acquirer_onboarding_wizard__create_date
msgid "Created on"
msgstr ""
@@ -662,6 +745,11 @@ msgid "Currencies"
msgstr ""
#. module: website_sale
+#: selection:website.sale.payment.acquirer.onboarding.wizard,payment_method:0
+msgid "Custom payment instructions"
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
msgid "Customer Experience"
msgstr ""
@@ -687,21 +775,6 @@ msgid "Default Pricelist"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "Default Sales Tax"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "Default recovery email to send when a cart is abandoned"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "Default sales tax applied to local transactions"
-msgstr ""
-
-#. module: website_sale
#: model:ir.actions.act_window,help:website_sale.product_public_category_action
msgid "Define a new category"
msgstr ""
@@ -717,6 +790,7 @@ msgid "Delivery methods are selectable on the website: the customer pays for shi
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_product_product__website_description
#: model:ir.model.fields,field_description:website_sale.field_product_template__website_description
msgid "Description for the website"
msgstr ""
@@ -728,6 +802,11 @@ msgid "Determine the display order in the Website E-commerce"
msgstr ""
#. module: website_sale
+#: model:ir.model,name:website_sale.model_digest_digest
+msgid "Digest"
+msgstr ""
+
+#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_res_config_settings__module_website_sale_digital
msgid "Digital Content"
msgstr ""
@@ -736,6 +815,7 @@ msgstr ""
#: model:ir.model.fields,field_description:website_sale.field_product_image__display_name
#: model:ir.model.fields,field_description:website_sale.field_product_public_category__display_name
#: model:ir.model.fields,field_description:website_sale.field_product_style__display_name
+#: model:ir.model.fields,field_description:website_sale.field_website_sale_payment_acquirer_onboarding_wizard__display_name
msgid "Display Name"
msgstr ""
@@ -745,8 +825,26 @@ msgid "Display crossed-out public prices"
msgstr ""
#. module: website_sale
+#: code:addons/website_sale/models/digest.py:16
+#, python-format
+msgid "Do not have access, skip this data for user's digest email"
+msgstr ""
+
+#. module: website_sale
+#: selection:res.company,website_sale_onboarding_payment_acquirer_state:0
+msgid "Done"
+msgstr ""
+
+#. module: website_sale
+#. openerp-web
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:38
+#, python-format
+msgid "Double click here to set an image describing your product."
+msgstr ""
+
+#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:50
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:53
#, python-format
msgid "Drag this website block and drop it in your page."
msgstr ""
@@ -757,13 +855,13 @@ msgid "E-commerce Promotional Code"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_res_config_settings__module_l10n_eu_service
-msgid "EU Digital Goods VAT"
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Easypost"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "Easypost"
+#: model:ir.ui.view,arch_db:website_sale.payment_confirmation_status
+msgid "Edit"
msgstr ""
#. module: website_sale
@@ -794,21 +892,6 @@ msgid "Email composition wizard"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "Email for Abandoned carts"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_res_config_settings__order_mail_template
-msgid "Email sent to customer at the end of the checkout process"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "Email sent to the customer after the checkout"
-msgstr ""
-
-#. module: website_sale
#. openerp-web
#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:24
#, python-format
@@ -822,6 +905,11 @@ msgid "Error ! You cannot create recursive categories."
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.product_template_form_view
+msgid "Extra Images"
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.extra_info_option
msgid "Extra Info"
msgstr ""
@@ -845,7 +933,7 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "Generate the invoice automatically when the order is confirmed"
+msgid "Generate the invoice automatically when the electronic payment is confirmed"
msgstr ""
#. module: website_sale
@@ -884,11 +972,6 @@ msgid "Here you can set a specific HTML color index (e.g. #ff0000) to display th
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "How total tax amount is computed in orders and invoices"
-msgstr ""
-
-#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.payment_sale_note
msgid "I agree to the"
msgstr ""
@@ -902,15 +985,11 @@ msgstr ""
#: model:ir.model.fields,field_description:website_sale.field_product_image__id
#: model:ir.model.fields,field_description:website_sale.field_product_public_category__id
#: model:ir.model.fields,field_description:website_sale.field_product_style__id
+#: model:ir.model.fields,field_description:website_sale.field_website_sale_payment_acquirer_onboarding_wizard__id
msgid "ID"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "If you're selling digital goods to customers in the EU, you must charge VAT based on your customers' locations. This rule applies regardless of you are located. Digital goods are defined in the legislation as broadcasting, telecommunications, and services that are electronically supplied instead of shipped. Gift cards sent online are not included in the definition."
-msgstr ""
-
-#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.terms
msgid "If your website or mobile apps allows users to create content and make that content public to other users, a <b>Content</b> section will inform users that they own the rights to the content they have created.<br/>The “Content” clause usually mentions that users must give you (the website or mobile app developer) a license so that you can share this content on your website/mobile app and to make it available to other users.<br/>Because the content created by users is public to other users, a DMCA notice clause (or Copyright Infringement ) section is helpful to inform users and copyright authors that, if any content is found to be a copyright infringement, you will respond to any DMCA take down notices received and you will take down the content."
msgstr ""
@@ -929,7 +1008,6 @@ msgstr ""
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_product__product_image_ids
#: model:ir.model.fields,field_description:website_sale.field_product_template__product_image_ids
-#: model:ir.ui.view,arch_db:website_sale.product_template_form_view
msgid "Images"
msgstr ""
@@ -939,7 +1017,7 @@ msgid "Installs the \"Website Delivery Information\" application"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/main.py:528
+#: code:addons/website_sale/controllers/main.py:542
#, python-format
msgid "Invalid Email! Please enter a valid email address."
msgstr ""
@@ -950,19 +1028,25 @@ msgid "Inventory"
msgstr ""
#. module: website_sale
+#: model:ir.model,name:website_sale.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: website_sale
#: model:ir.actions.act_window,name:website_sale.action_invoices_ecommerce
msgid "Invoices"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_res_config_settings__module_account_invoicing
+#: model:ir.model.fields,field_description:website_sale.field_res_config_settings__module_account
#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
msgid "Invoicing"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "Invoicing Policy"
+#: model:ir.model.fields,field_description:website_sale.field_product_product__is_published
+#: model:ir.model.fields,field_description:website_sale.field_product_template__is_published
+msgid "Is published"
msgstr ""
#. module: website_sale
@@ -971,24 +1055,30 @@ msgid "Issue invoices to customers"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/models/sale_order.py:157
+#: code:addons/website_sale/models/sale_order.py:150
#, python-format
msgid "It is forbidden to modify a sales order which is not in draft status."
msgstr ""
#. module: website_sale
+#: selection:res.company,website_sale_onboarding_payment_acquirer_state:0
+msgid "Just done"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_digest_digest__kpi_website_sale_total_value
+msgid "Kpi Website Sale Total Value"
+msgstr ""
+
+#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_image____last_update
#: model:ir.model.fields,field_description:website_sale.field_product_public_category____last_update
#: model:ir.model.fields,field_description:website_sale.field_product_style____last_update
+#: model:ir.model.fields,field_description:website_sale.field_website_sale_payment_acquirer_onboarding_wizard____last_update
msgid "Last Modified on"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.sale_report_view_search_website
-msgid "Last Month"
-msgstr ""
-
-#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_res_partner__last_website_so_id
#: model:ir.model.fields,field_description:website_sale.field_res_users__last_website_so_id
msgid "Last Online Sales Order"
@@ -998,6 +1088,7 @@ msgstr ""
#: model:ir.model.fields,field_description:website_sale.field_product_image__write_uid
#: model:ir.model.fields,field_description:website_sale.field_product_public_category__write_uid
#: model:ir.model.fields,field_description:website_sale.field_product_style__write_uid
+#: model:ir.model.fields,field_description:website_sale.field_website_sale_payment_acquirer_onboarding_wizard__write_uid
msgid "Last Updated by"
msgstr ""
@@ -1005,20 +1096,11 @@ msgstr ""
#: model:ir.model.fields,field_description:website_sale.field_product_image__write_date
#: model:ir.model.fields,field_description:website_sale.field_product_public_category__write_date
#: model:ir.model.fields,field_description:website_sale.field_product_style__write_date
+#: model:ir.model.fields,field_description:website_sale.field_website_sale_payment_acquirer_onboarding_wizard__write_date
msgid "Last Updated on"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.sale_report_view_search_website
-msgid "Last Week"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.sale_report_view_search_website
-msgid "Last Year"
-msgstr ""
-
-#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
msgid "Let returning shoppers save products in a whishlist"
msgstr ""
@@ -1037,7 +1119,7 @@ msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:64
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:67
#, python-format
msgid "Let's now take a look at your administration dashboard to get your eCommerce website ready in no time."
msgstr ""
@@ -1068,8 +1150,13 @@ msgid "Medium-sized image of the category. It is automatically resized as a 128x
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_website_sale_payment_acquirer_onboarding_wizard__manual_name
+msgid "Method"
+msgstr ""
+
+#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale.js:15
+#: code:addons/website_sale/static/src/js/website_sale.js:31
#, python-format
msgid "My Cart"
msgstr ""
@@ -1092,8 +1179,13 @@ msgid "Name - Z to A"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_sale_order_line__name_short
+msgid "Name Short"
+msgstr ""
+
+#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/controllers/main.py:994
+#: code:addons/website_sale/controllers/main.py:1009
#: code:addons/website_sale/static/src/js/website_sale.editor.js:32
#: model:ir.ui.view,arch_db:website_sale.content_new_product
#, python-format
@@ -1132,11 +1224,21 @@ msgid "None website"
msgstr ""
#. module: website_sale
+#: selection:res.company,website_sale_onboarding_payment_acquirer_state:0
+msgid "Not done"
+msgstr ""
+
+#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_crm_team__abandoned_carts_count
msgid "Number of Abandoned Carts"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,help:website_sale.field_res_config_settings__cart_abandoned_delay
+msgid "Number of hours after which the cart is considered abandoned."
+msgstr ""
+
+#. module: website_sale
#. openerp-web
#: code:addons/website_sale/static/src/xml/website_sale.xml:12
#, python-format
@@ -1155,7 +1257,7 @@ msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:55
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:58
#, python-format
msgid "Once you click on <b>Save</b>, your product is updated."
msgstr ""
@@ -1178,7 +1280,7 @@ msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:68
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:71
#, python-format
msgid "Open your website app here."
msgstr ""
@@ -1189,8 +1291,13 @@ msgid "Optional Products"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_res_config_settings__order_mail_template
-msgid "Order Confirmation Email"
+#: model:ir.ui.view,arch_db:website_sale.payment_confirmation_status
+msgid "Or scan me with your banking app."
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.sale_report_view_search_website
+msgid "Order Date"
msgstr ""
#. module: website_sale
@@ -1210,8 +1317,8 @@ msgstr ""
#. module: website_sale
#. openerp-web
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:66
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:67
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:68
#: model:ir.actions.act_window,name:website_sale.action_orders_ecommerce
#: model:ir.ui.menu,name:website_sale.menu_orders
#: model:ir.ui.menu,name:website_sale.menu_orders_orders
@@ -1234,8 +1341,8 @@ msgstr ""
#. module: website_sale
#. openerp-web
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:87
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:88
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:89
#, python-format
msgid "Orders/Day"
msgstr ""
@@ -1261,6 +1368,26 @@ msgid "Pay with"
msgstr ""
#. module: website_sale
+#: selection:website.sale.payment.acquirer.onboarding.wizard,payment_method:0
+msgid "Pay with PayPal"
+msgstr ""
+
+#. module: website_sale
+#: selection:website.sale.payment.acquirer.onboarding.wizard,payment_method:0
+msgid "Pay with another payment acquirer"
+msgstr ""
+
+#. module: website_sale
+#: selection:website.sale.payment.acquirer.onboarding.wizard,payment_method:0
+msgid "Pay with credit card (via Stripe)"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_website_sale_payment_acquirer_onboarding_wizard__paypal_email_account
+msgid "PayPal Email ID"
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.menu,name:website_sale.menu_ecommerce_payment_acquirers
msgid "Payment Acquirers"
msgstr ""
@@ -1271,8 +1398,13 @@ msgid "Payment Icons"
msgstr ""
#. module: website_sale
-#: model:ir.model,name:website_sale.model_payment_transaction
-msgid "Payment Transaction"
+#: model:ir.model.fields,field_description:website_sale.field_website_sale_payment_acquirer_onboarding_wizard__manual_post_msg
+msgid "Payment Instructions"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_website_sale_payment_acquirer_onboarding_wizard__payment_method
+msgid "Payment Method"
msgstr ""
#. module: website_sale
@@ -1288,6 +1420,16 @@ msgid "Payments to Capture"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_website_sale_payment_acquirer_onboarding_wizard__paypal_seller_account
+msgid "Paypal Merchant ID"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_website_sale_payment_acquirer_onboarding_wizard__paypal_pdt_token
+msgid "Paypal PDT Token"
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.address
msgid "Phone"
msgstr ""
@@ -1303,19 +1445,19 @@ msgid "Powered by"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/backend.py:108
+#: code:addons/website_sale/controllers/backend.py:113
#, python-format
msgid "Previous Month"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/backend.py:106
+#: code:addons/website_sale/controllers/backend.py:111
#, python-format
msgid "Previous Week"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/backend.py:110
+#: code:addons/website_sale/controllers/backend.py:115
#, python-format
msgid "Previous Year"
msgstr ""
@@ -1349,6 +1491,11 @@ msgid "Pricing"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.confirmation
+msgid "Print"
+msgstr ""
+
+#. module: website_sale
#: model:ir.actions.act_window,help:website_sale.action_unpaid_orders_ecommerce
#: model:ir.actions.act_window,help:website_sale.action_view_unpaid_quotation_tree
msgid "Process the order once the payment is received."
@@ -1356,7 +1503,7 @@ msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:109
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:106
#: model:ir.model,name:website_sale.model_product_product
#: model:ir.ui.view,arch_db:website_sale.cart_lines
#: model:ir.ui.view,arch_db:website_sale.cart_summary
@@ -1427,6 +1574,7 @@ msgstr ""
#. module: website_sale
#: model:ir.actions.act_window,name:website_sale.product_template_action_website
+#: model:ir.ui.menu,name:website_sale.menu_catalog
#: model:ir.ui.menu,name:website_sale.menu_catalog_products
#: model:ir.ui.menu,name:website_sale.menu_product_settings
#: model:ir.ui.view,arch_db:website_sale.product
@@ -1475,7 +1623,7 @@ msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:110
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:107
#: model:ir.ui.view,arch_db:website_sale.cart_lines
#: model:ir.ui.view,arch_db:website_sale.cart_summary
#, python-format
@@ -1539,11 +1687,29 @@ msgid "Related Product"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.cart_lines
+msgid "Remove from cart"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.cart_lines
+#: model:ir.ui.view,arch_db:website_sale.product_quantity
+msgid "Remove one"
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.menu,name:website_sale.menu_reporting
msgid "Reporting"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,help:website_sale.field_product_product__website_id
+#: model:ir.model.fields,help:website_sale.field_product_public_category__website_id
+#: model:ir.model.fields,help:website_sale.field_product_template__website_id
+msgid "Restrict publishing to this website."
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.404
msgid "Return to the product list."
msgstr ""
@@ -1554,11 +1720,6 @@ msgid "Review Order"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "Rounding Method"
-msgstr ""
-
-#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.products_item
msgid "Sale"
msgstr ""
@@ -1570,22 +1731,25 @@ msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:34
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:46
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:35
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:49
#: model:ir.actions.act_window,name:website_sale.sale_report_action_carts
#: model:ir.actions.act_window,name:website_sale.sale_report_action_dashboard
#: model:ir.ui.menu,name:website_sale.menu_report_sales
+#: model:ir.ui.view,arch_db:website_sale.digest_digest_view_form
#: model:ir.ui.view,arch_db:website_sale.sale_report_view_search_website
#, python-format
msgid "Sales"
msgstr ""
#. module: website_sale
-#: model:ir.model,name:website_sale.model_crm_team
-#: model:ir.model.fields,field_description:website_sale.field_res_config_settings__salesteam_id
-#: model:ir.model.fields,field_description:website_sale.field_website__salesteam_id
-#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "Sales Channel"
+#: model:ir.model,name:website_sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.model,name:website_sale.model_sale_report
+msgid "Sales Orders Statistics"
msgstr ""
#. module: website_sale
@@ -1596,12 +1760,20 @@ msgstr ""
#. module: website_sale
#. openerp-web
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:32
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:44
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:47
#, python-format
msgid "Sales Since Last"
msgstr ""
#. module: website_sale
+#: model:ir.model,name:website_sale.model_crm_team
+#: model:ir.model.fields,field_description:website_sale.field_res_config_settings__salesteam_id
+#: model:ir.model.fields,field_description:website_sale.field_website__salesteam_id
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Sales Team"
+msgstr ""
+
+#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_res_config_settings__salesperson_id
#: model:ir.model.fields,field_description:website_sale.field_website__salesperson_id
msgid "Salesperson"
@@ -1660,11 +1832,6 @@ msgid "Send a Recovery Email"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "Send a recovery email to authenticated shoppers"
-msgstr ""
-
-#. module: website_sale
#. openerp-web
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:18
#, python-format
@@ -1672,6 +1839,11 @@ msgid "Send a recovery email to visitors who haven't completed their order."
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Send a recovery email when a cart is abandoned"
+msgstr ""
+
+#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_public_category__sequence
msgid "Sequence"
msgstr ""
@@ -1684,7 +1856,7 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.address
msgid "Ship to the same address\n"
-" <span class=\"ship_to_other text-muted\" style=\"display: none\">&amp;nbsp;(<i>Your shipping address will be requested later) </i></span>"
+" <span class=\"ship_to_other text-muted\" style=\"display: none\">&amp;nbsp;(<i>Your shipping address will be requested later) </i></span>"
msgstr ""
#. module: website_sale
@@ -1710,6 +1882,7 @@ msgid "Shipping Management"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.product_template_form_view
#: model:ir.ui.view,arch_db:website_sale.products
#: model:website.menu,name:website_sale.menu_shop
msgid "Shop"
@@ -1731,6 +1904,11 @@ msgid "Shop - Select Payment Acquirer"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.products_add_to_cart
+msgid "Shopping cart"
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.confirmation
msgid "Sign Up"
msgstr ""
@@ -1764,14 +1942,14 @@ msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:76
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:111
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:75
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:108
#, python-format
msgid "Sold"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/main.py:546
+#: code:addons/website_sale/controllers/main.py:560
#, python-format
msgid "Some required fields are empty."
msgstr ""
@@ -1797,13 +1975,28 @@ msgid "State / Province..."
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_res_company__website_sale_onboarding_payment_acquirer_state
+msgid "State of the website sale onboarding payment acquirer step"
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.address
msgid "Street 2"
msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.address
-msgid "Street <span class=\"hidden-xs\"> and Number</span>"
+msgid "Street <span class=\"d-none d-md-inline\"> and Number</span>"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_website_sale_payment_acquirer_onboarding_wizard__stripe_publishable_key
+msgid "Stripe Publishable Key"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_website_sale_payment_acquirer_onboarding_wizard__stripe_secret_key
+msgid "Stripe Secret Key"
msgstr ""
#. module: website_sale
@@ -1845,11 +2038,6 @@ msgid "TIN / VAT"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "Taxes"
-msgstr ""
-
-#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.total
msgid "Taxes:"
msgstr ""
@@ -1870,16 +2058,14 @@ msgid "The <b>Intellectual Property</b> disclosure will inform users that the co
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_product_product__website_url
-#: model:ir.model.fields,help:website_sale.field_product_template__website_url
-msgid "The full URL to access the document through the website."
+#: model:ir.ui.view,arch_db:website_sale.payment_confirmation_status
+msgid "The SEPA QR Code informations are not set correctly."
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_res_config_settings__automatic_invoice
-msgid "The invoice is generated automatically and available in the customer portal when the transaction is confirmed by the payment acquirer.\n"
-"The invoice is marked as paid and the payment is registered in the payment journal defined in the configuration of the payment acquirer.\n"
-"This mode is advised if you issue the final invoice at the order and not after the delivery."
+#: model:ir.model.fields,help:website_sale.field_product_product__website_url
+#: model:ir.model.fields,help:website_sale.field_product_template__website_url
+msgid "The full URL to access the document through the website."
msgstr ""
#. module: website_sale
@@ -1888,12 +2074,6 @@ msgid "The mode selected here applies as invoicing policy of any new product cre
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/models/sale_order.py:258
-#, python-format
-msgid "The quote should be sent and the payment acquirer type should be manual or wire transfer"
-msgstr ""
-
-#. module: website_sale
#: model:ir.actions.act_window,help:website_sale.action_abandoned_orders_ecommerce
#: model:ir.actions.act_window,help:website_sale.action_view_abandoned_tree
msgid "The time to mark a cart as abandoned can be changed in the settings."
@@ -1906,7 +2086,7 @@ msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:51
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:54
#, python-format
msgid "There is no recent confirmed order."
msgstr ""
@@ -1928,6 +2108,11 @@ msgid "This combination does not exist."
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "This email template is suggested by default when you send a recovery email."
+msgstr ""
+
+#. module: website_sale
#: model:ir.model.fields,help:website_sale.field_product_public_category__image
msgid "This field holds the image used as image for the category, limited to 1024x1024px."
msgstr ""
@@ -1948,11 +2133,6 @@ msgid "This promo code is not available"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "This tax is applied to any new product created in the catalog."
-msgstr ""
-
-#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.cart_popover
msgid "True"
msgstr ""
@@ -1989,14 +2169,14 @@ msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:75
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:74
#, python-format
msgid "Untaxed Total Sold"
msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:42
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:45
#, python-format
msgid "Upload an image from your local library."
msgstr ""
@@ -2009,11 +2189,17 @@ msgstr ""
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_product__website_published
#: model:ir.model.fields,field_description:website_sale.field_product_template__website_published
-msgid "Visible in Website"
+msgid "Visible on current website"
msgstr ""
#. module: website_sale
#: model:ir.model,name:website_sale.model_website
+#: model:ir.model.fields,field_description:website_sale.field_account_invoice__website_id
+#: model:ir.model.fields,field_description:website_sale.field_product_product__website_id
+#: model:ir.model.fields,field_description:website_sale.field_product_public_category__website_id
+#: model:ir.model.fields,field_description:website_sale.field_product_template__website_id
+#: model:ir.model.fields,field_description:website_sale.field_sale_order__website_id
+#: model:ir.model.fields,field_description:website_sale.field_sale_report__website_id
msgid "Website"
msgstr ""
@@ -2068,6 +2254,13 @@ msgid "Website meta title"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_product_product__website_meta_og_img
+#: model:ir.model.fields,field_description:website_sale.field_product_public_category__website_meta_og_img
+#: model:ir.model.fields,field_description:website_sale.field_product_template__website_meta_og_img
+msgid "Website opengraph image"
+msgstr ""
+
+#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_product__website_price
#: model:ir.model.fields,field_description:website_sale.field_product_template__website_price
msgid "Website price"
@@ -2086,13 +2279,23 @@ msgid "Website public price"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,help:website_sale.field_account_invoice__website_id
+msgid "Website through which this invoice was created."
+msgstr ""
+
+#. module: website_sale
+#: model:ir.model.fields,help:website_sale.field_sale_order__website_id
+msgid "Website through which this order was placed."
+msgstr ""
+
+#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_crm_team__website_ids
msgid "Websites"
msgstr ""
#. module: website_sale
#: model:ir.model.fields,help:website_sale.field_crm_team__website_ids
-msgid "Websites using this sales channel"
+msgid "Websites using this Sales Team"
msgstr ""
#. module: website_sale
@@ -2118,7 +2321,7 @@ msgstr ""
#. module: website_sale
#: model:mail.template,subject:website_sale.mail_template_sale_cart_recovery
-msgid "You left items in your cart."
+msgid "You left items in your cart!"
msgstr ""
#. module: website_sale
@@ -2185,11 +2388,15 @@ msgstr ""
#. module: website_sale
#: model:ir.actions.act_window,name:website_sale.product_public_category_action
#: model:ir.ui.menu,name:website_sale.menu_catalog_categories
-#: model:ir.ui.view,arch_db:website_sale.product_template_form_view
msgid "eCommerce Categories"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_digest_digest__kpi_website_sale_total
+msgid "eCommerce Sales"
+msgstr ""
+
+#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_res_config_settings__module_website_sale_delivery
msgid "eCommerce Shipping Costs"
msgstr ""
@@ -2201,7 +2408,7 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "hours"
+msgid "hour(s)."
msgstr ""
#. module: website_sale
@@ -2220,8 +2427,14 @@ msgid "items)"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_res_config_settings__cart_abandoned_delay
-msgid "number of hours after which the cart is considered abandoned"
+#: model:ir.ui.view,arch_db:website_sale.product
+#: model:ir.ui.view,arch_db:website_sale.products
+msgid "ml-2"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.products
+msgid "o_website_sale_search"
msgstr ""
#. module: website_sale
@@ -2259,3 +2472,8 @@ msgstr ""
msgid "website"
msgstr ""
+#. module: website_sale
+#: model:ir.model,name:website_sale.model_website_sale_payment_acquirer_onboarding_wizard
+msgid "website.sale.payment.acquirer.onboarding.wizard"
+msgstr ""
+
diff --git a/addons/website_sale_comparison/i18n/website_sale_comparison.pot b/addons/website_sale_comparison/i18n/website_sale_comparison.pot
index 266cdf6ade7..53246a5e9a0 100644
--- a/addons/website_sale_comparison/i18n/website_sale_comparison.pot
+++ b/addons/website_sale_comparison/i18n/website_sale_comparison.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr ""
#. module: website_sale_comparison
#. openerp-web
-#: code:addons/website_sale_comparison/static/src/js/website_sale_comparison.js:45
+#: code:addons/website_sale_comparison/static/src/js/website_sale_comparison.js:48
#: model:ir.ui.view,arch_db:website_sale_comparison.product_compare
#, python-format
msgid "Compare Products"
@@ -105,6 +105,13 @@ msgid "Last Updated on"
msgstr ""
#. module: website_sale_comparison
+#. openerp-web
+#: code:addons/website_sale_comparison/static/src/xml/comparison.xml:7
+#, python-format
+msgid "Product"
+msgstr ""
+
+#. module: website_sale_comparison
#: model:ir.model,name:website_sale_comparison.model_product_attribute
msgid "Product Attribute"
msgstr ""
@@ -121,6 +128,12 @@ msgid "Product Template"
msgstr ""
#. module: website_sale_comparison
+#: model:ir.ui.view,arch_db:website_sale_comparison.product_compare
+#: model:ir.ui.view,arch_db:website_sale_comparison.product_product
+msgid "Product image"
+msgstr ""
+
+#. module: website_sale_comparison
#: model:ir.ui.view,arch_db:website_sale_comparison.product_product
msgid "Remove"
msgstr ""
@@ -156,6 +169,13 @@ msgstr ""
#. openerp-web
#: code:addons/website_sale_comparison/static/src/xml/comparison.xml:15
#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: website_sale_comparison
+#. openerp-web
+#: code:addons/website_sale_comparison/static/src/xml/comparison.xml:15
+#, python-format
msgid "You can compare max 4 products."
msgstr ""
diff --git a/addons/website_sale_delivery/i18n/website_sale_delivery.pot b/addons/website_sale_delivery/i18n/website_sale_delivery.pot
index 249151f8745..fea820f68fc 100644
--- a/addons/website_sale_delivery/i18n/website_sale_delivery.pot
+++ b/addons/website_sale_delivery/i18n/website_sale_delivery.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,12 @@ msgstr ""
#. module: website_sale_delivery
#: model:ir.ui.view,arch_db:website_sale_delivery.payment_delivery
-msgid "<span class=\"badge pull-right o_delivery_compute\">Select to compute delivery rate</span>"
+msgid "<b>Shipping Method: </b>"
+msgstr ""
+
+#. module: website_sale_delivery
+#: model:ir.ui.view,arch_db:website_sale_delivery.payment_delivery_methods
+msgid "<span class=\"float-right badge badge-secondary o_delivery_compute\">Select to compute delivery rate</span>"
msgstr ""
#. module: website_sale_delivery
@@ -92,7 +97,7 @@ msgid "FedEx Delivery Methods"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.ui.view,arch_db:website_sale_delivery.payment_delivery
+#: model:ir.ui.view,arch_db:website_sale_delivery.payment_delivery_methods
msgid "Free"
msgstr ""
@@ -107,6 +112,11 @@ msgid "Has delivery"
msgstr ""
#. module: website_sale_delivery
+#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier__is_published
+msgid "Is published"
+msgstr ""
+
+#. module: website_sale_delivery
#: code:addons/website_sale_delivery/controllers/main.py:44
#, python-format
msgid "No shipping method is available for your current order and shipping address. Please contact us for more information."
@@ -133,6 +143,11 @@ msgid "Quotation"
msgstr ""
#. module: website_sale_delivery
+#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier__website_id
+msgid "Restrict publishing to this website."
+msgstr ""
+
+#. module: website_sale_delivery
#: code:addons/website_sale_delivery/controllers/main.py:43
#, python-format
msgid "Sorry, we are unable to ship your order"
@@ -149,7 +164,7 @@ msgid "The full URL to access the document through the website."
msgstr ""
#. module: website_sale_delivery
-#: model:ir.ui.view,arch_db:website_sale_delivery.portal_order_page_shipping_tracking
+#: model:ir.ui.view,arch_db:website_sale_delivery.sale_order_portal_content_inherit_sale_stock_inherit_website_sale_delivery
msgid "Tracking:"
msgstr ""
@@ -160,7 +175,12 @@ msgstr ""
#. module: website_sale_delivery
#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier__website_published
-msgid "Visible in Website"
+msgid "Visible on current website"
+msgstr ""
+
+#. module: website_sale_delivery
+#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier__website_id
+msgid "Website"
msgstr ""
#. module: website_sale_delivery
diff --git a/addons/website_sale_digital/i18n/website_sale_digital.pot b/addons/website_sale_digital/i18n/website_sale_digital.pot
index 17098ba3a2e..aa08db7e125 100644
--- a/addons/website_sale_digital/i18n/website_sale_digital.pot
+++ b/addons/website_sale_digital/i18n/website_sale_digital.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -23,14 +23,20 @@ msgid "Digital Attachments"
msgstr ""
#. module: website_sale_digital
+#: model:ir.ui.view,arch_db:website_sale_digital.product_product_view_form_inherit_digital
+#: model:ir.ui.view,arch_db:website_sale_digital.product_template_view_form_inherit_digital
+msgid "Digital Files"
+msgstr ""
+
+#. module: website_sale_digital
#: model:ir.model.fields,field_description:website_sale_digital.field_ir_attachment__product_downloadable
#: model:ir.model.fields,field_description:website_sale_digital.field_mrp_document__product_downloadable
msgid "Downloadable from product portal"
msgstr ""
#. module: website_sale_digital
-#: model:ir.ui.view,arch_db:website_sale_digital.portal_order_page_downloads
-msgid "Downloads <span class=\"caret\"/>"
+#: model:ir.ui.view,arch_db:website_sale_digital.sale_order_portal_content_inherit_website_sale_digital
+msgid "Downloads"
msgstr ""
#. module: website_sale_digital
@@ -45,12 +51,6 @@ msgid "Invoice Line"
msgstr ""
#. module: website_sale_digital
-#: model:ir.ui.view,arch_db:website_sale_digital.product_product_view_form_inherit_digital
-#: model:ir.ui.view,arch_db:website_sale_digital.product_template_view_form_inherit_digital
-msgid "Portal Files"
-msgstr ""
-
-#. module: website_sale_digital
#: model:ir.model,name:website_sale_digital.model_product_product
msgid "Product"
msgstr ""
diff --git a/addons/website_sale_link_tracker/i18n/website_sale_link_tracker.pot b/addons/website_sale_link_tracker/i18n/website_sale_link_tracker.pot
index 1424acf0e25..65d48a12ca3 100644
--- a/addons/website_sale_link_tracker/i18n/website_sale_link_tracker.pot
+++ b/addons/website_sale_link_tracker/i18n/website_sale_link_tracker.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_sale_link_tracker
+#: model:ir.model.fields,field_description:website_sale_link_tracker.field_sale_report__campaign_id
+msgid "Campaign"
+msgstr ""
+
+#. module: website_sale_link_tracker
#. openerp-web
#: code:addons/website_sale_link_tracker/static/src/xml/website_sale_dashboard_utm_chart.xml:23
#: code:addons/website_sale_link_tracker/static/src/xml/website_sale_dashboard_utm_chart.xml:26
@@ -31,6 +36,7 @@ msgstr ""
#. module: website_sale_link_tracker
#. openerp-web
#: code:addons/website_sale_link_tracker/static/src/xml/website_sale_dashboard_utm_chart.xml:27
+#: model:ir.model.fields,field_description:website_sale_link_tracker.field_sale_report__medium_id
#, python-format
msgid "Medium"
msgstr ""
@@ -48,6 +54,16 @@ msgid "REVENUE BY"
msgstr ""
#. module: website_sale_link_tracker
+#: model:ir.model,name:website_sale_link_tracker.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: website_sale_link_tracker
+#: model:ir.model.fields,field_description:website_sale_link_tracker.field_sale_report__source_id
+msgid "Source"
+msgstr ""
+
+#. module: website_sale_link_tracker
#. openerp-web
#: code:addons/website_sale_link_tracker/static/src/xml/website_sale_dashboard_utm_chart.xml:28
#, python-format
@@ -65,6 +81,6 @@ msgstr ""
#. openerp-web
#: code:addons/website_sale_link_tracker/static/src/xml/website_sale_dashboard_utm_chart.xml:5
#, python-format
-msgid "col-md-6 col-xs-12"
+msgid "col-lg-6 col-12"
msgstr ""
diff --git a/addons/website_sale_options/i18n/website_sale_options.pot b/addons/website_sale_options/i18n/website_sale_options.pot
index ef04dc14658..ae69bf6b96c 100644
--- a/addons/website_sale_options/i18n/website_sale_options.pot
+++ b/addons/website_sale_options/i18n/website_sale_options.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,27 +17,32 @@ msgstr ""
#. module: website_sale_options
#: model:ir.ui.view,arch_db:website_sale_options.modal
-msgid "<i class=\"fa fa-chevron-left\"/> <span class=\"hidden-xs\">Continue Shopping</span><span class=\"visible-xs-inline\">Continue</span>"
+msgid "<i class=\"fa fa-chevron-left\"/> <span class=\"d-none d-md-inline\">Continue Shopping</span><span class=\"d-inline d-md-none\">Continue</span>"
msgstr ""
#. module: website_sale_options
#: model:ir.ui.view,arch_db:website_sale_options.modal
-msgid "<i class=\"fa fa-shopping-cart fa-fw\"/> <span class=\"hidden-xs\">Proceed to Checkout</span><span class=\"visible-xs-inline\">Checkout</span>"
+msgid "<i class=\"fa fa-shopping-cart fa-fw\"/> <span class=\"d-none d-md-inline\">Proceed to Checkout</span><span class=\"d-inline d-md-none\">Checkout</span>"
msgstr ""
#. module: website_sale_options
#: model:ir.ui.view,arch_db:website_sale_options.modal
-msgid "<small>Remove <span class=\"hidden-xs\"> from Cart</span></small>"
+msgid "<small>Remove <span class=\"d-none d-md-inline\"> from Cart</span></small>"
msgstr ""
#. module: website_sale_options
#: model:ir.ui.view,arch_db:website_sale_options.modal
-msgid "<span class=\"js_item\">1 </span><span class=\"js_items hidden\">5 </span>"
+msgid "<span class=\"js_item\">1 </span><span class=\"js_items d-none\">5 </span>"
msgstr ""
#. module: website_sale_options
#: model:ir.ui.view,arch_db:website_sale_options.modal
-msgid "<strong>Add<span class=\"hidden-xs\"> to Cart</span></strong>"
+msgid "<strong>Add<span class=\"d-none d-md-inline\"> to Cart</span></strong>"
+msgstr ""
+
+#. module: website_sale_options
+#: model:ir.ui.view,arch_db:website_sale_options.modal
+msgid "Add one"
msgstr ""
#. module: website_sale_options
@@ -46,6 +51,16 @@ msgid "Add to Cart"
msgstr ""
#. module: website_sale_options
+#: model:ir.ui.view,arch_db:website_sale_options.modal
+msgid "Close"
+msgstr ""
+
+#. module: website_sale_options
+#: model:ir.ui.view,arch_db:website_sale_options.modal
+msgid "Continue shopping"
+msgstr ""
+
+#. module: website_sale_options
#: model:ir.model.fields,field_description:website_sale_options.field_sale_order_line__linked_line_id
msgid "Linked Order Line"
msgstr ""
@@ -86,6 +101,11 @@ msgstr ""
#. module: website_sale_options
#: model:ir.ui.view,arch_db:website_sale_options.modal
+msgid "Proceed to checkout"
+msgstr ""
+
+#. module: website_sale_options
+#: model:ir.ui.view,arch_db:website_sale_options.modal
msgid "Product"
msgstr ""
@@ -110,6 +130,11 @@ msgid "Quotation"
msgstr ""
#. module: website_sale_options
+#: model:ir.ui.view,arch_db:website_sale_options.modal
+msgid "Remove one"
+msgstr ""
+
+#. module: website_sale_options
#: model:ir.model,name:website_sale_options.model_sale_order_line
msgid "Sales Order Line"
msgstr ""
diff --git a/addons/website_sale_stock/i18n/website_sale_stock.pot b/addons/website_sale_stock/i18n/website_sale_stock.pot
index ba51e539a49..4298c1624b1 100644
--- a/addons/website_sale_stock/i18n/website_sale_stock.pot
+++ b/addons/website_sale_stock/i18n/website_sale_stock.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -28,6 +28,11 @@ msgid "Adds an inventory availability status on the web product page."
msgstr ""
#. module: website_sale_stock
+#: model:ir.ui.view,arch_db:website_sale_stock.product_template_form_view_inherit_website_sale_stock
+msgid "Availability"
+msgstr ""
+
+#. module: website_sale_stock
#: model:ir.model.fields,field_description:website_sale_stock.field_product_product__available_threshold
#: model:ir.model.fields,field_description:website_sale_stock.field_product_template__available_threshold
#: model:ir.model.fields,field_description:website_sale_stock.field_res_config_settings__available_threshold
@@ -52,7 +57,7 @@ msgstr ""
#. module: website_sale_stock
#: model:ir.ui.view,arch_db:website_sale_stock.res_config_settings_view_form
-msgid "Default availability mode set on newly created stockable products. This can be changed at the product level."
+msgid "Default availability mode set on newly created storable products. This can be changed at the product level."
msgstr ""
#. module: website_sale_stock
@@ -68,7 +73,6 @@ msgid "In stock"
msgstr ""
#. module: website_sale_stock
-#: model:ir.ui.view,arch_db:website_sale_stock.product_template_form_view_inherit_website_sale_stock
#: model:ir.ui.view,arch_db:website_sale_stock.res_config_settings_view_form
msgid "Inventory"
msgstr ""
@@ -143,17 +147,34 @@ msgid "Temporarily out of stock"
msgstr ""
#. module: website_sale_stock
+#: model:ir.model,name:website_sale_stock.model_stock_picking
+msgid "Transfer"
+msgstr ""
+
+#. module: website_sale_stock
+#. openerp-web
+#: code:addons/website_sale_stock/static/src/xml/website_sale_stock_product_availability.xml:13
+#: code:addons/website_sale_stock/static/src/xml/website_sale_stock_product_availability.xml:22
#: model:ir.model.fields,field_description:website_sale_stock.field_sale_order__warning_stock
#: model:ir.model.fields,field_description:website_sale_stock.field_sale_order_line__warning_stock
+#: model:ir.ui.view,arch_db:website_sale_stock.website_sale_stock_cart_lines
+#: model:ir.ui.view,arch_db:website_sale_stock.website_sale_stock_payment
+#, python-format
msgid "Warning"
msgstr ""
#. module: website_sale_stock
#: model:ir.model,name:website_sale_stock.model_website
+#: model:ir.model.fields,field_description:website_sale_stock.field_stock_picking__website_id
msgid "Website"
msgstr ""
#. module: website_sale_stock
+#: model:ir.model.fields,help:website_sale_stock.field_stock_picking__website_id
+msgid "Website this picking belongs to."
+msgstr ""
+
+#. module: website_sale_stock
#. openerp-web
#: code:addons/website_sale_stock/static/src/xml/website_sale_stock_product_availability.xml:19
#, python-format
diff --git a/addons/website_sale_wishlist/i18n/website_sale_wishlist.pot b/addons/website_sale_wishlist/i18n/website_sale_wishlist.pot
index 2afd5f7232a..2a2c188ebcc 100644
--- a/addons/website_sale_wishlist/i18n/website_sale_wishlist.pot
+++ b/addons/website_sale_wishlist/i18n/website_sale_wishlist.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#. module: website_sale_wishlist
#: model:ir.ui.view,arch_db:website_sale_wishlist.product_wishlist
-msgid "Add <span class=\"hidden-xs\">to Cart</span>"
+msgid "Add <span class=\"d-none d-md-inline\">to Cart</span>"
msgstr ""
#. module: website_sale_wishlist
@@ -68,21 +68,6 @@ msgid "Currency"
msgstr ""
#. module: website_sale_wishlist
-#: model:ir.model.fields,field_description:website_sale_wishlist.field_res_users__current_session
-msgid "Current Session"
-msgstr ""
-
-#. module: website_sale_wishlist
-#: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist__price_new
-msgid "Current price"
-msgstr ""
-
-#. module: website_sale_wishlist
-#: model:ir.model.fields,help:website_sale_wishlist.field_product_wishlist__price_new
-msgid "Current price of this product, using same pricelist, ..."
-msgstr ""
-
-#. module: website_sale_wishlist
#: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist__display_name
msgid "Display Name"
msgstr ""
@@ -143,8 +128,8 @@ msgid "Product"
msgstr ""
#. module: website_sale_wishlist
-#: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist__session
-msgid "Session"
+#: model:ir.ui.view,arch_db:website_sale_wishlist.product_wishlist
+msgid "Product image"
msgstr ""
#. module: website_sale_wishlist
@@ -163,11 +148,6 @@ msgid "Website"
msgstr ""
#. module: website_sale_wishlist
-#: model:ir.model.fields,help:website_sale_wishlist.field_product_wishlist__session
-msgid "Website session identifier where this product was wishlisted."
-msgstr ""
-
-#. module: website_sale_wishlist
#: model:ir.model.fields,field_description:website_sale_wishlist.field_res_partner__wishlist_ids
#: model:ir.model.fields,field_description:website_sale_wishlist.field_res_users__wishlist_ids
msgid "Wishlist"
diff --git a/addons/website_slides/i18n/website_slides.pot b/addons/website_slides/i18n/website_slides.pot
index eb39fffdfa7..2cf2436528f 100644
--- a/addons/website_slides/i18n/website_slides.pot
+++ b/addons/website_slides/i18n/website_slides.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.4\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-02 09:56+0000\n"
-"PO-Revision-Date: 2018-08-02 09:56+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,46 +16,6 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_slides
-#: model:mail.template,body_html:website_slides.slide_template_shared
-msgid "\n"
-"<p>Hello,</p>\n"
-"<p>\n"
-" ${user.name} shared the ${object.slide_type} <strong>${object.name}</strong> with you!\n"
-"</p>\n"
-"<p style=\"text-align: center; margin-top: 10px;\">\n"
-" <a href=\"${object.website_url}\">\n"
-" <img alt=\"${object.name}\" src=\"${ctx['base_url']}/web/image/slide.slide/${object.id}/image\" style=\"height:auto; width:150px; background-color: #cccccc; margin: 16px;\">\n"
-" </a>\n"
-"</p>\n"
-"<p style=\"text-align: center; margin-top: 10px;\">\n"
-" <a style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius:3px\" class=\"o_default_snippet_text\" href=\"${object.website_url}\">\n"
-" View <strong>${object.name}</strong>\n"
-" </a>\n"
-"</p>\n"
-""
-msgstr ""
-
-#. module: website_slides
-#: model:mail.template,body_html:website_slides.slide_template_published
-msgid "\n"
-"<p>Hello,</p>\n"
-"<p>\n"
-" A new ${object.slide_type} <strong>${object.name}</strong> has been published on ${object.channel_id.name} at ${format_tz(object.write_date, tz=user.tz)}\n"
-"</p>\n"
-"<p style=\"text-align: center; margin-top: 10px;\">\n"
-" <a href=\"${object.website_url}\">\n"
-" <img alt=\"${object.name}\" src=\"${ctx['base_url']}/web/image/slide.slide/${object.id}/image\" style=\"height:auto; width:150px; background-color: #cccccc; margin: 16px;\">\n"
-" </a>\n"
-"</p>\n"
-"<p style=\"text-align: center; margin-top: 10px;\">\n"
-" <a style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#875A7B; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #875A7B; border: 1px solid #875A7B; border-radius:3px\" class=\"o_default_snippet_text\" href=\"${object.website_url}\">\n"
-" View <strong>${object.name}</strong>\n"
-" </a>\n"
-"</p>\n"
-""
-msgstr ""
-
-#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_embed__count_views
msgid "# Views"
msgstr ""
@@ -71,6 +31,11 @@ msgid "# of Website Views"
msgstr ""
#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.embed_slide
+msgid "#{slide.name}"
+msgstr ""
+
+#. module: website_slides
#: model:mail.template,subject:website_slides.slide_template_shared
msgid "${user.name} shared a ${object.slide_type} with you!"
msgstr ""
@@ -106,6 +71,44 @@ msgid "<b>Share:</b>"
msgstr ""
#. module: website_slides
+#: model:mail.template,body_html:website_slides.slide_template_shared
+msgid "<div style=\"margin: 0px; padding: 0px;\">\n"
+" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+" Hello<br/><br/>\n"
+" ${user.name} shared the ${object.slide_type} <strong>${object.name}</strong> with you!\n"
+" <div style=\"margin: 16px 8px 16px 8px; text-align: center;\">\n"
+" <a href=\"${object.website_url}\">\n"
+" <img alt=\"${object.name}\" src=\"${ctx['base_url']}/web/image/slide.slide/${object.id}/image\" style=\"height:auto; width:150px; margin: 16px;\"/>\n"
+" </a>\n"
+" </div>\n"
+" <div style=\"margin: 16px 8px 16px 8px; text-align: center;\">\n"
+" <a href=\"${object.website_url}\" style=\"background-color: #875a7b; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px;\">View <strong>${object.name}</strong></a>\n"
+" </div>\n"
+" </p>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: website_slides
+#: model:mail.template,body_html:website_slides.slide_template_published
+msgid "<div style=\"margin: 0px; padding: 0px;\">\n"
+" <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+" Hello<br/><br/>\n"
+" A new ${object.slide_type} <strong>${object.name}</strong> has been published on ${object.channel_id.name} at ${format_tz(object.write_date, tz=user.tz)}\n"
+" <div style=\"margin: 16px 8px 16px 8px; text-align: center;\">\n"
+" <a href=\"${object.website_url}\">\n"
+" <img alt=\"${object.name}\" src=\"${ctx['base_url']}/web/image/slide.slide/${object.id}/image\" style=\"height:auto; width:150px; margin: 16px;\"/>\n"
+" </a>\n"
+" </div>\n"
+" <div style=\"margin: 16px 8px 16px 8px; text-align: center;\">\n"
+" <a href=\"${object.website_url}\" style=\"background-color: #875a7b; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px;\">View <strong>${object.name}</strong></a>\n"
+" </div>\n"
+" </p>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
msgid "<i class=\"fa fa-align-justify\"/> Transcript"
msgstr ""
@@ -143,15 +146,14 @@ msgstr ""
#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.slide_social_email
-msgid "<i class=\"fa fa-envelope-o\"/>\n"
-" Send Email"
+msgid "<i class=\"fa fa-envelope-o\"/> Send Email"
msgstr ""
#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.embed_slide
#: model:ir.ui.view,arch_db:website_slides.embed_slide_forbidden
#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
-msgid "<i class=\"fa fa-exclamation-triangle\"/> This"
+msgid "<i class=\"fa fa-exclamation-triangle\" role=\"img\" aria-label=\"Attention\" title=\"Attention\"/> This"
msgstr ""
#. module: website_slides
@@ -203,42 +205,53 @@ msgstr ""
#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
-msgid "<span class=\"badge\" id=\"facebook-badge\">0</span>\n"
+msgid "<span class=\"badge badge-pill\" id=\"facebook-badge\">0</span>\n"
" <i class=\"fa fa-facebook-square\"/> Facebook"
msgstr ""
#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
-msgid "<span class=\"badge\" id=\"google-badge\">0</span>\n"
+msgid "<span class=\"badge badge-pill\" id=\"google-badge\">0</span>\n"
" <i class=\"fa fa-google-plus-square\"/> Google+"
msgstr ""
#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
-msgid "<span class=\"badge\" id=\"linkedin-badge\">0</span>\n"
+msgid "<span class=\"badge badge-pill\" id=\"linkedin-badge\">0</span>\n"
" <i class=\"fa fa-linkedin-square\"/> LinkedIn"
msgstr ""
#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
-msgid "<span class=\"badge\" id=\"total-share\">0</span>\n"
+msgid "<span class=\"badge badge-pill\" id=\"total-share\">0</span>\n"
" <i class=\"fa fa-share-alt\"/> Social Shares"
msgstr ""
#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
-msgid "<span class=\"badge\" id=\"twitter-badge\">0</span>\n"
+msgid "<span class=\"badge badge-pill\" id=\"twitter-badge\">0</span>\n"
" <i class=\"fa fa-twitter-square\"/> Twitter"
msgstr ""
#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.res_config_settings_view_form
+msgid "<span class=\"fa fa-arrow-right\"/>\n"
+" Create a Google Project and Get a Key"
+msgstr ""
+
+#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.slide_social_email
-msgid "<span class=\"help-block\">Send presentation through email</span>"
+msgid "<span class=\"form-text\">Send presentation through email</span>"
msgstr ""
#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.slide_social_media
-msgid "<span class=\"help-block\">Use permanent link to share in social media</span>"
+msgid "<span class=\"form-text\">Use permanent link to share in social media</span>"
+msgstr ""
+
+#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.res_config_settings_view_form
+msgid "<span class=\"o_form_label\">Slides</span>"
msgstr ""
#. module: website_slides
@@ -307,7 +320,7 @@ msgstr ""
#. module: website_slides
#: model:ir.actions.act_window,name:website_slides.action_ir_slide_category
#: model:ir.model.fields,field_description:website_slides.field_slide_channel__category_ids
-#: model:ir.ui.menu,name:website_slides.menu_action_ir_slide_category
+#: model:ir.ui.menu,name:website_slides.menu_action_ir_slide_category_global
#: model:ir.ui.view,arch_db:website_slides.view_slide_channel_form
msgid "Categories"
msgstr ""
@@ -334,6 +347,11 @@ msgid "Channel"
msgstr ""
#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
+msgid "Channel #{slide.channel_id.name}"
+msgstr ""
+
+#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_channel__group_ids
msgid "Channel Groups"
msgstr ""
@@ -361,9 +379,14 @@ msgid "Channel visibility"
msgstr ""
#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.channels
+msgid "Channel without promoted slide"
+msgstr ""
+
+#. module: website_slides
#: model:ir.actions.act_url,name:website_slides.action_open_channels
#: model:ir.actions.act_window,name:website_slides.action_slide_channels
-#: model:ir.ui.menu,name:website_slides.menu_action_slide_channels
+#: model:ir.ui.menu,name:website_slides.menu_action_slide_channels_global
#: model:ir.ui.view,arch_db:website_slides.view_slide_channel_form
msgid "Channels"
msgstr ""
@@ -381,7 +404,7 @@ msgid "Content Preview"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/controllers/main.py:256
+#: code:addons/website_slides/controllers/main.py:264
#, python-format
msgid "Could not fetch data from url. Document or access right not available.\n"
"Here is the received response: %s"
@@ -395,11 +418,6 @@ msgid "Could not fetch data from url. Document or access right not available:\n"
msgstr ""
#. module: website_slides
-#: model:ir.ui.view,arch_db:website_slides.res_config_settings_view_form
-msgid "Create a Google Project and Get a Key"
-msgstr ""
-
-#. module: website_slides
#: model:ir.actions.act_window,help:website_slides.action_slide_channels
msgid "Create a channel"
msgstr ""
@@ -576,7 +594,7 @@ msgstr ""
#. module: website_slides
#. openerp-web
-#: code:addons/website_slides/controllers/main.py:266
+#: code:addons/website_slides/controllers/main.py:274
#: code:addons/website_slides/static/src/js/slides_upload.js:89
#, python-format
msgid "File is too big. File size cannot exceed 25MB"
@@ -612,6 +630,7 @@ msgstr ""
#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_res_config_settings__website_slide_google_app_key
+#: model:ir.model.fields,field_description:website_slides.field_website__website_slide_google_app_key
msgid "Google Doc Key"
msgstr ""
@@ -683,7 +702,7 @@ msgid "Infographics"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/controllers/main.py:288
+#: code:addons/website_slides/controllers/main.py:296
#, python-format
msgid "Internal server error, please try again later or contact administrator.\n"
"Here is the error message: %s"
@@ -703,6 +722,12 @@ msgid "Is Follower"
msgstr ""
#. module: website_slides
+#: model:ir.model.fields,field_description:website_slides.field_slide_channel__is_published
+#: model:ir.model.fields,field_description:website_slides.field_slide_slide__is_published
+msgid "Is published"
+msgstr ""
+
+#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_category____last_update
#: model:ir.model.fields,field_description:website_slides.field_slide_channel____last_update
#: model:ir.model.fields,field_description:website_slides.field_slide_embed____last_update
@@ -730,6 +755,11 @@ msgid "Last Updated on"
msgstr ""
#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.embed_slide
+msgid "Last slide"
+msgstr ""
+
+#. module: website_slides
#: selection:slide.channel,promote_strategy:0
msgid "Latest Published"
msgstr ""
@@ -800,6 +830,11 @@ msgid "Newest"
msgstr ""
#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.embed_slide
+msgid "Next slide"
+msgstr ""
+
+#. module: website_slides
#: selection:slide.channel,promote_strategy:0
msgid "No Featured Presentation"
msgstr ""
@@ -904,13 +939,13 @@ msgstr ""
#. module: website_slides
#: code:addons/website_slides/models/slides.py:328
-#: code:addons/website_slides/models/slides.py:551
+#: code:addons/website_slides/models/slides.py:557
#, python-format
msgid "Please enter valid Youtube or Google Doc URL"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/controllers/main.py:248
+#: code:addons/website_slides/controllers/main.py:256
#, python-format
msgid "Please enter valid youtube or google doc url"
msgstr ""
@@ -934,6 +969,11 @@ msgid "Presentations"
msgstr ""
#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.embed_slide
+msgid "Previous slide"
+msgstr ""
+
+#. module: website_slides
#: selection:slide.channel,visibility:0
msgid "Private"
msgstr ""
@@ -944,6 +984,17 @@ msgid "Private channel"
msgstr ""
#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.slides_grid_view
+msgid "Promote this #{slide.slide_type}"
+msgstr ""
+
+#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.channels
+#: model:ir.ui.view,arch_db:website_slides.home
+msgid "Promoted slide"
+msgstr ""
+
+#. module: website_slides
#: selection:slide.channel,visibility:0
msgid "Public"
msgstr ""
@@ -974,6 +1025,12 @@ msgid "Related"
msgstr ""
#. module: website_slides
+#: model:ir.model.fields,help:website_slides.field_slide_channel__website_id
+#: model:ir.model.fields,help:website_slides.field_slide_slide__website_id
+msgid "Restrict publishing to this website."
+msgstr ""
+
+#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.home
msgid "Results for"
msgstr ""
@@ -998,11 +1055,21 @@ msgid "Save as Draft"
msgstr ""
#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.slides_channel_header
+msgid "Search"
+msgstr ""
+
+#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.view_slide_slide_search
msgid "Search Slides"
msgstr ""
#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.slides_channel_header
+msgid "Search in #{channel.name}"
+msgstr ""
+
+#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.view_slide_channel_form
msgid "Security"
msgstr ""
@@ -1034,11 +1101,31 @@ msgid "Share count"
msgstr ""
#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.slides_share
+msgid "Share on Facebook"
+msgstr ""
+
+#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.slides_share
+msgid "Share on Google Plus"
+msgstr ""
+
+#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.slides_share
+msgid "Share on LinkedIn"
+msgstr ""
+
+#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.slide_social_media
msgid "Share on Social Networks"
msgstr ""
#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.slides_share
+msgid "Share on Twitter"
+msgstr ""
+
+#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.slide_social_email
msgid "Share with a friend"
msgstr ""
@@ -1064,6 +1151,12 @@ msgid "Slide Tag"
msgstr ""
#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.embed_slide
+#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
+msgid "Slide image"
+msgstr ""
+
+#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_channel__custom_slide_id
msgid "Slide to Promote"
msgstr ""
@@ -1074,8 +1167,7 @@ msgstr ""
#: model:ir.model.fields,field_description:website_slides.field_slide_category__slide_ids
#: model:ir.model.fields,field_description:website_slides.field_slide_channel__slide_ids
#: model:ir.ui.menu,name:website_slides.menu_website_slides_root
-#: model:ir.ui.menu,name:website_slides.submenu_action_slides_slides
-#: model:ir.ui.view,arch_db:website_slides.res_config_settings_view_form
+#: model:ir.ui.menu,name:website_slides.menu_website_slides_root_global
#: model:ir.ui.view,arch_db:website_slides.view_slide_slide_tree
msgid "Slides"
msgstr ""
@@ -1146,7 +1238,7 @@ msgid "This channel is private and its content is restricted to some users."
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/controllers/main.py:252
+#: code:addons/website_slides/controllers/main.py:260
#, python-format
msgid "This video already exists in this channel <a target=\"_blank\" href=\"/slides/slide/%s\">click here to view it </a>"
msgstr ""
@@ -1188,7 +1280,7 @@ msgid "Type"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/controllers/main.py:151
+#: code:addons/website_slides/controllers/main.py:156
#, python-format
msgid "Uncategorized"
msgstr ""
@@ -1199,7 +1291,7 @@ msgid "Uncategorized presentation"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/models/slides.py:540
+#: code:addons/website_slides/models/slides.py:546
#, python-format
msgid "Unknown document"
msgstr ""
@@ -1233,7 +1325,8 @@ msgstr ""
#. module: website_slides
#. openerp-web
-#: code:addons/website_slides/static/src/xml/website_slides.xml:9
+#: code:addons/website_slides/static/src/xml/website_slides.xml:8
+#: model:ir.ui.view,arch_db:website_slides.home
#: model:ir.ui.view,arch_db:website_slides.slides_channel_header
#, python-format
msgid "Upload Presentation"
@@ -1285,7 +1378,7 @@ msgstr ""
#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_channel__website_published
#: model:ir.model.fields,field_description:website_slides.field_slide_slide__website_published
-msgid "Visible in Website"
+msgid "Visible on current website"
msgstr ""
#. module: website_slides
@@ -1294,6 +1387,9 @@ msgid "Waiting for validation"
msgstr ""
#. module: website_slides
+#: model:ir.model,name:website_slides.model_website
+#: model:ir.model.fields,field_description:website_slides.field_slide_channel__website_id
+#: model:ir.model.fields,field_description:website_slides.field_slide_slide__website_id
#: model:ir.ui.view,arch_db:website_slides.view_slide_slide_form
msgid "Website"
msgstr ""
@@ -1335,6 +1431,12 @@ msgid "Website meta title"
msgstr ""
#. module: website_slides
+#: model:ir.model.fields,field_description:website_slides.field_slide_channel__website_meta_og_img
+#: model:ir.model.fields,field_description:website_slides.field_slide_slide__website_meta_og_img
+msgid "Website opengraph image"
+msgstr ""
+
+#. module: website_slides
#. openerp-web
#: code:addons/website_slides/static/src/js/slides_upload.js:114
#, python-format
@@ -1409,6 +1511,12 @@ msgid "results found for the given criteria"
msgstr ""
#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.related_slides
+#: model:ir.ui.view,arch_db:website_slides.slides_grid_view
+msgid "slide.name"
+msgstr ""
+
+#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.embed_slide
msgid "suggest_slide.name"
msgstr ""
diff --git a/addons/website_twitter/i18n/website_twitter.pot b/addons/website_twitter/i18n/website_twitter.pot
index ab462738aa5..1915457a8e5 100644
--- a/addons/website_twitter/i18n/website_twitter.pot
+++ b/addons/website_twitter/i18n/website_twitter.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:11+0000\n"
-"PO-Revision-Date: 2018-03-22 14:11+0000\n"
+"POT-Creation-Date: 2018-08-24 09:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,31 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_twitter
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
+msgid "<span class=\"o_form_label\">Twitter Roller</span>"
+msgstr ""
+
+#. module: website_twitter
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
+msgid "<strong>Callback URL: </strong>Leave blank"
+msgstr ""
+
+#. module: website_twitter
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
+msgid "<strong>Description: </strong> Odoo Twitter Integration"
+msgstr ""
+
+#. module: website_twitter
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
+msgid "<strong>Name: </strong> Odoo Twitter Integration"
+msgstr ""
+
+#. module: website_twitter
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
+msgid "<strong>Website: </strong>"
+msgstr ""
+
+#. module: website_twitter
#: model:ir.model.fields,field_description:website_twitter.field_res_config_settings__twitter_api_key
#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
msgid "API Key"
@@ -28,12 +53,27 @@ msgid "API secret"
msgstr ""
#. module: website_twitter
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
+msgid "Accept terms of use and click on the Create your Twitter application button at the bottom"
+msgstr ""
+
+#. module: website_twitter
#: code:addons/website_twitter/models/res_config_settings.py:16
#, python-format
msgid "Authentication credentials were missing or incorrect. Maybe screen name tweets are protected."
msgstr ""
#. module: website_twitter
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
+msgid "Copy/Paste Consumer Key (API Key) and Consumer Secret (API Secret) keys below."
+msgstr ""
+
+#. module: website_twitter
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
+msgid "Create a new Twitter application on"
+msgstr ""
+
+#. module: website_twitter
#: model:ir.model.fields,field_description:website_twitter.field_website_twitter_tweet__create_uid
msgid "Created by"
msgstr ""
@@ -66,6 +106,11 @@ msgid "HTTP Error: Something is misconfigured"
msgstr ""
#. module: website_twitter
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
+msgid "How to configure the Twitter API access"
+msgstr ""
+
+#. module: website_twitter
#: model:ir.model.fields,field_description:website_twitter.field_website_twitter_tweet__id
msgid "ID"
msgstr ""
@@ -134,8 +179,13 @@ msgid "Screen Name of the Twitter Account from which you want to load favorites.
msgstr ""
#. module: website_twitter
-#: model:ir.model.fields,field_description:website_twitter.field_res_config_settings__twitter_tutorial
-msgid "Show me how to obtain the Twitter API Key and Secret"
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
+msgid "Show me how to obtain the Twitter API key and Twitter API secret"
+msgstr ""
+
+#. module: website_twitter
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
+msgid "Switch to the API Keys tab: <br/>"
msgstr ""
#. module: website_twitter
@@ -169,11 +219,6 @@ msgid "There was no new data to return."
msgstr ""
#. module: website_twitter
-#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
-msgid "Tutorial"
-msgstr ""
-
-#. module: website_twitter
#: model:ir.model.fields,field_description:website_twitter.field_website_twitter_tweet__tweet_id
msgid "Tweet ID"
msgstr ""
@@ -226,11 +271,6 @@ msgid "Twitter Configuration"
msgstr ""
#. module: website_twitter
-#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
-msgid "Twitter Roller"
-msgstr ""
-
-#. module: website_twitter
#: code:addons/website_twitter/models/res_config_settings.py:62
#, python-format
msgid "Twitter authorization error!"
@@ -249,12 +289,29 @@ msgid "Twitter seems broken. Please retry later. You may consider posting an iss
msgstr ""
#. module: website_twitter
+#: model:ir.model.fields,field_description:website_twitter.field_res_config_settings__twitter_server_uri
+msgid "Twitter server uri"
+msgstr ""
+
+#. module: website_twitter
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
+msgid "Twitter tutorial"
+msgstr ""
+
+#. module: website_twitter
#: code:addons/website_twitter/controllers/main.py:37
#, python-format
msgid "Twitter user @%(username)s has less than 12 favorite tweets. Please add more or choose a different screen name."
msgstr ""
#. module: website_twitter
+#. openerp-web
+#: code:addons/website_twitter/static/src/xml/website.twitter.xml:6
+#, python-format
+msgid "Twitter's user"
+msgstr ""
+
+#. module: website_twitter
#: model:ir.actions.server,name:website_twitter.ir_cron_twitter_actions_ir_actions_server
#: model:ir.cron,cron_name:website_twitter.ir_cron_twitter_actions
#: model:ir.cron,name:website_twitter.ir_cron_twitter_actions
@@ -275,6 +332,16 @@ msgid "Website"
msgstr ""
#. module: website_twitter
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
+msgid "api_key.png"
+msgstr ""
+
+#. module: website_twitter
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
+msgid "https://apps.twitter.com/app/new"
+msgstr ""
+
+#. module: website_twitter
#: model:ir.model,name:website_twitter.model_res_config_settings
msgid "res.config.settings"
msgstr ""
@@ -284,3 +351,8 @@ msgstr ""
msgid "website.twitter.tweet"
msgstr ""
+#. module: website_twitter
+#: model:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
+msgid "with the following values:"
+msgstr ""
+